Spans

Author: trask

api/incubator/src/main/java/io/opentelemetry/api/incubator/trace/ExtendedDefaultTracer.java

@@ -7,6 +7,7 @@
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.incubator.common.ExtendedAttributeKey;
 import io.opentelemetry.api.incubator.propagation.ExtendedContextPropagators;
 import io.opentelemetry.api.internal.ApiUsageLogger;
 import io.opentelemetry.api.trace.Span;
@@ -118,6 +119,11 @@ public <T> NoopSpanBuilder setAttribute(AttributeKey<T> key, T value) {
       return this;
     }
 
+    @Override
+    public <T> NoopSpanBuilder setAttribute(ExtendedAttributeKey<T> key, T value) {
+      return this;
+    }
+
     @Override
     public NoopSpanBuilder setAllAttributes(Attributes attributes) {
       return this;

api/incubator/src/main/java/io/opentelemetry/api/incubator/trace/ExtendedSpanBuilder.java

@@ -8,6 +8,7 @@
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.incubator.common.ExtendedAttributeKey;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.SpanContext;
@@ -127,6 +128,17 @@ <E extends Throwable> void startAndRun(
   @Override
   <T> ExtendedSpanBuilder setAttribute(AttributeKey<T> key, T value);
 
+  /**
+   * Set an attribute.
+   *
+   * <p>NOTE: all standard {@link AttributeKey}-value pairs can also be represented as {@link
+   * ExtendedAttributeKey}-value pairs, but not all {@link ExtendedAttributeKey}-value pairs can be
+   * represented as standard {@link AttributeKey}-value pairs. From the standpoint of the emitted
+   * span, there is no difference between adding attributes using the standard or extended
+   * attribute APIs.
+   */
+  <T> ExtendedSpanBuilder setAttribute(ExtendedAttributeKey<T> key, T value);
+
   /** {@inheritDoc} */
   @Override
   default ExtendedSpanBuilder setAllAttributes(Attributes attributes) {

sdk/trace/src/main/java/io/opentelemetry/sdk/trace/ExtendedSdkSpanBuilder.java

@@ -7,6 +7,7 @@
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.incubator.common.ExtendedAttributeKey;
 import io.opentelemetry.api.incubator.propagation.ExtendedContextPropagators;
 import io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder;
 import io.opentelemetry.api.incubator.trace.SpanCallable;
@@ -94,6 +95,19 @@ public <T> ExtendedSpanBuilder setAttribute(AttributeKey<T> key, T value) {
     return this;
   }
 
+  @Override
+  public <T> ExtendedSpanBuilder setAttribute(ExtendedAttributeKey<T> key, T value) {
+    if (key == null || value == null) {
+      return this;
+    }
+    AttributeKey<T> attributeKey = key.asAttributeKey();
+    if (attributeKey == null || attributeKey.getKey().isEmpty()) {
+      return this;
+    }
+    super.setAttribute(attributeKey, value);
+    return this;
+  }
+
   @Override
   public ExtendedSpanBuilder setStartTimestamp(long startTimestamp, TimeUnit unit) {
     super.setStartTimestamp(startTimestamp, unit);

sdk/trace/src/testIncubating/java/io/opentelemetry/sdk/trace/ExtendedSpanBuilderTest.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.trace;
+
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
+
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.incubator.common.ExtendedAttributeKey;
+import io.opentelemetry.api.incubator.common.ExtendedAttributes;
+import io.opentelemetry.api.incubator.trace.ExtendedSpanBuilder;
+import io.opentelemetry.api.incubator.trace.ExtendedTracer;
+import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter;
+import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
+import io.opentelemetry.sdk.trace.data.SpanData;
+import java.util.List;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class ExtendedSpanBuilderTest {
+
+  private InMemorySpanExporter spanExporter;
+  private SdkTracerProvider tracerProvider;
+  private ExtendedTracer tracer;
+
+  @BeforeEach
+  void setUp() {
+    spanExporter = InMemorySpanExporter.create();
+    tracerProvider =
+        SdkTracerProvider.builder()
+            .addSpanProcessor(SimpleSpanProcessor.create(spanExporter))
+            .build();
+    tracer = (ExtendedTracer) tracerProvider.get("test");
+  }
+
+  @AfterEach
+  void tearDown() throws Exception {
+    tracerProvider.close();
+  }
+
+  @Test
+  void setAttribute_withExtendedAttributeKeyDelegatesToSdk() {
+    ExtendedSpanBuilder spanBuilder = tracer.spanBuilder("span");
+
+    spanBuilder.setAttribute(ExtendedAttributeKey.stringKey("extended.string"), "value");
+    spanBuilder.startSpan().end();
+
+    List<SpanData> spans = spanExporter.getFinishedSpanItems();
+    assertThat(spans)
+        .hasSize(1)
+        .first()
+        .satisfies(
+            spanData ->
+                assertThat(spanData.getAttributes())
+                    .containsEntry(AttributeKey.stringKey("extended.string"), "value"));
+  }
+
+  @Test
+  void setAttribute_withUnsupportedExtendedAttributeKeyIsNoop() {
+    ExtendedSpanBuilder spanBuilder = tracer.spanBuilder("span");
+
+    spanBuilder.setAttribute(
+        ExtendedAttributeKey.extendedAttributesKey("extended.map"), ExtendedAttributes.empty());
+    spanBuilder.startSpan().end();
+
+    List<SpanData> spans = spanExporter.getFinishedSpanItems();
+    assertThat(spans)
+        .hasSize(1)
+        .first()
+        .satisfies(
+            spanData ->
+                assertThat(spanData.getAttributes().asMap())
+                    .doesNotContainKey(AttributeKey.stringKey("extended.map")));
+  }
+}