adding type field to custom instrumentation

Author: mhlidd

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

@@ -3,6 +3,10 @@
 import static datadog.opentelemetry.shim.trace.OtelSpanEvent.EXCEPTION_MESSAGE_ATTRIBUTE_KEY;
 import static datadog.opentelemetry.shim.trace.OtelSpanEvent.EXCEPTION_STACK_TRACE_ATTRIBUTE_KEY;
 import static datadog.opentelemetry.shim.trace.OtelSpanEvent.EXCEPTION_TYPE_ATTRIBUTE_KEY;
+import static datadog.trace.api.DDSpanTypes.HTTP_CLIENT;
+import static datadog.trace.api.DDSpanTypes.HTTP_SERVER;
+import static datadog.trace.api.DDSpanTypes.MESSAGE_CONSUMER;
+import static datadog.trace.api.DDSpanTypes.MESSAGE_PRODUCER;
 import static datadog.trace.api.DDTags.ANALYTICS_SAMPLE_RATE;
 import static datadog.trace.api.DDTags.ERROR_MSG;
 import static datadog.trace.api.DDTags.ERROR_STACK;
@@ -21,6 +25,7 @@
 import static java.lang.Boolean.parseBoolean;
 import static java.util.Locale.ROOT;
 
+import datadog.trace.api.DDSpanTypes;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.SpanAttributes;
 import datadog.trace.bootstrap.instrumentation.api.Tags;
@@ -65,6 +70,33 @@ public static String toSpanKindTagValue(SpanKind spanKind) {
     }
   }
 
+  /**
+   * Convert OpenTelemetry {@link SpanKind} to {@link DDSpanTypes} values.
+   *
+   * @param kind The OpenTelemetry span kind to convert.
+   * @return The {@link DDSpanTypes} value.
+   */
+  public static String convertToSpanType(SpanKind kind) {
+    if (kind == null) {
+      return null;
+    }
+    switch (kind) {
+      case SERVER:
+        return HTTP_SERVER;
+      case CLIENT:
+        return HTTP_CLIENT;
+      case PRODUCER:
+        return MESSAGE_PRODUCER;
+      case CONSUMER:
+        return MESSAGE_CONSUMER;
+      case INTERNAL:
+        // checking for SpanKind.INTERNAL, returning DDSpanTypes.INTERNAL
+        return DDSpanTypes.INTERNAL;
+      default:
+        return null;
+    }
+  }
+
   /**
    * Convert {@link Tags#SPAN_KIND} value to OpenTelemetry {@link SpanKind}.
    *

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

@@ -3,6 +3,7 @@
 import static datadog.opentelemetry.shim.trace.OtelConventions.ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES;
 import static datadog.opentelemetry.shim.trace.OtelConventions.HTTP_RESPONSE_STATUS_CODE_ATTRIBUTE;
 import static datadog.opentelemetry.shim.trace.OtelConventions.OPERATION_NAME_SPECIFIC_ATTRIBUTE;
+import static datadog.opentelemetry.shim.trace.OtelConventions.convertToSpanType;
 import static datadog.opentelemetry.shim.trace.OtelConventions.toSpanKindTagValue;
 import static datadog.opentelemetry.shim.trace.OtelExtractedContext.extract;
 import static datadog.trace.api.DDTags.ANALYTICS_SAMPLE_RATE;
@@ -183,6 +184,7 @@ public <T> SpanBuilder setAttribute(AttributeKey<T> key, T value) {
   public SpanBuilder setSpanKind(SpanKind spanKind) {
     if (spanKind != null) {
       this.delegate.withTag(SPAN_KIND, toSpanKindTagValue(spanKind));
+      this.delegate.withSpanType(convertToSpanType(spanKind));
       this.spanKindSet = true;
     }
     return this;

dd-trace-api/src/main/java/datadog/trace/api/DDSpanTypes.java

@@ -8,7 +8,7 @@ public class DDSpanTypes {
   public static final String CACHE = "cache";
   public static final String SOAP = "soap";
 
-  public static final String INTERNAL = "INTERNAL";
+  public static final String INTERNAL = "internal";
 
   public static final String SQL = "sql";
   public static final String MONGO = "mongodb";