Merge branch 'master' into feature/fix-slick-kamon

kamon-io · May 24, 2024 · 6bb95af · 6bb95af
2 parents afc6a03 + 09245ac
commit 6bb95af
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/reporters/kamon-datadog/src/main/scala/kamon/datadog/DatadogAgentReporter.scala b/reporters/kamon-datadog/src/main/scala/kamon/datadog/DatadogAgentReporter.scala
@@ -50,6 +50,9 @@ class DatadogAgentReporter private[datadog] (@volatile private var config: Datad
     new DecimalFormat("#.################################################################", symbols)
   private val valueFormat = new DecimalFormat("#0.#########", symbols)
 
+  private val DD_ENTITY_ID_ENV_VAR = "DD_ENTITY_ID"
+  private val ENTITY_ID_TAG_NAME = "dd.internal.entity_id"
+
   logger.info("Started the Kamon Datadog reporter")
 
   override def stop(): Unit = {}
@@ -68,7 +71,7 @@ class DatadogAgentReporter private[datadog] (@volatile private var config: Datad
         counter.name,
         config.measurementFormatter.formatMeasurement(
           encodeDatadogCounter(instrument.value, counter.settings.unit),
-          instrument.tags
+          updateTagsWithEntityID(instrument.tags)
         )
       )
     }
@@ -81,7 +84,7 @@ class DatadogAgentReporter private[datadog] (@volatile private var config: Datad
         gauge.name,
         config.measurementFormatter.formatMeasurement(
           encodeDatadogGauge(instrument.value, gauge.settings.unit),
-          instrument.tags
+          updateTagsWithEntityID(instrument.tags)
         )
       )
     }
@@ -94,7 +97,7 @@ class DatadogAgentReporter private[datadog] (@volatile private var config: Datad
 
       val bucketData = config.measurementFormatter.formatMeasurement(
         encodeDatadogHistogramBucket(bucket.value, bucket.frequency, metric.settings.unit),
-        instruments.tags
+        updateTagsWithEntityID(instruments.tags)
       )
       config.packetBuffer.appendMeasurement(metric.name, bucketData)
     }
@@ -103,6 +106,15 @@ class DatadogAgentReporter private[datadog] (@volatile private var config: Datad
 
   }
 
+  private def updateTagsWithEntityID(tags: TagSet): TagSet = {
+    val entityId = System.getenv("DD_ENTITY_ID")
+    if (entityId != null && !entityId.trim().isEmpty()) {
+      return tags.withTag(ENTITY_ID_TAG_NAME, entityId);
+    }
+
+    return tags;
+  }
+
   private def encodeDatadogHistogramBucket(value: Long, frequency: Long, unit: MeasurementUnit): String = {
     val metricType = if (unit.dimension == Dimension.Time) "ms" else "h"
     val samplingRate: Double = 1d / frequency.toDouble