Do not map semconv values from OT to OTel. (#5016)

Author: carlosalberto

opentracing-shim/src/main/java/io/opentelemetry/opentracingshim/SpanBuilderShim.java

@@ -15,7 +15,6 @@
 import io.opentelemetry.api.baggage.BaggageBuilder;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
-import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
@@ -43,7 +42,6 @@ final class SpanBuilderShim extends BaseShimObject implements SpanBuilder {
   private final List<AttributeKey> spanBuilderAttributeKeys = new ArrayList<>();
 
   private final List<Object> spanBuilderAttributeValues = new ArrayList<>();
-  @Nullable private SpanKind spanKind;
   @Nullable private Boolean error;
   private long startTimestampMicros;
 
@@ -118,25 +116,7 @@ public SpanBuilder ignoreActiveSpan() {
 
   @Override
   public SpanBuilder withTag(String key, String value) {
-    if (Tags.SPAN_KIND.getKey().equals(key)) {
-      switch (value) {
-        case Tags.SPAN_KIND_CLIENT:
-          spanKind = SpanKind.CLIENT;
-          break;
-        case Tags.SPAN_KIND_SERVER:
-          spanKind = SpanKind.SERVER;
-          break;
-        case Tags.SPAN_KIND_PRODUCER:
-          spanKind = SpanKind.PRODUCER;
-          break;
-        case Tags.SPAN_KIND_CONSUMER:
-          spanKind = SpanKind.CONSUMER;
-          break;
-        default:
-          spanKind = SpanKind.INTERNAL;
-          break;
-      }
-    } else if (Tags.ERROR.getKey().equals(key)) {
+    if (Tags.ERROR.getKey().equals(key)) {
       error = Boolean.parseBoolean(value);
     } else {
       this.spanBuilderAttributeKeys.add(stringKey(key));
@@ -229,10 +209,6 @@ public Span start() {
           parentInfo.getRefType() == ReferenceType.CHILD_OF ? CHILD_OF_ATTR : FOLLOWS_FROM_ATTR);
     }
 
-    if (spanKind != null) {
-      builder.setSpanKind(spanKind);
-    }
-
     if (startTimestampMicros > 0) {
       builder.setStartTimestamp(startTimestampMicros, TimeUnit.MICROSECONDS);
     }

opentracing-shim/src/main/java/io/opentelemetry/opentracingshim/SpanShim.java

@@ -82,10 +82,7 @@ public SpanContext context() {
 
   @Override
   public Span setTag(String key, String value) {
-    if (Tags.SPAN_KIND.getKey().equals(key)) {
-      // TODO: confirm we can safely ignore span.kind after Span was created
-      // https://github.com/bogdandrutu/opentelemetry/issues/42
-    } else if (Tags.ERROR.getKey().equals(key)) {
+    if (Tags.ERROR.getKey().equals(key)) {
       StatusCode canonicalCode = Boolean.parseBoolean(value) ? StatusCode.ERROR : StatusCode.OK;
       span.setStatus(canonicalCode);
     } else {

opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/testbed/actorpropagation/ActorPropagationTest.java

@@ -5,11 +5,8 @@
 
 package io.opentelemetry.opentracingshim.testbed.actorpropagation;
 
-import static io.opentelemetry.opentracingshim.testbed.TestUtils.getByKind;
-import static io.opentelemetry.opentracingshim.testbed.TestUtils.getOneByKind;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.opentracingshim.OpenTracingShim;
 import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension;
 import io.opentelemetry.sdk.trace.data.SpanData;
@@ -67,14 +64,11 @@ void testActorTell() {
       phaser.arriveAndAwaitAdvance(); // continue...
       phaser.arriveAndAwaitAdvance(); // child tracer finished
       assertThat(otelTesting.getSpans().size()).isEqualTo(3);
-      assertThat(getByKind(otelTesting.getSpans(), SpanKind.CONSUMER)).hasSize(2);
       phaser.arriveAndDeregister(); // continue...
 
       List<SpanData> finished = otelTesting.getSpans();
       assertThat(finished.size()).isEqualTo(3);
       assertThat(finished.get(0).getTraceId()).isEqualTo(finished.get(1).getTraceId());
-      assertThat(getByKind(finished, SpanKind.CONSUMER)).hasSize(2);
-      assertThat(getOneByKind(finished, SpanKind.PRODUCER)).isNotNull();
 
       assertThat(tracer.scopeManager().activeSpan()).isNull();
     }
@@ -103,7 +97,6 @@ void testActorAsk() throws ExecutionException, InterruptedException {
       phaser.arriveAndAwaitAdvance(); // continue...
       phaser.arriveAndAwaitAdvance(); // child tracer finished
       assertThat(otelTesting.getSpans().size()).isEqualTo(3);
-      assertThat(getByKind(otelTesting.getSpans(), SpanKind.CONSUMER)).hasSize(2);
       phaser.arriveAndDeregister(); // continue...
 
       List<SpanData> finished = otelTesting.getSpans();
@@ -114,8 +107,6 @@ void testActorAsk() throws ExecutionException, InterruptedException {
 
       assertThat(finished.size()).isEqualTo(3);
       assertThat(finished.get(0).getTraceId()).isEqualTo(finished.get(1).getTraceId());
-      assertThat(getByKind(finished, SpanKind.CONSUMER)).hasSize(2);
-      assertThat(getOneByKind(finished, SpanKind.PRODUCER)).isNotNull();
 
       assertThat(tracer.scopeManager().activeSpan()).isNull();
     }

opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/testbed/clientserver/TestClientServerTest.java

@@ -7,7 +7,6 @@
 
 import static io.opentelemetry.opentracingshim.testbed.TestUtils.finishedSpansSize;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.core.IsEqual.equalTo;
 
@@ -65,17 +64,8 @@ private void verify() {
     assertThat(finished).hasSize(2);
 
     assertThat(finished.get(1).getTraceId()).isEqualTo(finished.get(0).getTraceId());
-    SpanKind firstSpanKind = finished.get(0).getKind();
-    switch (firstSpanKind) {
-      case CLIENT:
-        assertThat(finished.get(1).getKind()).isEqualTo(SpanKind.SERVER);
-        break;
-      case SERVER:
-        assertThat(finished.get(1).getKind()).isEqualTo(SpanKind.CLIENT);
-        break;
-      default:
-        fail("Unexpected first span kind: " + firstSpanKind);
-    }
+    assertThat(finished.get(0).getKind()).isEqualTo(SpanKind.INTERNAL); // No semconv mapping.
+    assertThat(finished.get(1).getKind()).isEqualTo(SpanKind.INTERNAL);
 
     assertThat(tracer.scopeManager().activeSpan()).isNull();
   }

opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/testbed/concurrentcommonrequesthandler/HandlerTest.java

@@ -10,7 +10,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.trace.SpanId;
-import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.opentracingshim.OpenTracingShim;
 import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension;
 import io.opentelemetry.sdk.trace.data.SpanData;
@@ -46,10 +45,6 @@ void two_requests() throws Exception {
     List<SpanData> finished = otelTesting.getSpans();
     assertThat(finished).hasSize(2);
 
-    for (SpanData spanData : finished) {
-      assertThat(spanData.getKind()).isEqualTo(SpanKind.CLIENT);
-    }
-
     assertThat(finished.get(1).getTraceId()).isNotEqualTo(finished.get(0).getTraceId());
     assertThat(SpanId.isValid(finished.get(0).getParentSpanId())).isFalse();
     assertThat(SpanId.isValid(finished.get(1).getParentSpanId())).isFalse();

opentracing-shim/src/test/java/io/opentelemetry/opentracingshim/testbed/listenerperrequest/ListenerTest.java

@@ -5,7 +5,6 @@
 
 package io.opentelemetry.opentracingshim.testbed.listenerperrequest;
 
-import static io.opentelemetry.api.trace.SpanKind.CLIENT;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.opentracingshim.OpenTracingShim;
@@ -31,7 +30,6 @@ void test() throws Exception {
 
     List<SpanData> finished = otelTesting.getSpans();
     assertThat(finished).hasSize(1);
-    assertThat(CLIENT).isEqualTo(finished.get(0).getKind());
 
     assertThat(tracer.scopeManager().activeSpan()).isNull();
   }