Update to Sdk 0.16.0 (#2221)

* Update to 0.16.0-SNAPSHOT

* Finish

* Finish

* Update to 0.16.0

* Finish

docs/logger-mdc-instrumentation.md

@@ -12,9 +12,9 @@ The OTel Java agent injects several pieces of information about the current span
 event's MDC copy:
 
 - `traceId` - the current trace id
-  (same as `Span.current().getSpanContext().getTraceIdAsHexString()`);
+  (same as `Span.current().getSpanContext().getTraceId()`);
 - `spanId` - the current span id
-  (same as `Span.current().getSpanContext().getSpanIdAsHexString()`);
+  (same as `Span.current().getSpanContext().getSpanId()`);
 - `sampled` - a boolean flag marking whether the current span is sampled or not
   (same as `Span.current().getSpanContext().isSampled()`).
 

examples/distro/custom/src/main/java/com/example/javaagent/DemoSampler.java

@@ -19,8 +19,8 @@ import java.util.List;
 public class DemoSampler implements Sampler {
   @Override
   public SamplingResult shouldSample(Context parentContext, String traceId, String name,
-      Span.Kind spanKind, Attributes attributes, List<LinkData> parentLinks) {
-    if (spanKind == Span.Kind.INTERNAL && name.contains("greeting")) {
+      SpanKind spanKind, Attributes attributes, List<LinkData> parentLinks) {
+    if (spanKind == SpanKind.INTERNAL && name.contains("greeting")) {
       return SamplingResult.create(SamplingResult.Decision.DROP);
     } else {
       return SamplingResult.create(SamplingResult.Decision.RECORD_AND_SAMPLE);

examples/distro/instrumentation/build.gradle

@@ -54,6 +54,6 @@ shadowJar {
   relocate "io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context"
 
   // relocate OpenTelemetry extensions
+  relocate "io.opentelemetry.extension.aws", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.aws"
   relocate "io.opentelemetry.extension.kotlin", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.kotlin"
-  relocate "io.opentelemetry.extension.trace.propagation", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.trace.propagation"
 }

examples/distro/instrumentation/servlet-3/src/main/java/com/example/javaagent/instrumentation/DemoServlet3InstrumentationModule.java

@@ -79,7 +79,7 @@ public final class DemoServlet3InstrumentationModule extends InstrumentationModu
         HttpServletResponse httpServletResponse = (HttpServletResponse) response;
         if (!httpServletResponse.containsHeader("X-server-id")) {
           httpServletResponse
-              .addHeader("X-server-id", Span.current().getSpanContext().getTraceIdAsHexString());
+              .addHeader("X-server-id", Span.current().getSpanContext().getTraceId());
         }
       }
 

gradle/dependencies.gradle

@@ -8,8 +8,8 @@ configurations.all {
 
 ext {
   versions = [
-    opentelemetry     : '0.15.0',
-    opentelemetryAlpha: "0.15.0-alpha",
+    opentelemetry     : '0.16.0',
+    opentelemetryAlpha: "0.16.0-alpha",
 
     slf4j             : "1.7.30",
     guava             : "30.1-jre",
@@ -37,6 +37,7 @@ ext {
     opentelemetryApi             : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-api', version: versions.opentelemetry),
     opentelemetryApiMetrics      : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-api-metrics', version: versions.opentelemetryAlpha),
     opentelemetryExtAnnotations  : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-extension-annotations', version: versions.opentelemetry),
+    opentelemetryExtAws          : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-extension-aws', version: versions.opentelemetry),
     opentelemetryContext         : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-context', version: versions.opentelemetry),
     opentelemetryKotlin          : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-extension-kotlin', version: versions.opentelemetry),
     opentelemetryLogging         : dependencies.create(group: 'io.opentelemetry', name: 'opentelemetry-exporter-logging', version: versions.opentelemetry),

gradle/instrumentation.gradle

@@ -97,8 +97,8 @@ shadowJar {
   relocate "io.opentelemetry.context", "io.opentelemetry.javaagent.shaded.io.opentelemetry.context"
 
   // relocate OpenTelemetry extensions
+  relocate "io.opentelemetry.extension.aws", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.aws"
   relocate "io.opentelemetry.extension.kotlin", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.kotlin"
-  relocate "io.opentelemetry.extension.trace.propagation", "io.opentelemetry.javaagent.shaded.io.opentelemetry.extension.trace.propagation"
 
   // this is for instrumentation on opentelemetry-api itself
   relocate "application.io.opentelemetry", "io.opentelemetry"

gradle/java.gradle

@@ -100,7 +100,7 @@ repositories {
   }
   // this is only needed for the working against unreleased otel-java snapshots
   maven {
-    url "https://oss.jfrog.org/artifactory/oss-snapshot-local"
+    url "https://oss.sonatype.org/content/repositories/snapshots"
     content {
       includeGroup "io.opentelemetry"
     }

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/BaseTracer.java

@@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.api.tracer;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.api.trace.Span.Kind;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
@@ -68,15 +68,15 @@ public abstract class BaseTracer {
 
   public Span startSpan(Class<?> clazz) {
     String spanName = spanNameForClass(clazz);
-    return startSpan(spanName, Kind.INTERNAL);
+    return startSpan(spanName, SpanKind.INTERNAL);
   }
 
   public Span startSpan(Method method) {
     String spanName = spanNameForMethod(method);
-    return startSpan(spanName, Kind.INTERNAL);
+    return startSpan(spanName, SpanKind.INTERNAL);
   }
 
-  public Span startSpan(String spanName, Kind kind) {
+  public Span startSpan(String spanName, SpanKind kind) {
     return tracer.spanBuilder(spanName).setSpanKind(kind).startSpan();
   }
 
@@ -92,7 +92,7 @@ public abstract class BaseTracer {
     return Context.current().with(span).makeCurrent();
   }
 
-  protected final boolean shouldStartSpan(Kind proposedKind, Context context) {
+  protected final boolean shouldStartSpan(SpanKind proposedKind, Context context) {
     switch (proposedKind) {
       case CLIENT:
         return !inClientSpan(context);

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/DatabaseClientTracer.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.api.tracer;
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT;
+import static io.opentelemetry.api.trace.SpanKind.CLIENT;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.Span;

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpClientTracer.java

@@ -5,12 +5,12 @@
 
 package io.opentelemetry.instrumentation.api.tracer;
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT;
+import static io.opentelemetry.api.trace.SpanKind.CLIENT;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.api.trace.Span.Kind;
 import io.opentelemetry.api.trace.SpanBuilder;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapPropagator;
@@ -81,7 +81,7 @@ public abstract class HttpClientTracer<REQUEST, CARRIER, RESPONSE> extends BaseT
   }
 
   public Context startSpan(
-      Kind kind, Context parentContext, REQUEST request, CARRIER carrier, long startTimeNanos) {
+      SpanKind kind, Context parentContext, REQUEST request, CARRIER carrier, long startTimeNanos) {
     Span span =
         internalStartSpan(
             kind, parentContext, request, spanNameForRequest(request), startTimeNanos);
@@ -92,7 +92,7 @@ public abstract class HttpClientTracer<REQUEST, CARRIER, RESPONSE> extends BaseT
 
   public Context startSpan(
       Context parentContext, REQUEST request, CARRIER carrier, long startTimeNanos) {
-    return startSpan(Kind.CLIENT, parentContext, request, carrier, startTimeNanos);
+    return startSpan(SpanKind.CLIENT, parentContext, request, carrier, startTimeNanos);
   }
 
   protected void inject(Context context, CARRIER carrier) {
@@ -138,7 +138,7 @@ public abstract class HttpClientTracer<REQUEST, CARRIER, RESPONSE> extends BaseT
   }
 
   private Span internalStartSpan(
-      Kind kind, Context parentContext, REQUEST request, String name, long startTimeNanos) {
+      SpanKind kind, Context parentContext, REQUEST request, String name, long startTimeNanos) {
     SpanBuilder spanBuilder = tracer.spanBuilder(name).setSpanKind(kind).setParent(parentContext);
     if (startTimeNanos > 0) {
       spanBuilder.setStartTimestamp(startTimeNanos, TimeUnit.NANOSECONDS);

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpServerTracer.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.api.tracer;
 
-import static io.opentelemetry.api.trace.Span.Kind.SERVER;
+import static io.opentelemetry.api.trace.SpanKind.SERVER;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.Span;

instrumentation-api/src/test/groovy/io/opentelemetry/instrumentation/api/tracer/BaseTracerTest.groovy

@@ -6,6 +6,7 @@
 package io.opentelemetry.instrumentation.api.tracer
 
 import io.opentelemetry.api.trace.Span
+import io.opentelemetry.api.trace.SpanKind
 import io.opentelemetry.context.Context
 import spock.lang.Shared
 import spock.lang.Specification
@@ -43,22 +44,22 @@ class BaseTracerTest extends Specification {
     result == expected
 
     where:
-    kind               | context                                   | expected
-    Span.Kind.CLIENT   | root                                      | true
-    Span.Kind.SERVER   | root                                      | true
-    Span.Kind.INTERNAL | root                                      | true
-    Span.Kind.PRODUCER | root                                      | true
-    Span.Kind.CONSUMER | root                                      | true
-    Span.Kind.CLIENT   | tracer.withClientSpan(root, existingSpan) | false
-    Span.Kind.SERVER   | tracer.withClientSpan(root, existingSpan) | true
-    Span.Kind.INTERNAL | tracer.withClientSpan(root, existingSpan) | true
-    Span.Kind.CONSUMER | tracer.withClientSpan(root, existingSpan) | true
-    Span.Kind.PRODUCER | tracer.withClientSpan(root, existingSpan) | true
-    Span.Kind.SERVER   | tracer.withServerSpan(root, existingSpan) | false
-    Span.Kind.INTERNAL | tracer.withServerSpan(root, existingSpan) | true
-    Span.Kind.CONSUMER | tracer.withServerSpan(root, existingSpan) | true
-    Span.Kind.PRODUCER | tracer.withServerSpan(root, existingSpan) | true
-    Span.Kind.CLIENT   | tracer.withServerSpan(root, existingSpan) | true
+    kind              | context                                   | expected
+    SpanKind.CLIENT   | root | true
+    SpanKind.SERVER   | root                                      | true
+    SpanKind.INTERNAL | root                                      | true
+    SpanKind.PRODUCER | root                                      | true
+    SpanKind.CONSUMER | root                                      | true
+    SpanKind.CLIENT   | tracer.withClientSpan(root, existingSpan) | false
+    SpanKind.SERVER   | tracer.withClientSpan(root, existingSpan) | true
+    SpanKind.INTERNAL | tracer.withClientSpan(root, existingSpan) | true
+    SpanKind.CONSUMER | tracer.withClientSpan(root, existingSpan) | true
+    SpanKind.PRODUCER | tracer.withClientSpan(root, existingSpan) | true
+    SpanKind.SERVER   | tracer.withServerSpan(root, existingSpan) | false
+    SpanKind.INTERNAL | tracer.withServerSpan(root, existingSpan) | true
+    SpanKind.CONSUMER | tracer.withServerSpan(root, existingSpan) | true
+    SpanKind.PRODUCER | tracer.withServerSpan(root, existingSpan) | true
+    SpanKind.CLIENT   | tracer.withServerSpan(root, existingSpan) | true
   }
 
 

instrumentation-core/servlet-2.2/src/main/java/io/opentelemetry/instrumentation/servlet/ServletHttpServerTracer.java

@@ -98,8 +98,8 @@ public abstract class ServletHttpServerTracer<RESPONSE>
   @Override
   public void onRequest(Span span, HttpServletRequest request) {
     // we do this e.g. so that servlet containers can use these values in their access logs
-    request.setAttribute("traceId", span.getSpanContext().getTraceIdAsHexString());
-    request.setAttribute("spanId", span.getSpanContext().getSpanIdAsHexString());
+    request.setAttribute("traceId", span.getSpanContext().getTraceId());
+    request.setAttribute("spanId", span.getSpanContext().getSpanId());
 
     super.onRequest(span, request);
   }

instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 
 import akka.actor.ActorSystem
 import akka.http.javadsl.Http

instrumentation/apache-camel-2.20/javaagent-unittests/apache-camel-2.20-javaagent-unittests.gradle

@@ -5,6 +5,6 @@ dependencies {
   testImplementation group: 'org.apache.camel', name: 'camel-core', version: '2.20.1'
   testImplementation group: 'org.apache.camel', name: 'camel-aws', version: '2.20.1'
 
-  testImplementation deps.opentelemetryTraceProps
+  testImplementation deps.opentelemetryExtAws
   testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.18.1'
 }

instrumentation/apache-camel-2.20/javaagent-unittests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtilTest.java

@@ -36,8 +36,7 @@ public class CamelPropagationUtilTest {
     // then
     Span parentSpan = Span.fromContext(parent);
     SpanContext parentSpanContext = parentSpan.getSpanContext();
-    assertThat(parentSpanContext.getTraceIdAsHexString())
-        .isEqualTo("5759e988bd862e3fe1be46a994272793");
-    assertThat(parentSpanContext.getSpanIdAsHexString()).isEqualTo("53995c3f42cd8ad8");
+    assertThat(parentSpanContext.getTraceId()).isEqualTo("5759e988bd862e3fe1be46a994272793");
+    assertThat(parentSpanContext.getSpanId()).isEqualTo("53995c3f42cd8ad8");
   }
 }

instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle

@@ -18,7 +18,7 @@ ext {
 
 dependencies {
   library group: 'org.apache.camel', name: 'camel-core', version: "$camelversion"
-  implementation deps.opentelemetryTraceProps
+  implementation deps.opentelemetryExtAws
 
   testInstrumentation project(':instrumentation:apache-httpclient:apache-httpclient-2.0:javaagent')
   testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent')

instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveSpanManager.java

@@ -24,6 +24,7 @@
 package io.opentelemetry.javaagent.instrumentation.apachecamel;
 
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Scope;
 import org.apache.camel.Exchange;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -54,7 +55,7 @@ class ActiveSpanManager {
    * @param exchange The exchange
    * @param span The span
    */
-  public static void activate(Exchange exchange, Span span, Span.Kind spanKind) {
+  public static void activate(Exchange exchange, Span span, SpanKind spanKind) {
 
     SpanWithScope parent = exchange.getProperty(ACTIVE_SPAN_PROPERTY, SpanWithScope.class);
     SpanWithScope spanWithScope = SpanWithScope.activate(span, parent, spanKind);
@@ -91,7 +92,7 @@ class ActiveSpanManager {
       this.scope = scope;
     }
 
-    public static SpanWithScope activate(Span span, SpanWithScope parent, Span.Kind spanKind) {
+    public static SpanWithScope activate(Span span, SpanWithScope parent, SpanKind spanKind) {
       Scope scope = null;
       if (isClientSpan(spanKind)) {
         scope = CamelTracer.TRACER.startClientScope(span);
@@ -102,8 +103,8 @@ class ActiveSpanManager {
       return new SpanWithScope(parent, span, scope);
     }
 
-    private static boolean isClientSpan(Span.Kind kind) {
-      return (Span.Kind.CLIENT.equals(kind) || Span.Kind.PRODUCER.equals(kind));
+    private static boolean isClientSpan(SpanKind kind) {
+      return (SpanKind.CLIENT.equals(kind) || SpanKind.PRODUCER.equals(kind));
     }
 
     public SpanWithScope getParent() {

instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ApacheCamelInstrumentationModule.java

@@ -40,7 +40,7 @@ public class ApacheCamelInstrumentationModule extends InstrumentationModule {
 
   @Override
   public String[] additionalHelperClassNames() {
-    return new String[] {"io.opentelemetry.extension.trace.propagation.AwsXrayPropagator"};
+    return new String[] {"io.opentelemetry.extension.aws.AwsXrayPropagator"};
   }
 
   public static class CamelContextInstrumentation implements TypeInstrumentation {

instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtil.java

@@ -9,7 +9,7 @@ import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
 import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
-import io.opentelemetry.extension.trace.propagation.AwsXrayPropagator;
+import io.opentelemetry.extension.aws.AwsXrayPropagator;
 import java.util.Collections;
 import java.util.Map;
 import org.apache.camel.Endpoint;

instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelRoutePolicy.java

@@ -25,6 +25,7 @@ package io.opentelemetry.javaagent.instrumentation.apachecamel;
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanBuilder;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import org.apache.camel.Exchange;
 import org.apache.camel.Route;
@@ -37,7 +38,7 @@ final class CamelRoutePolicy extends RoutePolicySupport {
   private static final Logger LOG = LoggerFactory.getLogger(CamelRoutePolicy.class);
 
   private Span spanOnExchangeBegin(
-      Route route, Exchange exchange, SpanDecorator sd, Span.Kind spanKind) {
+      Route route, Exchange exchange, SpanDecorator sd, SpanKind spanKind) {
     Span activeSpan = Span.current();
     String name = sd.getOperationName(exchange, route.getEndpoint(), CamelDirection.INBOUND);
     SpanBuilder builder = CamelTracer.TRACER.spanBuilder(name);
@@ -52,10 +53,10 @@ final class CamelRoutePolicy extends RoutePolicySupport {
     return builder.startSpan();
   }
 
-  private Span.Kind spanKind(SpanDecorator sd) {
+  private SpanKind spanKind(SpanDecorator sd) {
     Span activeSpan = Span.current();
     // if there's an active span, this is not a root span which we always mark as INTERNAL
-    return (activeSpan.getSpanContext().isValid() ? Span.Kind.INTERNAL : sd.getReceiverSpanKind());
+    return (activeSpan.getSpanContext().isValid() ? SpanKind.INTERNAL : sd.getReceiverSpanKind());
   }
 
   /**
@@ -66,7 +67,7 @@ final class CamelRoutePolicy extends RoutePolicySupport {
   public void onExchangeBegin(Route route, Exchange exchange) {
     try {
       SpanDecorator sd = CamelTracer.TRACER.getSpanDecorator(route.getEndpoint());
-      Span.Kind spanKind = spanKind(sd);
+      SpanKind spanKind = spanKind(sd);
       Span span = spanOnExchangeBegin(route, exchange, sd, spanKind);
       sd.pre(span, exchange, route.getEndpoint(), CamelDirection.INBOUND);
       ActiveSpanManager.activate(exchange, span, spanKind);

instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/SpanDecorator.java

@@ -24,6 +24,7 @@
 package io.opentelemetry.javaagent.instrumentation.apachecamel;
 
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanKind;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 
@@ -68,8 +69,8 @@ public interface SpanDecorator {
   void post(Span span, Exchange exchange, Endpoint endpoint);
 
   /** Returns the 'span.kind' value for use when the component is initiating a communication. */
-  Span.Kind getInitiatorSpanKind();
+  SpanKind getInitiatorSpanKind();
 
   /** Returns the 'span.kind' value for use when the component is receiving a communication. */
-  Span.Kind getReceiverSpanKind();
+  SpanKind getReceiverSpanKind();
 }

instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/BaseSpanDecorator.java

@@ -24,7 +24,7 @@
 package io.opentelemetry.javaagent.instrumentation.apachecamel.decorators;
 
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.api.trace.Span.Kind;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection;
 import io.opentelemetry.javaagent.instrumentation.apachecamel.SpanDecorator;
@@ -106,12 +106,12 @@ class BaseSpanDecorator implements SpanDecorator {
   }
 
   @Override
-  public Span.Kind getInitiatorSpanKind() {
-    return Kind.CLIENT;
+  public SpanKind getInitiatorSpanKind() {
+    return SpanKind.CLIENT;
   }
 
   @Override
-  public Span.Kind getReceiverSpanKind() {
-    return Kind.SERVER;
+  public SpanKind getReceiverSpanKind() {
+    return SpanKind.SERVER;
   }
 }

instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/InternalSpanDecorator.java

@@ -23,7 +23,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.apachecamel.decorators;
 
-import io.opentelemetry.api.trace.Span.Kind;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
@@ -44,7 +44,7 @@ class InternalSpanDecorator extends BaseSpanDecorator {
   }
 
   @Override
-  public Kind getReceiverSpanKind() {
-    return Kind.INTERNAL;
+  public SpanKind getReceiverSpanKind() {
+    return SpanKind.INTERNAL;
   }
 }

instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/MessagingSpanDecorator.java

@@ -24,7 +24,7 @@
 package io.opentelemetry.javaagent.instrumentation.apachecamel.decorators;
 
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.api.trace.Span.Kind;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.javaagent.instrumentation.apachecamel.CamelDirection;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.net.URI;
@@ -93,22 +93,22 @@ class MessagingSpanDecorator extends BaseSpanDecorator {
   }
 
   @Override
-  public Span.Kind getInitiatorSpanKind() {
+  public SpanKind getInitiatorSpanKind() {
     switch (component) {
       case "aws-sqs":
-        return Kind.INTERNAL;
+        return SpanKind.INTERNAL;
       default:
-        return Kind.PRODUCER;
+        return SpanKind.PRODUCER;
     }
   }
 
   @Override
-  public Span.Kind getReceiverSpanKind() {
+  public SpanKind getReceiverSpanKind() {
     switch (component) {
       case "aws-sqs":
-        return Kind.INTERNAL;
+        return SpanKind.INTERNAL;
       default:
-        return Kind.CONSUMER;
+        return SpanKind.CONSUMER;
     }
   }
 

instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/DirectCamelTest.groovy

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.apachecamel
 
-import static io.opentelemetry.api.trace.Span.Kind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
 
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
 import org.apache.camel.CamelContext

instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/MulticastDirectCamelTest.groovy

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.apachecamel
 
-import static io.opentelemetry.api.trace.Span.Kind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
 
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
 import org.apache.camel.CamelContext

instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/RestCamelTest.groovy

@@ -5,9 +5,9 @@
 
 package io.opentelemetry.javaagent.instrumentation.apachecamel
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.INTERNAL
-import static io.opentelemetry.api.trace.Span.Kind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
 import io.opentelemetry.instrumentation.test.RetryOnAddressAlreadyInUseTrait

instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SingleServiceCamelTest.groovy

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.apachecamel
 
-import static io.opentelemetry.api.trace.Span.Kind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
 import io.opentelemetry.instrumentation.test.RetryOnAddressAlreadyInUseTrait

instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/SqsCamelTest.groovy

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.javaagent.instrumentation.apachecamel
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.CONSUMER
-import static io.opentelemetry.api.trace.Span.Kind.INTERNAL
-import static io.opentelemetry.api.trace.Span.Kind.PRODUCER
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CONSUMER
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.PRODUCER
 
 import com.amazonaws.services.sqs.model.SendMessageRequest
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification

instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/TwoServicesWithDirectClientCamelTest.groovy

@@ -5,9 +5,9 @@
 
 package io.opentelemetry.javaagent.instrumentation.apachecamel
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.INTERNAL
-import static io.opentelemetry.api.trace.Span.Kind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
 import io.opentelemetry.instrumentation.test.RetryOnAddressAlreadyInUseTrait

instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java

@@ -5,8 +5,8 @@
 
 package io.opentelemetry.instrumentation.apachedubbo.v2_7;
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT;
-import static io.opentelemetry.api.trace.Span.Kind.SERVER;
+import static io.opentelemetry.api.trace.SpanKind.CLIENT;
+import static io.opentelemetry.api.trace.SpanKind.SERVER;
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanBuilder;

instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java

@@ -5,12 +5,12 @@
 
 package io.opentelemetry.instrumentation.apachedubbo.v2_7;
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT;
-import static io.opentelemetry.api.trace.Span.Kind.SERVER;
+import static io.opentelemetry.api.trace.SpanKind.CLIENT;
+import static io.opentelemetry.api.trace.SpanKind.SERVER;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.api.trace.Span.Kind;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import java.util.concurrent.CompletableFuture;
@@ -39,7 +39,7 @@ public class OpenTelemetryFilter implements Filter {
     String methodName = invocation.getMethodName();
     String interfaceName = invoker.getInterface().getName();
     RpcContext rpcContext = RpcContext.getContext();
-    Kind kind = rpcContext.isProviderSide() ? SERVER : CLIENT;
+    SpanKind kind = rpcContext.isProviderSide() ? SERVER : CLIENT;
     final Context context;
     if (kind.equals(CLIENT)) {
       context = tracer.startClientSpan(interfaceName, methodName);

instrumentation/apache-dubbo/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy

@@ -21,8 +21,8 @@ import org.apache.dubbo.rpc.service.GenericService
 import spock.lang.Shared
 import spock.lang.Unroll
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.basicSpan
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace
 

instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientTracer.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient;
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT;
+import static io.opentelemetry.api.trace.SpanKind.CLIENT;
 import static io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient.HttpHeadersInjectAdapter.SETTER;
 
 import io.opentelemetry.api.trace.Span;

instrumentation/armeria-1.3/testing/src/main/groovy/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaTest.groovy

@@ -5,8 +5,8 @@
 
 package io.opentelemetry.instrumentation.armeria.v1_3
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 
 import com.linecorp.armeria.client.WebClient
 import com.linecorp.armeria.client.WebClientBuilder

instrumentation/aws-lambda-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambda/v1_0/AwsLambdaInstrumentationModule.java

@@ -20,7 +20,7 @@ public class AwsLambdaInstrumentationModule extends InstrumentationModule {
 
   @Override
   public String[] additionalHelperClassNames() {
-    return new String[] {"io.opentelemetry.extension.trace.propagation.AwsXrayPropagator"};
+    return new String[] {"io.opentelemetry.extension.aws.AwsXrayPropagator"};
   }
 
   @Override

instrumentation/aws-lambda-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambda/v1_0/AwsLambdaRequestHandlerInstrumentation.java

@@ -16,7 +16,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.events.SQSEvent;
-import io.opentelemetry.api.trace.Span.Kind;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.javaagent.instrumentation.api.OpenTelemetrySdkAccess;
 import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
@@ -60,7 +60,7 @@ public class AwsLambdaRequestHandlerInstrumentation implements TypeInstrumentati
         @Advice.Local("otelFunctionScope") Scope functionScope,
         @Advice.Local("otelMessageContext") io.opentelemetry.context.Context messageContext,
         @Advice.Local("otelMessageScope") Scope messageScope) {
-      functionContext = functionTracer().startSpan(context, Kind.SERVER, arg);
+      functionContext = functionTracer().startSpan(context, SpanKind.SERVER, arg);
       functionScope = functionContext.makeCurrent();
       if (arg instanceof SQSEvent) {
         messageContext = messageTracer().startSpan((SQSEvent) arg);

instrumentation/aws-lambda-1.0/library/aws-lambda-1.0-library.gradle

@@ -31,7 +31,7 @@ dependencies {
     'commons-io:commons-io:2.2')
   implementation deps.slf4j
 
-  implementation deps.opentelemetryTraceProps
+  implementation deps.opentelemetryExtAws
 
   // 1.2.0 allows to get the function ARN
   testLibrary group: 'com.amazonaws', name: 'aws-lambda-java-core', version: '1.2.0'

instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/AwsLambdaMessageTracer.java

@@ -8,9 +8,9 @@ package io.opentelemetry.instrumentation.awslambda.v1_0;
 import com.amazonaws.services.lambda.runtime.events.SQSEvent;
 import com.amazonaws.services.lambda.runtime.events.SQSEvent.SQSMessage;
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.api.trace.Span.Kind;
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.SpanContext;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.tracer.BaseTracer;
@@ -43,7 +43,7 @@ public class AwsLambdaMessageTracer extends BaseTracer {
       }
     }
 
-    SpanBuilder span = tracer.spanBuilder(source + " process").setSpanKind(Kind.CONSUMER);
+    SpanBuilder span = tracer.spanBuilder(source + " process").setSpanKind(SpanKind.CONSUMER);
 
     span.setAttribute(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS");
     span.setAttribute(SemanticAttributes.MESSAGING_OPERATION, "process");
@@ -57,7 +57,7 @@ public class AwsLambdaMessageTracer extends BaseTracer {
 
   public Context startSpan(SQSMessage message) {
     SpanBuilder span =
-        tracer.spanBuilder(message.getEventSource() + " process").setSpanKind(Kind.CONSUMER);
+        tracer.spanBuilder(message.getEventSource() + " process").setSpanKind(SpanKind.CONSUMER);
 
     span.setAttribute(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS");
     span.setAttribute(SemanticAttributes.MESSAGING_OPERATION, "process");

instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/AwsLambdaTracer.java

@@ -5,17 +5,17 @@
 
 package io.opentelemetry.instrumentation.awslambda.v1_0;
 
-import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.CLOUD_ACCOUNT_ID;
+import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.CLOUD_ACCOUNT_ID;
+import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.FAAS_ID;
 import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.FAAS_EXECUTION;
-import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.FAAS_ID;
 import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.FAAS_TRIGGER;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.api.trace.Span.Kind;
 import io.opentelemetry.api.trace.SpanBuilder;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.instrumentation.api.tracer.BaseTracer;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes.FaasTriggerValues;
@@ -111,12 +111,13 @@ public class AwsLambdaTracer extends BaseTracer {
     return name == null ? context.getFunctionName() : name;
   }
 
-  public io.opentelemetry.context.Context startSpan(Context awsContext, Kind kind, Object input) {
+  public io.opentelemetry.context.Context startSpan(
+      Context awsContext, SpanKind kind, Object input) {
     return startSpan(awsContext, kind, input, Collections.emptyMap());
   }
 
   public io.opentelemetry.context.Context startSpan(
-      Context awsContext, Kind kind, Object input, Map<String, String> headers) {
+      Context awsContext, SpanKind kind, Object input, Map<String, String> headers) {
     io.opentelemetry.context.Context parentContext = ParentContextExtractor.extract(headers);
 
     SpanBuilder spanBuilder = tracer.spanBuilder(spanName(awsContext, input));

instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/LambdaUtils.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.awslambda.v1_0;
+
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import java.util.concurrent.TimeUnit;
+
+final class LambdaUtils {
+
+  static void forceFlush() {
+    OpenTelemetry openTelemetry = GlobalOpenTelemetry.get();
+    if (openTelemetry instanceof OpenTelemetrySdk) {
+      ((OpenTelemetrySdk) openTelemetry)
+          .getSdkTracerProvider()
+          .forceFlush()
+          .join(1, TimeUnit.SECONDS);
+    }
+  }
+
+  private LambdaUtils() {}
+}

instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractor.java

@@ -11,7 +11,7 @@ import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapPropagator;
-import io.opentelemetry.extension.trace.propagation.AwsXrayPropagator;
+import io.opentelemetry.extension.aws.AwsXrayPropagator;
 import io.opentelemetry.instrumentation.api.tracer.BaseTracer;
 import java.util.Collections;
 import java.util.Map;

instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestHandler.java

@@ -8,13 +8,11 @@ package io.opentelemetry.instrumentation.awslambda.v1_0;
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
-import io.opentelemetry.api.trace.Span.Kind;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.sdk.OpenTelemetrySdk;
 import java.util.Collections;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 /**
  * A base class similar to {@link RequestHandler} but will automatically trace invocations of {@link
@@ -68,7 +66,7 @@ public abstract class TracingRequestHandler<I, O> implements RequestHandler<I, O
   @Override
   public final O handleRequest(I input, Context context) {
     io.opentelemetry.context.Context otelContext =
-        tracer.startSpan(context, Kind.SERVER, input, getHeaders(input));
+        tracer.startSpan(context, SpanKind.SERVER, input, getHeaders(input));
     Throwable error = null;
     try (Scope ignored = otelContext.makeCurrent()) {
       O output = doHandleRequest(input, context);
@@ -83,9 +81,7 @@ public abstract class TracingRequestHandler<I, O> implements RequestHandler<I, O
       } else {
         tracer.end(otelContext);
       }
-      OpenTelemetrySdk.getGlobalTracerManagement()
-          .forceFlush()
-          .join(flushTimeout, TimeUnit.SECONDS);
+      LambdaUtils.forceFlush();
     }
   }
 

instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestStreamHandler.java

@@ -7,14 +7,12 @@ package io.opentelemetry.instrumentation.awslambda.v1_0;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
-import io.opentelemetry.api.trace.Span.Kind;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.sdk.OpenTelemetrySdk;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.concurrent.TimeUnit;
 
 /**
  * A base class similar to {@link RequestStreamHandler} but will automatically trace invocations of
@@ -69,16 +67,14 @@ public abstract class TracingRequestStreamHandler implements RequestStreamHandle
 
     ApiGatewayProxyRequest proxyRequest = ApiGatewayProxyRequest.forStream(input);
     io.opentelemetry.context.Context otelContext =
-        tracer.startSpan(context, Kind.SERVER, input, proxyRequest.getHeaders());
+        tracer.startSpan(context, SpanKind.SERVER, input, proxyRequest.getHeaders());
 
     try (Scope ignored = otelContext.makeCurrent()) {
       doHandleRequest(
           proxyRequest.freshStream(), new OutputStreamWrapper(output, otelContext), context);
     } catch (Throwable t) {
       tracer.endExceptionally(otelContext, t);
-      OpenTelemetrySdk.getGlobalTracerManagement()
-          .forceFlush()
-          .join(flushTimeout, TimeUnit.SECONDS);
+      LambdaUtils.forceFlush();
       throw t;
     }
   }
@@ -121,7 +117,7 @@ public abstract class TracingRequestStreamHandler implements RequestStreamHandle
     public void close() throws IOException {
       delegate.close();
       tracer.end(otelContext);
-      OpenTelemetrySdk.getGlobalTracerManagement().forceFlush().join(1, TimeUnit.SECONDS);
+      LambdaUtils.forceFlush();
     }
   }
 }

instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/TracingSqsEventHandler.java

@@ -9,8 +9,6 @@ import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.events.SQSEvent;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.sdk.OpenTelemetrySdk;
-import java.util.concurrent.TimeUnit;
 
 public abstract class TracingSqsEventHandler extends TracingRequestHandler<SQSEvent, Void> {
 
@@ -52,7 +50,7 @@ public abstract class TracingSqsEventHandler extends TracingRequestHandler<SQSEv
       } else {
         tracer.end(otelContext);
       }
-      OpenTelemetrySdk.getGlobalTracerManagement().forceFlush().join(1, TimeUnit.SECONDS);
+      LambdaUtils.forceFlush();
     }
     return null;
   }

instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/AwsLambdaSqsMessageHandlerTest.groovy

@@ -5,8 +5,8 @@
 
 package io.opentelemetry.instrumentation.awslambda.v1_0
 
-import static io.opentelemetry.api.trace.Span.Kind.CONSUMER
-import static io.opentelemetry.api.trace.Span.Kind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.CONSUMER
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 
 import com.amazonaws.services.lambda.runtime.Context
 import com.amazonaws.services.lambda.runtime.events.SQSEvent

instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestApiGatewayWrapperTest.groovy

@@ -5,13 +5,14 @@
 
 package io.opentelemetry.instrumentation.awslambda.v1_0
 
-import static io.opentelemetry.api.trace.Span.Kind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 
 import com.amazonaws.services.lambda.runtime.Context
 import com.amazonaws.services.lambda.runtime.RequestHandler
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent
 import com.google.common.collect.ImmutableMap
+import io.opentelemetry.semconv.resource.attributes.ResourceAttributes
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
 
 class TracingRequestApiGatewayWrapperTest extends TracingRequestWrapperTestBase {
@@ -66,8 +67,8 @@ class TracingRequestApiGatewayWrapperTest extends TracingRequestWrapperTestBase
           name("/hello/{param}")
           kind SERVER
           attributes {
-            "$SemanticAttributes.FAAS_ID.key" "arn:aws:lambda:us-east-1:123456789:function:test"
-            "$SemanticAttributes.CLOUD_ACCOUNT_ID.key" "123456789"
+            "$ResourceAttributes.FAAS_ID.key" "arn:aws:lambda:us-east-1:123456789:function:test"
+            "$ResourceAttributes.CLOUD_ACCOUNT_ID.key" "123456789"
             "$SemanticAttributes.FAAS_EXECUTION.key" "1-22-333"
             "$SemanticAttributes.FAAS_TRIGGER.key" "http"
             "$SemanticAttributes.HTTP_METHOD.key" "GET"
@@ -98,8 +99,8 @@ class TracingRequestApiGatewayWrapperTest extends TracingRequestWrapperTestBase
           name("my_function")
           kind SERVER
           attributes {
-            "$SemanticAttributes.FAAS_ID.key" "arn:aws:lambda:us-east-1:123456789:function:test"
-            "$SemanticAttributes.CLOUD_ACCOUNT_ID.key" "123456789"
+            "$ResourceAttributes.FAAS_ID.key" "arn:aws:lambda:us-east-1:123456789:function:test"
+            "$ResourceAttributes.CLOUD_ACCOUNT_ID.key" "123456789"
             "$SemanticAttributes.FAAS_EXECUTION.key" "1-22-333"
             "$SemanticAttributes.FAAS_TRIGGER.key" "http"
           }

instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestStreamWrapperPropagationTest.groovy

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.awslambda.v1_0
 
-import static io.opentelemetry.api.trace.Span.Kind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 
 import com.amazonaws.services.lambda.runtime.Context
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler

instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestStreamWrapperTest.groovy

@@ -5,11 +5,12 @@
 
 package io.opentelemetry.instrumentation.awslambda.v1_0
 
-import static io.opentelemetry.api.trace.Span.Kind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 
 import com.amazonaws.services.lambda.runtime.Context
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler
 import io.opentelemetry.instrumentation.test.LibraryInstrumentationSpecification
+import io.opentelemetry.semconv.resource.attributes.ResourceAttributes
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
 import java.nio.charset.Charset
 import org.junit.Rule
@@ -70,8 +71,8 @@ class TracingRequestStreamWrapperTest extends LibraryInstrumentationSpecificatio
           name("my_function")
           kind SERVER
           attributes {
-            "$SemanticAttributes.FAAS_ID.key" "arn:aws:lambda:us-east-1:123456789:function:test"
-            "$SemanticAttributes.CLOUD_ACCOUNT_ID.key" "123456789"
+            "$ResourceAttributes.FAAS_ID.key" "arn:aws:lambda:us-east-1:123456789:function:test"
+            "$ResourceAttributes.CLOUD_ACCOUNT_ID.key" "123456789"
             "${SemanticAttributes.FAAS_EXECUTION.key}" "1-22-333"
           }
         }
@@ -105,8 +106,8 @@ class TracingRequestStreamWrapperTest extends LibraryInstrumentationSpecificatio
           errored true
           errorEvent(IllegalArgumentException, "bad argument")
           attributes {
-            "$SemanticAttributes.FAAS_ID.key" "arn:aws:lambda:us-east-1:123456789:function:test"
-            "$SemanticAttributes.CLOUD_ACCOUNT_ID.key" "123456789"
+            "$ResourceAttributes.FAAS_ID.key" "arn:aws:lambda:us-east-1:123456789:function:test"
+            "$ResourceAttributes.CLOUD_ACCOUNT_ID.key" "123456789"
             "${SemanticAttributes.FAAS_EXECUTION.key}" "1-22-333"
           }
         }

instrumentation/aws-lambda-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/TracingRequestWrapperTest.groovy

@@ -5,10 +5,11 @@
 
 package io.opentelemetry.instrumentation.awslambda.v1_0
 
-import static io.opentelemetry.api.trace.Span.Kind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 
 import com.amazonaws.services.lambda.runtime.Context
 import com.amazonaws.services.lambda.runtime.RequestHandler
+import io.opentelemetry.semconv.resource.attributes.ResourceAttributes
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
 
 class TracingRequestWrapperTest extends TracingRequestWrapperTestBase {
@@ -39,8 +40,8 @@ class TracingRequestWrapperTest extends TracingRequestWrapperTestBase {
           name("my_function")
           kind SERVER
           attributes {
-            "$SemanticAttributes.FAAS_ID.key" "arn:aws:lambda:us-east-1:123456789:function:test"
-            "$SemanticAttributes.CLOUD_ACCOUNT_ID.key" "123456789"
+            "$ResourceAttributes.FAAS_ID.key" "arn:aws:lambda:us-east-1:123456789:function:test"
+            "$ResourceAttributes.CLOUD_ACCOUNT_ID.key" "123456789"
             "${SemanticAttributes.FAAS_EXECUTION.key}" "1-22-333"
           }
         }
@@ -70,8 +71,8 @@ class TracingRequestWrapperTest extends TracingRequestWrapperTestBase {
           errored true
           errorEvent(IllegalArgumentException, "bad argument")
           attributes {
-            "$SemanticAttributes.FAAS_ID.key" "arn:aws:lambda:us-east-1:123456789:function:test"
-            "$SemanticAttributes.CLOUD_ACCOUNT_ID.key" "123456789"
+            "$ResourceAttributes.FAAS_ID.key" "arn:aws:lambda:us-east-1:123456789:function:test"
+            "$ResourceAttributes.CLOUD_ACCOUNT_ID.key" "123456789"
             "${SemanticAttributes.FAAS_EXECUTION.key}" "1-22-333"
           }
         }

instrumentation/aws-lambda-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambda/v1_0/ApiGatewayProxyRequestTest.java

@@ -13,10 +13,10 @@ import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 
-import io.opentelemetry.api.DefaultOpenTelemetry;
 import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.context.propagation.ContextPropagators;
-import io.opentelemetry.extension.trace.propagation.AwsXrayPropagator;
+import io.opentelemetry.extension.aws.AwsXrayPropagator;
 import io.opentelemetry.extension.trace.propagation.B3Propagator;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -35,8 +35,7 @@ class ApiGatewayProxyRequestTest {
   public void shouldCreateNoopRequestIfNoPropagatorsSet() throws IOException {
     // given
     InputStream mock = mock(InputStream.class);
-    GlobalOpenTelemetry.set(
-        DefaultOpenTelemetry.builder().setPropagators(ContextPropagators.noop()).build());
+    GlobalOpenTelemetry.set(OpenTelemetry.getDefault());
     // when
     ApiGatewayProxyRequest created = ApiGatewayProxyRequest.forStream(mock);
     // then
@@ -49,9 +48,7 @@ class ApiGatewayProxyRequestTest {
     // given
     InputStream mock = mock(InputStream.class);
     GlobalOpenTelemetry.set(
-        DefaultOpenTelemetry.builder()
-            .setPropagators(ContextPropagators.create(AwsXrayPropagator.getInstance()))
-            .build());
+        OpenTelemetry.getPropagating(ContextPropagators.create(AwsXrayPropagator.getInstance())));
     // when
     ApiGatewayProxyRequest created = ApiGatewayProxyRequest.forStream(mock);
     // then
@@ -65,9 +62,7 @@ class ApiGatewayProxyRequestTest {
     InputStream mock = mock(InputStream.class);
     given(mock.markSupported()).willReturn(true);
     GlobalOpenTelemetry.set(
-        DefaultOpenTelemetry.builder()
-            .setPropagators(ContextPropagators.create(B3Propagator.getInstance()))
-            .build());
+        OpenTelemetry.getPropagating(ContextPropagators.create(B3Propagator.getInstance())));
     // when
     ApiGatewayProxyRequest created = ApiGatewayProxyRequest.forStream(mock);
     // then
@@ -83,9 +78,7 @@ class ApiGatewayProxyRequestTest {
     given(mock.markSupported()).willReturn(false);
     given(mock.read(any(byte[].class))).willReturn(-1);
     GlobalOpenTelemetry.set(
-        DefaultOpenTelemetry.builder()
-            .setPropagators(ContextPropagators.create(B3Propagator.getInstance()))
-            .build());
+        OpenTelemetry.getPropagating(ContextPropagators.create(B3Propagator.getInstance())));
     // when
     ApiGatewayProxyRequest created = ApiGatewayProxyRequest.forStream(mock);
     // then

instrumentation/aws-lambda-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractorTest.java

@@ -8,8 +8,8 @@ package io.opentelemetry.instrumentation.awslambda.v1_0;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.common.collect.ImmutableMap;
-import io.opentelemetry.api.DefaultOpenTelemetry;
 import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.context.Context;
@@ -38,9 +38,7 @@ class ParentContextExtractorTest {
             "X-B3-Sampled",
             "true");
     GlobalOpenTelemetry.set(
-        DefaultOpenTelemetry.builder()
-            .setPropagators(ContextPropagators.create(B3Propagator.getInstance()))
-            .build());
+        OpenTelemetry.getPropagating(ContextPropagators.create(B3Propagator.getInstance())));
 
     // when
     Context context = ParentContextExtractor.fromHttpHeaders(headers);
@@ -49,7 +47,7 @@ class ParentContextExtractorTest {
     SpanContext spanContext = span.getSpanContext();
     assertThat(spanContext.isValid()).isTrue();
     assertThat(spanContext.isValid()).isTrue();
-    assertThat(spanContext.getSpanIdAsHexString()).isEqualTo("0000000000000456");
-    assertThat(spanContext.getTraceIdAsHexString()).isEqualTo("4fd0b6131f19f39af59518d127b0cafe");
+    assertThat(spanContext.getSpanId()).isEqualTo("0000000000000456");
+    assertThat(spanContext.getTraceId()).isEqualTo("4fd0b6131f19f39af59518d127b0cafe");
   }
 }

instrumentation/aws-lambda-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/AbstractAwsLambdaRequestHandlerTest.groovy

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.awslambda.v1_0
 
-import static io.opentelemetry.api.trace.Span.Kind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 
 import com.amazonaws.services.lambda.runtime.Context
 import com.amazonaws.services.lambda.runtime.RequestHandler

instrumentation/aws-lambda-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/awslambda/v1_0/AbstractAwsLambdaSqsHandlerTest.groovy

@@ -5,8 +5,8 @@
 
 package io.opentelemetry.instrumentation.awslambda.v1_0
 
-import static io.opentelemetry.api.trace.Span.Kind.CONSUMER
-import static io.opentelemetry.api.trace.Span.Kind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.CONSUMER
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 
 import com.amazonaws.services.lambda.runtime.Context
 import com.amazonaws.services.lambda.runtime.RequestHandler

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/aws-sdk-1.11-javaagent.gradle

@@ -45,10 +45,9 @@ configurations {
 }
 
 dependencies {
-  compileOnly deps.opentelemetryTraceProps
+  compileOnly deps.opentelemetryExtAws
 
   library group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.0'
-  implementation deps.opentelemetryTraceProps
 
   compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '1.11.106'
 

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkClientTracer.java

@@ -10,9 +10,10 @@ import com.amazonaws.AmazonWebServiceResponse;
 import com.amazonaws.Request;
 import com.amazonaws.Response;
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapPropagator;
-import io.opentelemetry.extension.trace.propagation.AwsXrayPropagator;
+import io.opentelemetry.extension.aws.AwsXrayPropagator;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import java.util.concurrent.ConcurrentHashMap;
@@ -47,7 +48,7 @@ public class AwsSdkClientTracer extends HttpClientTracer<Request<?>, Request<?>,
   }
 
   public Context startSpan(
-      Span.Kind kind, Context parentContext, Request<?> request, RequestMeta requestMeta) {
+      SpanKind kind, Context parentContext, Request<?> request, RequestMeta requestMeta) {
     Context context = super.startSpan(kind, parentContext, request, request, -1);
     Span span = Span.fromContext(context);
 

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInstrumentationModule.java

@@ -22,7 +22,7 @@ public class AwsSdkInstrumentationModule extends InstrumentationModule {
 
   @Override
   public String[] additionalHelperClassNames() {
-    return new String[] {"io.opentelemetry.extension.trace.propagation.AwsXrayPropagator"};
+    return new String[] {"io.opentelemetry.extension.aws.AwsXrayPropagator"};
   }
 
   @Override

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/SqsParentContext.java

@@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.awssdk.v1_11;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapPropagator;
-import io.opentelemetry.extension.trace.propagation.AwsXrayPropagator;
+import io.opentelemetry.extension.aws.AwsXrayPropagator;
 import java.util.Collections;
 import java.util.Map;
 

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/TracingRequestHandler.java

@@ -16,7 +16,7 @@ import com.amazonaws.services.sqs.model.Message;
 import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
 import com.amazonaws.services.sqs.model.ReceiveMessageResult;
 import com.amazonaws.services.sqs.model.SendMessageRequest;
-import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.javaagent.instrumentation.api.ContextStore;
@@ -35,7 +35,7 @@ public class TracingRequestHandler extends RequestHandler2 {
   public void beforeRequest(Request<?> request) {
 
     AmazonWebServiceRequest originalRequest = request.getOriginalRequest();
-    Span.Kind kind = (isSqsProducer(originalRequest) ? Span.Kind.PRODUCER : Span.Kind.CLIENT);
+    SpanKind kind = (isSqsProducer(originalRequest) ? SpanKind.PRODUCER : SpanKind.CLIENT);
 
     RequestMeta requestMeta = contextStore.get(originalRequest);
     Context parentContext = Context.current();
@@ -94,7 +94,7 @@ public class TracingRequestHandler extends RequestHandler2 {
     Context parentContext = SqsParentContext.ofSystemAttributes(message.getAttributes());
     AmazonWebServiceRequest originalRequest = request.getOriginalRequest();
     RequestMeta requestMeta = contextStore.get(originalRequest);
-    Context context = tracer().startSpan(Span.Kind.CONSUMER, parentContext, request, requestMeta);
+    Context context = tracer().startSpan(SpanKind.CONSUMER, parentContext, request, requestMeta);
     tracer().end(context, response);
   }
 

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/Aws1ClientTest.groovy

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.PRODUCER
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.PRODUCER
 import static io.opentelemetry.instrumentation.test.server.http.TestHttpServer.httpServer
 import static io.opentelemetry.instrumentation.test.utils.PortUtils.UNUSABLE_PORT
 

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/SqsTracingTest.groovy

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.CONSUMER
-import static io.opentelemetry.api.trace.Span.Kind.PRODUCER
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CONSUMER
+import static io.opentelemetry.api.trace.SpanKind.PRODUCER
 
 import com.amazonaws.auth.AWSStaticCredentialsProvider
 import com.amazonaws.auth.BasicAWSCredentials

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/groovy/Aws0ClientTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 import static io.opentelemetry.instrumentation.test.server.http.TestHttpServer.httpServer
 import static io.opentelemetry.instrumentation.test.utils.PortUtils.UNUSABLE_PORT
 

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java

@@ -22,7 +22,7 @@ public class AwsSdkInstrumentationModule extends InstrumentationModule {
 
   @Override
   public String[] additionalHelperClassNames() {
-    return new String[] {"io.opentelemetry.extension.trace.propagation.AwsXrayPropagator"};
+    return new String[] {"io.opentelemetry.extension.aws.AwsXrayPropagator"};
   }
 
   /**

instrumentation/aws-sdk/aws-sdk-2.2/library/aws-sdk-2.2-library.gradle

@@ -1,7 +1,7 @@
 apply from: "$rootDir/gradle/instrumentation-library.gradle"
 
 dependencies {
-  implementation deps.opentelemetryTraceProps
+  implementation deps.opentelemetryExtAws
 
   library group: 'software.amazon.awssdk', name: 'aws-core', version: '2.2.0'
 

instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpClientTracer.java

@@ -5,12 +5,12 @@
 
 package io.opentelemetry.instrumentation.awssdk.v2_2;
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT;
+import static io.opentelemetry.api.trace.SpanKind.CLIENT;
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapPropagator;
-import io.opentelemetry.extension.trace.propagation.AwsXrayPropagator;
+import io.opentelemetry.extension.aws.AwsXrayPropagator;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;

instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.groovy

@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.awssdk.v2_2
 
 import static com.google.common.collect.ImmutableMap.of
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 import static io.opentelemetry.instrumentation.test.server.http.TestHttpServer.httpServer
 
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes

instrumentation/cassandra/cassandra-3.0/javaagent/src/test/groovy/CassandraClientTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.basicSpan
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace
 

instrumentation/cassandra/cassandra-4.0/javaagent/src/test/groovy/CassandraClientTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.basicSpan
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace
 

instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseOnSubscribe.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0;
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT;
+import static io.opentelemetry.api.trace.SpanKind.CLIENT;
 import static io.opentelemetry.javaagent.instrumentation.couchbase.v2_0.CouchbaseClientTracer.tracer;
 
 import io.opentelemetry.api.trace.Span;

instrumentation/couchbase/couchbase-2.6/javaagent/src/test/groovy/CouchbaseSpanUtil.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
 import io.opentelemetry.instrumentation.test.asserts.TraceAssert

instrumentation/couchbase/couchbase-testing/src/main/groovy/util/AbstractCouchbaseTest.groovy

@@ -5,7 +5,7 @@
 
 package util
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 
 import com.couchbase.client.core.metrics.DefaultLatencyMetricsCollectorConfig
 import com.couchbase.client.core.metrics.DefaultMetricsCollectorConfig

instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.INTERNAL
-import static io.opentelemetry.api.trace.Span.Kind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.ERROR
 import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
 import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM

instrumentation/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardTracer.java

@@ -6,6 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.dropwizardviews;
 
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.api.tracer.BaseTracer;
 
 public class DropwizardTracer extends BaseTracer {
@@ -16,7 +17,7 @@ public class DropwizardTracer extends BaseTracer {
   }
 
   public Span startSpan(String spanName) {
-    return super.startSpan(spanName, Span.Kind.INTERNAL);
+    return super.startSpan(spanName, SpanKind.INTERNAL);
   }
 
   @Override

instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 
 import groovy.json.JsonSlurper
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification

instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/groovy/Elasticsearch5RestClientTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 
 import groovy.json.JsonSlurper

instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 
 import groovy.json.JsonSlurper
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification

instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/groovy/Elasticsearch6RestClientTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 
 import groovy.json.JsonSlurper
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification

instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5NodeClientTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 

instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/src/test/groovy/Elasticsearch5TransportClientTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 

instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53NodeClientTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 

instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/Elasticsearch53TransportClientTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 

instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy

@@ -5,8 +5,8 @@
 
 package springdata
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace
 
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification

instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy

@@ -5,7 +5,7 @@
 
 package springdata
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 

instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6NodeClientTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 

instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/src/test/groovy/Elasticsearch6TransportClientTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 

instrumentation/finatra-2.9/javaagent/src/latestDepTest/groovy/FinatraServerLatestTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
 import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS
 
 import com.twitter.app.lifecycle.Event

instrumentation/finatra-2.9/javaagent/src/test/groovy/FinatraServerTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
 import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS
 
 import com.twitter.finatra.http.HttpServer

instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeTracer.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.geode;
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT;
+import static io.opentelemetry.api.trace.SpanKind.CLIENT;
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.instrumentation.api.tracer.DatabaseClientTracer;

instrumentation/geode-1.4/javaagent/src/test/groovy/PutGetTest.groovy

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace
 
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification

instrumentation/google-http-client-1.19/javaagent/src/test/groovy/AbstractGoogleHttpClientTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
 
 import com.google.api.client.http.GenericUrl
 import com.google.api.client.http.HttpRequest

instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/client/GrpcClientTracer.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.grpc.v1_5.client;
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT;
+import static io.opentelemetry.api.trace.SpanKind.CLIENT;
 
 import io.grpc.Status;
 import io.opentelemetry.api.trace.Span;

instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/server/GrpcServerTracer.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.grpc.v1_5.server;
 
-import static io.opentelemetry.api.trace.Span.Kind.SERVER;
+import static io.opentelemetry.api.trace.SpanKind.SERVER;
 
 import io.grpc.Metadata;
 import io.grpc.Status;

instrumentation/grpc-1.5/testing/src/main/groovy/io/opentelemetry/instrumentation/grpc/v1_5/AbstractGrpcStreamingTest.groovy

@@ -5,8 +5,8 @@
 
 package io.opentelemetry.instrumentation.grpc.v1_5
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 
 import example.GreeterGrpc
 import example.Helloworld

instrumentation/grpc-1.5/testing/src/main/groovy/io/opentelemetry/instrumentation/grpc/v1_5/AbstractGrpcTest.groovy

@@ -5,8 +5,8 @@
 
 package io.opentelemetry.instrumentation.grpc.v1_5
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.SERVER
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.SERVER
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.basicSpan
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace
 

instrumentation/hibernate/hibernate-3.3/javaagent/src/test/groovy/CriteriaTest.groovy

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
 
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
 import org.hibernate.Criteria

instrumentation/hibernate/hibernate-3.3/javaagent/src/test/groovy/QueryTest.groovy

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
 
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
 import org.hibernate.Query

instrumentation/hibernate/hibernate-3.3/javaagent/src/test/groovy/SessionTest.groovy

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace
 
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes

instrumentation/hibernate/hibernate-4.0/javaagent/src/test/groovy/CriteriaTest.groovy

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
 
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
 import org.hibernate.Criteria

instrumentation/hibernate/hibernate-4.0/javaagent/src/test/groovy/QueryTest.groovy

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.Span.Kind.CLIENT
-import static io.opentelemetry.api.trace.Span.Kind.INTERNAL
+import static io.opentelemetry.api.trace.SpanKind.CLIENT
+import static io.opentelemetry.api.trace.SpanKind.INTERNAL
 
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
 import org.hibernate.Query