Merge pull request #82 from vahidhashemian/update_log_tag_value_for_m…

…essage_key_value_size Update tag value for message key/value size metric
pinterest · Aug 22, 2020 · d37c9cd · d37c9cd
2 parents baafa4d + 6309609
commit d37c9cd
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.pinterest.singer</groupId>
     <artifactId>singer-package</artifactId>
-    <version>0.8.0.27</version>
+    <version>0.8.0.28</version>
     <packaging>pom</packaging>
     <description>Singer Logging Agent modules</description>
     <inceptionYear>2013</inceptionYear>

diff --git a/singer-commons/pom.xml b/singer-commons/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.pinterest.singer</groupId>
     <artifactId>singer-package</artifactId>
-    <version>0.8.0.27</version>
+    <version>0.8.0.28</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <developers>

diff --git a/singer/pom.xml b/singer/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.pinterest.singer</groupId>
         <artifactId>singer-package</artifactId>
-        <version>0.8.0.27</version>
+        <version>0.8.0.28</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <licenses>

diff --git a/singer/src/main/java/com/pinterest/singer/processor/DefaultLogStreamProcessor.java b/singer/src/main/java/com/pinterest/singer/processor/DefaultLogStreamProcessor.java
@@ -555,12 +555,12 @@ private void writeLogMessages(List<LogMessageAndPosition> logMessagesRead)
       OpenTsdbMetricConverter.gauge(
               SingerMetrics.PROCESSOR_MESSAGE_KEY_SIZE_BYTES,
               logMessage.isSetKey() ? logMessage.getKey().length : 0,
-              "log=" + logStream.getLogStreamName(),
+              "log=" + logStream.getSingerLog().getSingerLogConfig().getName(),
               "host=" + SingerUtils.getHostname());
       OpenTsdbMetricConverter.gauge(
               SingerMetrics.PROCESSOR_MESSAGE_VALUE_SIZE_BYTES,
               logMessage.isSetMessage() ? logMessage.getMessage().length : 0,
-              "log=" + logStream.getLogStreamName(),
+              "log=" + logStream.getSingerLog().getSingerLogConfig().getName(),
               "host=" + SingerUtils.getHostname());
     }
     writer.writeLogMessages(logMessagesToWrite);

diff --git a/singer/src/main/java/com/pinterest/singer/processor/MemoryEfficientLogStreamProcessor.java b/singer/src/main/java/com/pinterest/singer/processor/MemoryEfficientLogStreamProcessor.java
@@ -103,12 +103,12 @@ protected int processLogMessageBatch() throws IOException, LogStreamWriterExcept
       OpenTsdbMetricConverter.gauge(
               SingerMetrics.PROCESSOR_MESSAGE_KEY_SIZE_BYTES,
               logMessage.isSetKey() ? logMessage.getKey().length : 0,
-              "log=" + logStream.getLogStreamName(),
+              "log=" + logStream.getSingerLog().getSingerLogConfig().getName(),
               "host=" + SingerUtils.getHostname());
       OpenTsdbMetricConverter.gauge(
               SingerMetrics.PROCESSOR_MESSAGE_VALUE_SIZE_BYTES,
               logMessage.isSetMessage() ? logMessage.getMessage().length : 0,
-              "log=" + logStream.getLogStreamName(),
+              "log=" + logStream.getSingerLog().getSingerLogConfig().getName(),
               "host=" + SingerUtils.getHostname());
       writer.writeLogMessageToCommit(logMessage);
     }

diff --git a/thrift-logger/pom.xml b/thrift-logger/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.pinterest.singer</groupId>
     <artifactId>singer-package</artifactId>
-    <version>0.8.0.27</version>
+    <version>0.8.0.28</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>thrift-logger</artifactId>