Add primitive versions of setMetric to DDSpanContext (#10516)

Adding primitive versions of setMetric

Adding primitive versions of setMetric to take advantage of TagMap, primitive versions already exist on AgentSpan/DDSpan

Adding tests

Merge branch 'master' into dougqh/avoid-metric-boxing

Merge branch 'master' into dougqh/avoid-metric-boxing

Adding float support

Adding cast to Number

Apparently, Groovy does double dynamic dispatch which caused this test to fail now that there are primitive overrides.

Adding an explicit cast, so the test only calls setMetric(CharSeq, Number) which still functions the same as it did previously.

spotless

Merge branch 'master' into dougqh/avoid-metric-boxing

Merge branch 'master' into dougqh/avoid-metric-boxing

Co-authored-by: mcculls <stuart.mcculloch@datadoghq.com>
Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>

Author: 3 people

dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/TrackingSpanDecorator.groovy

@@ -180,6 +180,11 @@ class TrackingSpanDecorator implements AgentSpan {
     return delegate.setMetric(key, value)
   }
 
+  @Override
+  AgentSpan setMetric(CharSequence key, float value) {
+    return delegate.setMetric(key, value)
+  }
+
   @Override
   AgentSpan setMetric(CharSequence key, long value) {
     return delegate.setMetric(key, value)

dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java

@@ -216,6 +216,11 @@ public MutableSpan setMetric(final CharSequence metric, final long value) {
     return delegate.setMetric(metric, value);
   }
 
+  @Override
+  public MutableSpan setMetric(final CharSequence metric, final float value) {
+    return delegate.setMetric(metric, value);
+  }
+
   @Override
   public MutableSpan setMetric(final CharSequence metric, final double value) {
     return delegate.setMetric(metric, value);

dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpan.java

@@ -63,6 +63,12 @@ public OTSpan setMetric(final CharSequence metric, final long value) {
     return this;
   }
 
+  @Override
+  public OTSpan setMetric(final CharSequence metric, final float value) {
+    delegate.setMetric(metric, value);
+    return this;
+  }
+
   @Override
   public OTSpan setMetric(final CharSequence metric, final double value) {
     delegate.setMetric(metric, value);

dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpan.java

@@ -64,6 +64,12 @@ public OTSpan setMetric(final CharSequence metric, final long value) {
     return this;
   }
 
+  @Override
+  public OTSpan setMetric(final CharSequence metric, final float value) {
+    delegate.setMetric(metric, value);
+    return this;
+  }
+
   @Override
   public OTSpan setMetric(final CharSequence metric, final double value) {
     delegate.setMetric(metric, value);

dd-trace-api/src/main/java/datadog/trace/api/interceptor/MutableSpan.java

@@ -59,6 +59,8 @@ default Object getTag(String key) {
 
   MutableSpan setMetric(final CharSequence metric, final long value);
 
+  MutableSpan setMetric(final CharSequence metric, final float value);
+
   MutableSpan setMetric(final CharSequence metric, final double value);
 
   boolean isError();

dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java

@@ -728,6 +728,30 @@ public void setMetric(final CharSequence key, final Number value) {
     }
   }
 
+  public void setMetric(final CharSequence key, final int value) {
+    synchronized (unsafeTags) {
+      unsafeTags.set(key.toString(), value);
+    }
+  }
+
+  public void setMetric(final CharSequence key, final long value) {
+    synchronized (unsafeTags) {
+      unsafeTags.set(key.toString(), value);
+    }
+  }
+
+  public void setMetric(final CharSequence key, final float value) {
+    synchronized (unsafeTags) {
+      unsafeTags.set(key.toString(), value);
+    }
+  }
+
+  public void setMetric(final CharSequence key, final double value) {
+    synchronized (unsafeTags) {
+      unsafeTags.set(key.toString(), value);
+    }
+  }
+
   public void setMetric(final TagMap.EntryReader entry) {
     if (entry == null) {
       return;

dd-trace-core/src/test/groovy/datadog/trace/core/DDSpanContextTest.groovy

@@ -130,7 +130,7 @@ class DDSpanContextTest extends DDCoreSpecification {
     def context = span.context()
 
     when:
-    context.setMetric("test", value)
+    context.setMetric("test", (Number)value)
 
     then:
     type.isInstance(context.getTag("test"))

dd-trace-core/src/test/java/datadog/trace/core/SpanTest.java

@@ -1,6 +1,7 @@
 package datadog.trace.core;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 
 import datadog.trace.api.TagMap;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
@@ -10,6 +11,58 @@
 public class SpanTest {
   static final CoreTracer TRACER = CoreTracer.builder().build();
 
+  @Test
+  @DisplayName("setMetric: int")
+  public void setMetricInt() {
+    int expected = 2;
+
+    AgentSpan span = TRACER.startSpan("foo", "foo");
+    span.setMetric("int", expected);
+
+    Object value = span.getTag("int");
+    assertInstanceOf(Integer.class, value);
+    assertEquals(Integer.valueOf(expected), value);
+  }
+
+  @Test
+  @DisplayName("setMetric: long")
+  public void setMetricLong() {
+    long expected = 20L;
+
+    AgentSpan span = TRACER.startSpan("foo", "foo");
+    span.setMetric("long", expected);
+
+    Object value = span.getTag("long");
+    assertInstanceOf(Long.class, value);
+    assertEquals(Long.valueOf(expected), value);
+  }
+
+  @Test
+  @DisplayName("setMetric: float")
+  public void setMetricFloat() {
+    float expected = 2.718F;
+
+    AgentSpan span = TRACER.startSpan("foo", "foo");
+    span.setMetric("float", expected);
+
+    Object value = span.getTag("float");
+    assertInstanceOf(Float.class, value);
+    assertEquals(Float.valueOf(expected), value);
+  }
+
+  @Test
+  @DisplayName("setMetric: double")
+  public void setMetricDouble() {
+    double expected = 3.1415D;
+
+    AgentSpan span = TRACER.startSpan("foo", "foo");
+    span.setMetric("double", expected);
+
+    Object value = span.getTag("double");
+    assertInstanceOf(Double.class, value);
+    assertEquals(Double.valueOf(expected), value);
+  }
+
   @Test
   @DisplayName("setTag: TagMap.Entry")
   public void setTagEntry() {

dd-trace-ot/src/main/java/datadog/opentracing/OTSpan.java

@@ -62,6 +62,12 @@ public OTSpan setMetric(final CharSequence metric, final long value) {
     return this;
   }
 
+  @Override
+  public OTSpan setMetric(final CharSequence metric, final float value) {
+    delegate.setMetric(metric, value);
+    return this;
+  }
+
   @Override
   public OTSpan setMetric(final CharSequence metric, final double value) {
     delegate.setMetric(metric, value);

internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java

@@ -92,6 +92,9 @@ default boolean isValid() {
   @Override
   AgentSpan setMetric(CharSequence key, long value);
 
+  @Override
+  AgentSpan setMetric(CharSequence key, float value);
+
   @Override
   AgentSpan setMetric(CharSequence key, double value);