Squash AgentSpan.Attributes with SpanAttributes (its only implementation)

Author: mcculls

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelConventions.java

@@ -249,7 +249,7 @@ private static String getStringAttribute(AgentSpan span, String key) {
     return (String) tag;
   }
 
-  public static AgentSpan.Attributes convertAttributes(Attributes attributes) {
+  public static SpanAttributes convertAttributes(Attributes attributes) {
     if (attributes.isEmpty()) {
       return SpanAttributes.EMPTY;
     }

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

@@ -8,7 +8,6 @@
 import com.squareup.moshi.ToJson;
 import datadog.trace.api.DDSpanId;
 import datadog.trace.api.DDTraceId;
-import datadog.trace.bootstrap.instrumentation.api.AgentSpan.Attributes;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink;
 import datadog.trace.bootstrap.instrumentation.api.SpanAttributes;
 import datadog.trace.bootstrap.instrumentation.api.SpanLink;
@@ -26,7 +25,11 @@ public class DDSpanLink extends SpanLink {
   private static final int TAG_MAX_LENGTH = 25_000;
 
   protected DDSpanLink(
-      DDTraceId traceId, long spanId, byte traceFlags, String traceState, Attributes attributes) {
+      DDTraceId traceId,
+      long spanId,
+      byte traceFlags,
+      String traceState,
+      SpanAttributes attributes) {
     super(traceId, spanId, traceFlags, traceState, attributes);
   }
 
@@ -49,7 +52,7 @@ public static SpanLink from(ExtractedContext context) {
    * @param attributes The span link attributes.
    * @return A span link to the given context with custom attributes.
    */
-  public static SpanLink from(ExtractedContext context, Attributes attributes) {
+  public static SpanLink from(ExtractedContext context, SpanAttributes attributes) {
     byte traceFlags = context.getSamplingPriority() > 0 ? SAMPLED_FLAG : DEFAULT_FLAGS;
     String traceState =
         context.getPropagationTags() == null

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

@@ -5,7 +5,6 @@
 import datadog.trace.api.gateway.IGSpanInfo;
 import datadog.trace.api.gateway.RequestContext;
 import datadog.trace.api.interceptor.MutableSpan;
-import java.util.Map;
 
 public interface AgentSpan extends MutableSpan, IGSpanInfo, WithAgentSpan {
 
@@ -146,20 +145,4 @@ public interface AgentSpan extends MutableSpan, IGSpanInfo, WithAgentSpan {
   default AgentSpan asAgentSpan() {
     return this;
   }
-
-  interface Attributes {
-    /**
-     * Gets the attributes as an immutable map.
-     *
-     * @return The attributes as an immutable map.
-     */
-    Map<String, String> asMap();
-
-    /**
-     * Checks whether the attributes are empty.
-     *
-     * @return {@code true} if the attributes are empty, {@code false} otherwise.
-     */
-    boolean isEmpty();
-  }
 }

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

@@ -1,7 +1,6 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
 import datadog.trace.api.DDTraceId;
-import datadog.trace.bootstrap.instrumentation.api.AgentSpan.Attributes;
 
 /**
  * This interface describes a link to another span. The linked span could be part of the same trace
@@ -50,5 +49,5 @@ public interface AgentSpanLink {
    *
    * @return The link attributes.
    */
-  Attributes attributes();
+  SpanAttributes attributes();
 }

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

@@ -2,16 +2,14 @@
 
 import static java.util.Objects.requireNonNull;
 
-import datadog.trace.bootstrap.instrumentation.api.AgentSpan.Attributes;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-/** This class is a base implementation of {@link Attributes}. */
-public class SpanAttributes implements Attributes {
+public class SpanAttributes {
   /** Represent an empty attributes. */
-  public static final Attributes EMPTY = new SpanAttributes(Collections.emptyMap());
+  public static final SpanAttributes EMPTY = new SpanAttributes(Collections.emptyMap());
 
   private final Map<String, String> attributes;
 
@@ -38,12 +36,20 @@ public static SpanAttributes fromMap(Map<String, String> map) {
     return new SpanAttributes(new HashMap<>(map));
   }
 
-  @Override
+  /**
+   * Gets the attributes as an immutable map.
+   *
+   * @return The attributes as an immutable map.
+   */
   public Map<String, String> asMap() {
     return this.attributes;
   }
 
-  @Override
+  /**
+   * Checks whether the attributes are empty.
+   *
+   * @return {@code true} if the attributes are empty, {@code false} otherwise.
+   */
   public boolean isEmpty() {
     return this.attributes.isEmpty();
   }
@@ -115,7 +121,7 @@ protected <T> Builder putArray(String key, List<T> array) {
       return this;
     }
 
-    public Attributes build() {
+    public SpanAttributes build() {
       return new SpanAttributes(this.attributes);
     }
   }

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

@@ -10,14 +10,14 @@ public class SpanLink implements AgentSpanLink {
   private final long spanId;
   private final byte traceFlags;
   private final String traceState;
-  private final AgentSpan.Attributes attributes;
+  private final SpanAttributes attributes;
 
   protected SpanLink(
       DDTraceId traceId,
       long spanId,
       byte traceFlags,
       String traceState,
-      AgentSpan.Attributes attributes) {
+      SpanAttributes attributes) {
     this.traceId = traceId == null ? DDTraceId.ZERO : traceId;
     this.spanId = spanId;
     this.traceFlags = traceFlags;
@@ -47,10 +47,7 @@ public static SpanLink from(AgentSpanContext context) {
    * @return A span link to the given context.
    */
   public static SpanLink from(
-      AgentSpanContext context,
-      byte traceFlags,
-      String traceState,
-      AgentSpan.Attributes attributes) {
+      AgentSpanContext context, byte traceFlags, String traceState, SpanAttributes attributes) {
     if (context.getSamplingPriority() > 0) {
       traceFlags = (byte) (traceFlags | SAMPLED_FLAG);
     }
@@ -79,7 +76,7 @@ public String traceState() {
   }
 
   @Override
-  public AgentSpan.Attributes attributes() {
+  public SpanAttributes attributes() {
     return this.attributes;
   }