support long, double and boolean for tags micrometer-metrics#234

nikoncode · Apr 19, 2023 · a88cd54 · a88cd54
1 parent 7ff0829
commit a88cd54
Show file tree

Hide file tree

Showing 16 changed files with 388 additions and 14 deletions.
diff --git a/...eter-tracing-bridge-brave/src/main/java/io/micrometer/tracing/brave/bridge/BraveSpan.java b/...eter-tracing-bridge-brave/src/main/java/io/micrometer/tracing/brave/bridge/BraveSpan.java
@@ -104,6 +104,21 @@ public Span tag(String key, String value) {
         return this;
     }
 
+    @Override
+    public Span tag(String key, long value) {
+        return tag(key, String.valueOf(value));
+    }
+
+    @Override
+    public Span tag(String key, double value) {
+        return tag(key, String.valueOf(value));
+    }
+
+    @Override
+    public Span tag(String key, boolean value) {
+        return tag(key, String.valueOf(value));
+    }
+
     @Override
     public Span error(Throwable throwable) {
         String message = throwable.getMessage() == null ? throwable.getClass().getSimpleName() : throwable.getMessage();

diff --git a/...acing-bridge-brave/src/main/java/io/micrometer/tracing/brave/bridge/BraveSpanBuilder.java b/...acing-bridge-brave/src/main/java/io/micrometer/tracing/brave/bridge/BraveSpanBuilder.java
@@ -120,6 +120,21 @@ public Span.Builder tag(String key, String value) {
         return this;
     }
 
+    @Override
+    public Span.Builder tag(String key, long value) {
+        return tag(key, String.valueOf(value));
+    }
+
+    @Override
+    public Span.Builder tag(String key, double value) {
+        return tag(key, String.valueOf(value));
+    }
+
+    @Override
+    public Span.Builder tag(String key, boolean value) {
+        return tag(key, String.valueOf(value));
+    }
+
     @Override
     public Span.Builder error(Throwable throwable) {
         this.error = throwable;

diff --git a/...ng-bridge-brave/src/main/java/io/micrometer/tracing/brave/bridge/BraveSpanCustomizer.java b/...ng-bridge-brave/src/main/java/io/micrometer/tracing/brave/bridge/BraveSpanCustomizer.java
@@ -63,6 +63,21 @@ public SpanCustomizer tag(String key, String value) {
         return new BraveSpanCustomizer(this.spanCustomizer.tag(key, value));
     }
 
+    @Override
+    public SpanCustomizer tag(String key, long value) {
+        return tag(key, String.valueOf(value));
+    }
+
+    @Override
+    public SpanCustomizer tag(String key, double value) {
+        return tag(key, String.valueOf(value));
+    }
+
+    @Override
+    public SpanCustomizer tag(String key, boolean value) {
+        return tag(key, String.valueOf(value));
+    }
+
     @Override
     public SpanCustomizer event(String value) {
         return new BraveSpanCustomizer(this.spanCustomizer.annotate(value));

diff --git a/...-bridge-brave/src/test/java/io/micrometer/tracing/brave/bridge/BraveSpanBuilderTests.java b/...-bridge-brave/src/test/java/io/micrometer/tracing/brave/bridge/BraveSpanBuilderTests.java
@@ -27,6 +27,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.BDDAssertions.then;
 
 class BraveSpanBuilderTests {
@@ -61,6 +62,7 @@ void should_set_links() {
 
         builder.addLink(new Link(span2.context(), tags())).addLink(new Link(span1)).start().end();
 
+
         MutableSpan finishedSpan = handler.get(0);
         then(finishedSpan.tags()).containsEntry("links[0].traceId", span2.context().traceId())
             .containsEntry("links[0].spanId", span2.context().spanId())
@@ -70,6 +72,23 @@ void should_set_links() {
             .containsEntry("links[1].spanId", span1.context().spanId());
     }
 
+    @Test
+    void should_set_non_string_tags() {
+        new BraveSpanBuilder(tracing.tracer())
+            .tag("string", "string")
+            .tag("double", 2.5)
+            .tag("long", 2)
+            .tag("boolean", true)
+            .start()
+            .end();
+
+        assertThat(handler.get(0).tags())
+            .containsEntry("string", "string")
+            .containsEntry("double", "2.5")
+            .containsEntry("long", "2")
+            .containsEntry("boolean", "true");
+    }
+
     private Map<String, String> tags() {
         Map<String, String> map = new HashMap<>();
         map.put("tag1", "value1");

diff --git a/...-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/bridge/BraveSpanTest.java b/...-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/bridge/BraveSpanTest.java
@@ -0,0 +1,30 @@
+package io.micrometer.tracing.brave.bridge;
+
+import brave.Tracing;
+import brave.test.TestSpanHandler;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class BraveSpanTest {
+    TestSpanHandler handler = new TestSpanHandler();
+
+    Tracing tracing = Tracing.newBuilder().addSpanHandler(handler).build();
+
+    @Test
+    void should_set_non_string_tags() {
+        new BraveSpan(tracing.tracer().nextSpan())
+            .start()
+            .tag("string", "string")
+            .tag("double", 2.5)
+            .tag("long", 2)
+            .tag("boolean", true)
+            .end();
+
+        assertThat(handler.get(0).tags())
+            .containsEntry("string", "string")
+            .containsEntry("double", "2.5")
+            .containsEntry("long", "2")
+            .containsEntry("boolean", "true");
+    }
+}
diff --git a/...rometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/OtelSpan.java b/...rometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/OtelSpan.java
@@ -107,6 +107,24 @@ public Span tag(String key, String value) {
         return new OtelSpan(this.delegate);
     }
 
+    @Override
+    public Span tag(String key, long value) {
+        this.delegate.setAttribute(key, value);
+        return new OtelSpan(this.delegate);
+    }
+
+    @Override
+    public Span tag(String key, double value) {
+        this.delegate.setAttribute(key, value);
+        return new OtelSpan(this.delegate);
+    }
+
+    @Override
+    public Span tag(String key, boolean value) {
+        this.delegate.setAttribute(key, value);
+        return new OtelSpan(this.delegate);
+    }
+
     @Override
     public void end(long time, TimeUnit timeUnit) {
         this.delegate.end(time, timeUnit);

diff --git a/...-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/OtelSpanBuilder.java b/...-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/OtelSpanBuilder.java
@@ -89,6 +89,24 @@ public Span.Builder tag(String key, String value) {
         return this;
     }
 
+    @Override
+    public Span.Builder tag(String key, long value) {
+        this.delegate.setAttribute(key, value);
+        return this;
+    }
+
+    @Override
+    public Span.Builder tag(String key, double value) {
+        this.delegate.setAttribute(key, value);
+        return this;
+    }
+
+    @Override
+    public Span.Builder tag(String key, boolean value) {
+        this.delegate.setAttribute(key, value);
+        return this;
+    }
+
     @Override
     public Span.Builder error(Throwable throwable) {
         this.error = throwable;

diff --git a/...acing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/OtelSpanCustomizer.java b/...acing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/OtelSpanCustomizer.java
@@ -42,6 +42,24 @@ public SpanCustomizer tag(String key, String value) {
         return this;
     }
 
+    @Override
+    public SpanCustomizer tag(String key, long value) {
+        currentSpan().setAttribute(key, value);
+        return this;
+    }
+
+    @Override
+    public SpanCustomizer tag(String key, double value) {
+        currentSpan().setAttribute(key, value);
+        return this;
+    }
+
+    @Override
+    public SpanCustomizer tag(String key, boolean value) {
+        currentSpan().setAttribute(key, value);
+        return this;
+    }
+
     @Override
     public SpanCustomizer event(String value) {
         currentSpan().addEvent(value);

diff --git a/...ing-bridge-otel/src/test/java/io/micrometer/tracing/otel/bridge/OtelSpanBuilderTests.java b/...ing-bridge-otel/src/test/java/io/micrometer/tracing/otel/bridge/OtelSpanBuilderTests.java
@@ -17,6 +17,7 @@
 
 import io.micrometer.tracing.Link;
 import io.micrometer.tracing.Span;
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.extension.trace.propagation.B3Propagator;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
@@ -28,7 +29,10 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.BDDAssertions.then;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class OtelSpanBuilderTests {
 
@@ -80,6 +84,23 @@ void should_set_links() {
             .collect(Collectors.toMap(e -> e.getKey().getKey(), e -> e.getValue().toString()))).isEqualTo(tags());
     }
 
+    @Test
+    void should_set_non_string_tags() {
+        new OtelSpanBuilder(otelTracer.spanBuilder("foo"))
+            .tag("string", "string")
+            .tag("double", 2.5)
+            .tag("long", 2)
+            .tag("boolean", true)
+            .start()
+            .end();
+
+        SpanData poll = processor.spans().poll();
+        assertEquals("string", poll.getAttributes().get(AttributeKey.stringKey("string")));
+        assertEquals(2.5, poll.getAttributes().get(AttributeKey.doubleKey("double")));
+        assertEquals(2, poll.getAttributes().get(AttributeKey.longKey("long")));
+        assertTrue(poll.getAttributes().get(AttributeKey.booleanKey("boolean")));
+    }
+
     private Map<String, String> tags() {
         Map<String, String> map = new HashMap<>();
         map.put("tag1", "value1");

diff --git a/...er-tracing-bridge-otel/src/test/java/io/micrometer/tracing/otel/bridge/OtelSpanTests.java b/...er-tracing-bridge-otel/src/test/java/io/micrometer/tracing/otel/bridge/OtelSpanTests.java
@@ -1,12 +1,12 @@
 /**
  * Copyright 2022 the original author or authors.
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * <p>
  * https://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,6 +15,7 @@
  */
 package io.micrometer.tracing.otel.bridge;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.extension.trace.propagation.B3Propagator;
@@ -25,29 +26,53 @@
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.BDDAssertions.then;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class OtelSpanTests {
+    ArrayListSpanProcessor processor = new ArrayListSpanProcessor();
+
+    SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
+        .setSampler(io.opentelemetry.sdk.trace.samplers.Sampler.alwaysOn())
+        .addSpanProcessor(processor)
+        .build();
+
+    OpenTelemetrySdk openTelemetrySdk = OpenTelemetrySdk.builder()
+        .setTracerProvider(sdkTracerProvider)
+        .setPropagators(ContextPropagators.create(B3Propagator.injectingSingleHeader()))
+        .build();
+
+    io.opentelemetry.api.trace.Tracer otelTracer = openTelemetrySdk.getTracer("io.micrometer.micrometer-tracing");
+
 
     @Test
     void should_set_status_to_error_when_recording_exception() {
-        ArrayListSpanProcessor arrayListSpanProcessor = new ArrayListSpanProcessor();
-        SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
-            .setSampler(io.opentelemetry.sdk.trace.samplers.Sampler.alwaysOn())
-            .addSpanProcessor(arrayListSpanProcessor)
-            .build();
-        OpenTelemetrySdk openTelemetrySdk = OpenTelemetrySdk.builder()
-            .setTracerProvider(sdkTracerProvider)
-            .setPropagators(ContextPropagators.create(B3Propagator.injectingSingleHeader()))
-            .build();
-        io.opentelemetry.api.trace.Tracer otelTracer = openTelemetrySdk.getTracer("io.micrometer.micrometer-tracing");
         OtelSpan otelSpan = new OtelSpan(otelTracer.spanBuilder("foo").startSpan());
 
         otelSpan.error(new RuntimeException("boom!")).end();
 
-        SpanData poll = arrayListSpanProcessor.spans().poll();
+        SpanData poll = processor.spans().poll();
         then(poll.getStatus()).isEqualTo(StatusData.create(StatusCode.ERROR, "boom!"));
         then(poll.getEvents()).hasSize(1);
         then(poll.getEvents().get(0).getAttributes().asMap().values()).containsAnyOf("boom!");
     }
 
+
+    @Test
+    void should_set_non_string_tags() {
+        OtelSpan otelSpan = new OtelSpan(otelTracer.spanBuilder("foo").startSpan());
+
+        otelSpan
+            .tag("long", 2)
+            .tag("string", "string")
+            .tag("double", 2.5)
+            .tag("boolean", true)
+            .end();
+
+        SpanData poll = processor.spans().poll();
+        assertEquals("string", poll.getAttributes().get(AttributeKey.stringKey("string")));
+        assertEquals(2.5, poll.getAttributes().get(AttributeKey.doubleKey("double")));
+        assertEquals(2, poll.getAttributes().get(AttributeKey.longKey("long")));
+        assertTrue(poll.getAttributes().get(AttributeKey.booleanKey("boolean")));
+    }
 }
diff --git a/...s/micrometer-tracing-test/src/main/java/io/micrometer/tracing/test/simple/SimpleSpan.java b/...s/micrometer-tracing-test/src/main/java/io/micrometer/tracing/test/simple/SimpleSpan.java
@@ -113,6 +113,21 @@ public SimpleSpan tag(String key, String value) {
         return this;
     }
 
+    @Override
+    public Span tag(String key, long value) {
+        return tag(key, String.valueOf(value));
+    }
+
+    @Override
+    public Span tag(String key, double value) {
+        return tag(key, String.valueOf(value));
+    }
+
+    @Override
+    public Span tag(String key, boolean value) {
+        return tag(key, String.valueOf(value));
+    }
+
     @Override
     public SimpleSpan error(Throwable throwable) {
         this.throwable = throwable;

diff --git a/...meter-tracing-test/src/main/java/io/micrometer/tracing/test/simple/SimpleSpanBuilder.java b/...meter-tracing-test/src/main/java/io/micrometer/tracing/test/simple/SimpleSpanBuilder.java
@@ -93,6 +93,21 @@ public Span.Builder tag(String key, String value) {
         return this;
     }
 
+    @Override
+    public Span.Builder tag(String key, long value) {
+        return tag(key, String.valueOf(value));
+    }
+
+    @Override
+    public Span.Builder tag(String key, double value) {
+        return tag(key, String.valueOf(value));
+    }
+
+    @Override
+    public Span.Builder tag(String key, boolean value) {
+        return tag(key, String.valueOf(value));
+    }
+
     @Override
     public Span.Builder error(Throwable throwable) {
         this.throwable = throwable;