re-working otel spec

Author: mhlidd

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

@@ -35,6 +35,7 @@
 public final class OtelConventions {
   static final String SPAN_KIND_INTERNAL = "internal";
   static final String OPERATION_NAME_SPECIFIC_ATTRIBUTE = "operation.name";
+  static final String SPAN_TYPE = "span.type";
   static final String ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES = "analytics.event";
   static final String HTTP_RESPONSE_STATUS_CODE_ATTRIBUTE = "http.response.status_code";
 
@@ -110,6 +111,9 @@ public static <T> boolean applyReservedAttribute(AgentSpan span, AttributeKey<T>
         } else if (ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES.equals(name) && value instanceof String) {
           span.setMetric(ANALYTICS_SAMPLE_RATE, parseBoolean((String) value) ? 1 : 0);
           return true;
+        } else if (SPAN_TYPE.equals(name) && value instanceof String) {
+          span.setSpanType((CharSequence) value);
+          return true;
         }
       case BOOLEAN:
         if (ANALYTICS_EVENT_SPECIFIC_ATTRIBUTES.equals(name) && value instanceof Boolean) {

dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/build.gradle

@@ -18,6 +18,7 @@ dependencies {
   compileOnly group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-annotations', version: openTelemetryVersion
   compileOnly group: 'com.google.auto.value', name: 'auto-value-annotations', version: '1.6.6'
 
+  implementation project(':dd-java-agent:agent-otel:otel-shim')
   testImplementation group: 'io.opentelemetry', name: 'opentelemetry-api', version: openTelemetryVersion
   testImplementation group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-annotations', version: openTelemetryVersion
   latest1xDepTestImplementation group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-annotations', version: '1+'

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

@@ -43,6 +43,7 @@ public String[] helperClassNames() {
     return new String[] {
       this.packageName + ".WithSpanDecorator",
       this.packageName + ".WithSpanDecorator$1", // Switch over enum generated class
+      "datadog.opentelemetry.shim.trace.OtelConventions",
     };
   }
 

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

@@ -1,9 +1,11 @@
 package datadog.trace.instrumentation.opentelemetry.annotations;
 
+import static datadog.opentelemetry.shim.trace.OtelConventions.toSpanKindTagValue;
 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.bootstrap.instrumentation.api.Tags.SPAN_KIND;
 import static java.lang.Math.min;
 
 import datadog.trace.api.InstrumenterConfig;
@@ -55,12 +57,13 @@ protected CharSequence component() {
   public AgentSpan startMethodSpan(Method method) {
     CharSequence operationName = null;
     CharSequence spanType = null;
+    SpanKind kind = null;
     boolean inheritContext = true;
 
     WithSpan withSpanAnnotation = method.getAnnotation(WithSpan.class);
     if (withSpanAnnotation != null) {
       operationName = withSpanAnnotation.value();
-      spanType = convertToSpanType(withSpanAnnotation.kind());
+      kind = withSpanAnnotation.kind();
       if (INHERIT_CONTEXT_MH != null) {
         try {
           inheritContext = (boolean) INHERIT_CONTEXT_MH.invokeExact(withSpanAnnotation);
@@ -82,8 +85,9 @@ public AgentSpan startMethodSpan(Method method) {
     final AgentSpan span = spanBuilder.start();
     DECORATE.afterStart(span);
 
-    if (spanType != null) {
-      span.setSpanType(spanType);
+    if (kind != null) {
+      span.setSpanType(convertToSpanType(kind));
+      span.setTag(SPAN_KIND, toSpanKindTagValue(kind));
     }
     if (InstrumenterConfig.get().isMethodMeasured(method)) {
       span.setMeasured(true);