adding span.kind for Otel trace annotations

Author: mhlidd

dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanDecorator.java

@@ -2,8 +2,15 @@
 
 import static datadog.trace.api.DDSpanTypes.HTTP_CLIENT;
 import static datadog.trace.api.DDSpanTypes.HTTP_SERVER;
+import static datadog.trace.api.DDSpanTypes.INTERNAL;
 import static datadog.trace.api.DDSpanTypes.MESSAGE_CONSUMER;
 import static datadog.trace.api.DDSpanTypes.MESSAGE_PRODUCER;
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND;
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_CLIENT;
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_CONSUMER;
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_INTERNAL;
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_PRODUCER;
+import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_SERVER;
 import static java.lang.Math.min;
 
 import datadog.trace.api.InstrumenterConfig;
@@ -54,13 +61,13 @@ protected CharSequence component() {
 
   public AgentSpan startMethodSpan(Method method) {
     CharSequence operationName = null;
-    CharSequence spanType = null;
+    SpanKind spanKind = null;
     boolean inheritContext = true;
 
     WithSpan withSpanAnnotation = method.getAnnotation(WithSpan.class);
     if (withSpanAnnotation != null) {
       operationName = withSpanAnnotation.value();
-      spanType = convertToSpanType(withSpanAnnotation.kind());
+      spanKind = withSpanAnnotation.kind();
       if (INHERIT_CONTEXT_MH != null) {
         try {
           inheritContext = (boolean) INHERIT_CONTEXT_MH.invokeExact(withSpanAnnotation);
@@ -82,8 +89,9 @@ public AgentSpan startMethodSpan(Method method) {
     final AgentSpan span = spanBuilder.start();
     DECORATE.afterStart(span);
 
-    if (spanType != null) {
-      span.setSpanType(spanType);
+    if (spanKind != null) {
+      span.setSpanType(convertToSpanType(spanKind));
+      span.setTag(SPAN_KIND, convertToSpanKindTag(spanKind));
     }
     if (InstrumenterConfig.get().isMethodMeasured(method)) {
       span.setMeasured(true);
@@ -106,6 +114,28 @@ private static String convertToSpanType(SpanKind kind) {
       case CONSUMER:
         return MESSAGE_CONSUMER;
       case INTERNAL:
+        // checking for SpanKind.INTERNAL, returning DDSpanTypes.INTERNAL
+        return INTERNAL;
+      default:
+        return null;
+    }
+  }
+
+  private static String convertToSpanKindTag(SpanKind kind) {
+    if (kind == null) {
+      return null;
+    }
+    switch (kind) {
+      case CLIENT:
+        return SPAN_KIND_CLIENT;
+      case SERVER:
+        return SPAN_KIND_SERVER;
+      case PRODUCER:
+        return SPAN_KIND_PRODUCER;
+      case CONSUMER:
+        return SPAN_KIND_CONSUMER;
+      case INTERNAL:
+        return SPAN_KIND_INTERNAL;
       default:
         return null;
     }

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

@@ -8,6 +8,8 @@ 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 SQL = "sql";
   public static final String MONGO = "mongodb";
   public static final String CASSANDRA = "cassandra";