Add version tag to logs and Dropwizard metrics

signalapp · Dec 11, 2024 · 1e24c41 · 1e24c41
1 parent deab6c0
commit 1e24c41
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/main/java/org/signal/storageservice/metrics/LogstashTcpSocketAppenderFactory.java b/src/main/java/org/signal/storageservice/metrics/LogstashTcpSocketAppenderFactory.java
@@ -22,6 +22,7 @@
 import io.dropwizard.logging.common.layout.LayoutFactory;
 import net.logstash.logback.appender.LogstashTcpSocketAppender;
 import net.logstash.logback.encoder.LogstashEncoder;
+import org.signal.storageservice.StorageServiceVersion;
 
 import javax.validation.constraints.NotEmpty;
 import java.net.InetAddress;
@@ -84,7 +85,7 @@ public Appender<ILoggingEvent> build(
     }
     customFieldsNode.set("service", TextNode.valueOf("storage"));
     customFieldsNode.set("ddsource", TextNode.valueOf("logstash"));
-    customFieldsNode.set("ddtags", TextNode.valueOf("env:" + environment));
+    customFieldsNode.set("ddtags", TextNode.valueOf("env:" + environment + ",version:" + StorageServiceVersion.getServiceVersion()));
     encoder.setCustomFields(customFieldsNode.toString());
     final LayoutWrappingEncoder<ILoggingEvent> prefix = new LayoutWrappingEncoder<>();
     final PatternLayout layout = new PatternLayout();

diff --git a/src/main/java/org/signal/storageservice/metrics/SignalDatadogReporterFactory.java b/src/main/java/org/signal/storageservice/metrics/SignalDatadogReporterFactory.java
@@ -12,6 +12,7 @@
 import io.dropwizard.metrics.common.BaseReporterFactory;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import javax.validation.Valid;
@@ -22,6 +23,7 @@
 import org.coursera.metrics.datadog.DynamicTagsCallbackFactory;
 import org.coursera.metrics.datadog.MetricNameFormatterFactory;
 import org.coursera.metrics.datadog.transport.AbstractTransportFactory;
+import org.signal.storageservice.StorageServiceVersion;
 
 @JsonTypeName("signal-datadog")
 public class SignalDatadogReporterFactory extends BaseReporterFactory {
@@ -64,10 +66,21 @@ public class SignalDatadogReporterFactory extends BaseReporterFactory {
 
   @Override
   public ScheduledReporter build(final MetricRegistry registry) {
+
+    final List<String> combinedTags;
+    final String versionTag = "version:" + StorageServiceVersion.getServiceVersion();
+
+    if (tags != null) {
+      combinedTags = new ArrayList<>(tags);
+      combinedTags.add(versionTag);
+    } else {
+      combinedTags = new ArrayList<>((List.of(versionTag)));
+    }
+
     return DatadogReporter.forRegistry(registry)
         .withTransport(transport.build())
         .withHost(deriveHost())
-        .withTags(tags)
+        .withTags(combinedTags)
         .withPrefix(prefix)
         .withExpansions(expansions)
         .withMetricNameFormatter(metricNameFormatter.build())