Update to SDK 0.17.0 (#2338)

* Update to SDK 0.17.0

* Finish

* ottrace

examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java

@@ -15,7 +15,7 @@ class SpringBootSmokeTest extends SmokeTest {
 
   protected String getTargetImage(int jdk) {
     return "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk" + jdk
-        + "-20210209.550405798";
+        + "-20210218.577304949";
   }
 
   @Test

gradle/dependencies.gradle

@@ -8,8 +8,8 @@ configurations.all {
 
 ext {
   versions = [
-    opentelemetry     : '0.16.0',
+    opentelemetry     : '0.17.0',
-    opentelemetryAlpha: "0.16.0-alpha",
+    opentelemetryAlpha: "0.17.0-alpha",
 
     slf4j             : "1.7.30",
     guava             : "30.1-jre",

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

@@ -19,7 +19,7 @@ import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.ContextKey;
 import io.opentelemetry.context.propagation.ContextPropagators;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.InstrumentationVersion;
 import io.opentelemetry.instrumentation.api.context.ContextPropagationDebug;
 import java.lang.reflect.Method;
@@ -287,17 +287,16 @@ public abstract class BaseTracer {
    * @deprecated We should eliminate all static usages so we can use the non-global propagators.
    */
   @Deprecated
-  public static <C> Context extractWithGlobalPropagators(
+  public static <C> Context extractWithGlobalPropagators(C carrier, TextMapGetter<C> getter) {
-      C carrier, TextMapPropagator.Getter<C> getter) {
     return extract(GlobalOpenTelemetry.getPropagators(), carrier, getter);
   }
 
-  public <C> Context extract(C carrier, TextMapPropagator.Getter<C> getter) {
+  public <C> Context extract(C carrier, TextMapGetter<C> getter) {
     return extract(propagators, carrier, getter);
   }
 
   private static <C> Context extract(
-      ContextPropagators propagators, C carrier, TextMapPropagator.Getter<C> getter) {
+      ContextPropagators propagators, C carrier, TextMapGetter<C> getter) {
     ContextPropagationDebug.debugContextLeakIfEnabled();
 
     // Using Context.ROOT here may be quite unexpected, but the reason is simple.

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

@@ -13,8 +13,7 @@ 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;
+import io.opentelemetry.context.propagation.TextMapSetter;
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
 import io.opentelemetry.instrumentation.api.tracer.utils.NetPeerUtils;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.net.URI;
@@ -70,7 +69,7 @@ public abstract class HttpClientTracer<REQUEST, CARRIER, RESPONSE> extends BaseT
   @Nullable
   protected abstract String responseHeader(RESPONSE response, String name);
 
-  protected abstract TextMapPropagator.Setter<CARRIER> getSetter();
+  protected abstract TextMapSetter<CARRIER> getSetter();
 
   public boolean shouldStartSpan(Context parentContext) {
     return shouldStartSpan(CLIENT, parentContext);
@@ -96,7 +95,7 @@ public abstract class HttpClientTracer<REQUEST, CARRIER, RESPONSE> extends BaseT
   }
 
   protected void inject(Context context, CARRIER carrier) {
-    Setter<CARRIER> setter = getSetter();
+    TextMapSetter<CARRIER> setter = getSetter();
     if (setter == null) {
       throw new IllegalStateException(
           "getSetter() not defined but calling inject(), either getSetter must be implemented or the scope should be setup manually");

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

@@ -12,7 +12,7 @@ import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.lang.reflect.Method;
 import java.util.concurrent.TimeUnit;
@@ -272,7 +272,7 @@ public abstract class HttpServerTracer<REQUEST, RESPONSE, CONNECTION, STORAGE> e
 
   protected abstract String flavor(CONNECTION connection, REQUEST request);
 
-  protected abstract TextMapPropagator.Getter<REQUEST> getGetter();
+  protected abstract TextMapGetter<REQUEST> getGetter();
 
   protected abstract String url(REQUEST request);
 

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

@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.api.tracer;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.Tracer;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 
 public abstract class RpcServerTracer<REQUEST> extends BaseTracer {
 
@@ -28,5 +28,5 @@ public abstract class RpcServerTracer<REQUEST> extends BaseTracer {
     super(openTelemetry);
   }
 
-  protected abstract TextMapPropagator.Getter<REQUEST> getGetter();
+  protected abstract TextMapGetter<REQUEST> getGetter();
 }

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

@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.api.tracer
 
 import io.opentelemetry.api.trace.Span
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
-import io.opentelemetry.context.propagation.TextMapPropagator
+import io.opentelemetry.context.propagation.TextMapSetter
 import io.opentelemetry.instrumentation.api.config.Config
 import io.opentelemetry.instrumentation.api.config.ConfigBuilder
 import spock.lang.Shared
@@ -190,7 +190,7 @@ class HttpClientTracerTest extends BaseTracerTest {
       }
 
       @Override
-      protected TextMapPropagator.Setter<Map> getSetter() {
+      protected TextMapSetter<Map> getSetter() {
         return null
       }
 

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

@@ -5,11 +5,11 @@
 
 package io.opentelemetry.instrumentation.servlet;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import java.util.Collections;
 import javax.servlet.http.HttpServletRequest;
 
-public class HttpServletRequestGetter implements TextMapPropagator.Getter<HttpServletRequest> {
+public class HttpServletRequestGetter implements TextMapGetter<HttpServletRequest> {
 
   public static final HttpServletRequestGetter GETTER = new HttpServletRequestGetter();
 

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

@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.servlet;
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.servlet.AppServerBridge;
 import io.opentelemetry.instrumentation.api.servlet.ServletContextPath;
 import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
@@ -109,7 +109,7 @@ public abstract class ServletHttpServerTracer<RESPONSE>
   }
 
   @Override
-  protected Getter<HttpServletRequest> getGetter() {
+  protected TextMapGetter<HttpServletRequest> getGetter() {
     return HttpServletRequestGetter.GETTER;
   }
 

instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientInstrumentationModule.java

@@ -17,7 +17,7 @@ import akka.http.scaladsl.model.HttpResponse;
 import com.google.auto.service.AutoService;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.javaagent.tooling.InstrumentationModule;
 import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
 import java.util.Collections;
@@ -145,7 +145,7 @@ public class AkkaHttpClientInstrumentationModule extends InstrumentationModule {
     }
   }
 
-  public static class InjectAdapter implements TextMapPropagator.Setter<AkkaHttpHeaders> {
+  public static class InjectAdapter implements TextMapSetter<AkkaHttpHeaders> {
 
     public static final InjectAdapter SETTER = new InjectAdapter();
 

instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientTracer.java

@@ -10,7 +10,7 @@ import static io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpClient
 import akka.http.javadsl.model.HttpHeader;
 import akka.http.scaladsl.model.HttpRequest;
 import akka.http.scaladsl.model.HttpResponse;
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpClientInstrumentationModule.AkkaHttpHeaders;
 import java.net.URI;
@@ -55,7 +55,7 @@ public class AkkaHttpClientTracer
   }
 
   @Override
-  protected Setter<AkkaHttpHeaders> getSetter() {
+  protected TextMapSetter<AkkaHttpHeaders> getSetter() {
     return SETTER;
   }
 

instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerHeaders.java

@@ -7,12 +7,12 @@ package io.opentelemetry.javaagent.instrumentation.akkahttp;
 
 import akka.http.javadsl.model.HttpHeader;
 import akka.http.scaladsl.model.HttpRequest;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-public class AkkaHttpServerHeaders implements TextMapPropagator.Getter<HttpRequest> {
+public class AkkaHttpServerHeaders implements TextMapGetter<HttpRequest> {
 
   public static final AkkaHttpServerHeaders GETTER = new AkkaHttpServerHeaders();
 

instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerTracer.java

@@ -9,7 +9,7 @@ import akka.http.javadsl.model.HttpHeader;
 import akka.http.scaladsl.model.HttpRequest;
 import akka.http.scaladsl.model.HttpResponse;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
 
 public class AkkaHttpServerTracer
@@ -59,7 +59,7 @@ public class AkkaHttpServerTracer
   }
 
   @Override
-  protected Getter<HttpRequest> getGetter() {
+  protected TextMapGetter<HttpRequest> getGetter() {
     return AkkaHttpServerHeaders.GETTER;
   }
 

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

@@ -31,7 +31,7 @@ public class CamelPropagationUtilTest {
   @BeforeAll
   public static void setUp() {
     GlobalOpenTelemetry.set(
-        OpenTelemetry.getPropagating(ContextPropagators.create(JaegerPropagator.getInstance())));
+        OpenTelemetry.propagating(ContextPropagators.create(JaegerPropagator.getInstance())));
   }
 
   @Test

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

@@ -7,8 +7,8 @@ package io.opentelemetry.javaagent.instrumentation.apachecamel;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
+import io.opentelemetry.context.propagation.TextMapGetter;
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.extension.aws.AwsXrayPropagator;
 import java.util.Collections;
 import java.util.Map;
@@ -48,7 +48,7 @@ final class CamelPropagationUtil {
         .inject(context, exchangeHeaders, MapSetter.INSTANCE);
   }
 
-  private static class MapGetter implements Getter<Map<String, Object>> {
+  private static class MapGetter implements TextMapGetter<Map<String, Object>> {
 
     private static final MapGetter INSTANCE = new MapGetter();
 
@@ -64,7 +64,7 @@ final class CamelPropagationUtil {
     }
   }
 
-  private static class MapSetter implements Setter<Map<String, Object>> {
+  private static class MapSetter implements TextMapSetter<Map<String, Object>> {
 
     private static final MapSetter INSTANCE = new MapSetter();
 

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

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.instrumentation.apachedubbo.v2_7;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import org.apache.dubbo.rpc.RpcInvocation;
 
-class DubboExtractAdapter implements TextMapPropagator.Getter<RpcInvocation> {
+class DubboExtractAdapter implements TextMapGetter<RpcInvocation> {
 
   static final DubboExtractAdapter GETTER = new DubboExtractAdapter();
 

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

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.instrumentation.apachedubbo.v2_7;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import org.apache.dubbo.rpc.RpcInvocation;
 
-class DubboInjectAdapter implements TextMapPropagator.Setter<RpcInvocation> {
+class DubboInjectAdapter implements TextMapSetter<RpcInvocation> {
 
   static final DubboInjectAdapter SETTER = new DubboInjectAdapter();
 

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

@@ -12,7 +12,7 @@ import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.tracer.RpcServerTracer;
 import io.opentelemetry.instrumentation.api.tracer.utils.NetPeerUtils;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
@@ -63,7 +63,7 @@ class DubboTracer extends RpcServerTracer<RpcInvocation> {
   }
 
   @Override
-  protected Getter<RpcInvocation> getGetter() {
+  protected TextMapGetter<RpcInvocation> getGetter() {
     return DubboExtractAdapter.GETTER;
   }
 }

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

@@ -10,7 +10,7 @@ import static io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient.H
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -89,7 +89,7 @@ public class ApacheHttpAsyncClientTracer
   }
 
   @Override
-  protected Setter<HttpRequest> getSetter() {
+  protected TextMapSetter<HttpRequest> getSetter() {
     return SETTER;
   }
 

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

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import org.apache.http.HttpRequest;
 
-public class HttpHeadersInjectAdapter implements TextMapPropagator.Setter<HttpRequest> {
+public class HttpHeadersInjectAdapter implements TextMapSetter<HttpRequest> {
 
   public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
 

instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/CommonsHttpClientTracer.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v2_0;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -65,7 +65,7 @@ public class CommonsHttpClientTracer extends HttpClientTracer<HttpMethod, HttpMe
   }
 
   @Override
-  protected TextMapPropagator.Setter<HttpMethod> getSetter() {
+  protected TextMapSetter<HttpMethod> getSetter() {
     return HttpHeadersInjectAdapter.SETTER;
   }
 }

instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/HttpHeadersInjectAdapter.java

@@ -5,11 +5,11 @@
 
 package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v2_0;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpMethod;
 
-public class HttpHeadersInjectAdapter implements TextMapPropagator.Setter<HttpMethod> {
+public class HttpHeadersInjectAdapter implements TextMapSetter<HttpMethod> {
 
   public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
 

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientTracer.java

@@ -8,7 +8,7 @@ package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0;
 import static io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0.HttpHeadersInjectAdapter.SETTER;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import org.apache.http.Header;
@@ -73,7 +73,7 @@ public class ApacheHttpClientTracer
   }
 
   @Override
-  protected TextMapPropagator.Setter<HttpUriRequest> getSetter() {
+  protected TextMapSetter<HttpUriRequest> getSetter() {
     return SETTER;
   }
 

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/HttpHeadersInjectAdapter.java

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import org.apache.http.client.methods.HttpUriRequest;
 
-class HttpHeadersInjectAdapter implements TextMapPropagator.Setter<HttpUriRequest> {
+class HttpHeadersInjectAdapter implements TextMapSetter<HttpUriRequest> {
 
   public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
 

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientTracer.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -71,7 +71,7 @@ public class ApacheHttpClientTracer
   }
 
   @Override
-  protected TextMapPropagator.Setter<ClassicHttpRequest> getSetter() {
+  protected TextMapSetter<ClassicHttpRequest> getSetter() {
     return HttpHeadersInjectAdapter.SETTER;
   }
 

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/HttpHeadersInjectAdapter.java

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v5_0;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 
-class HttpHeadersInjectAdapter implements TextMapPropagator.Setter<ClassicHttpRequest> {
+class HttpHeadersInjectAdapter implements TextMapSetter<ClassicHttpRequest> {
 
   public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
 

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/client/ArmeriaClientTracer.java

@@ -9,7 +9,7 @@ import com.linecorp.armeria.client.ClientRequestContext;
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.logging.RequestLog;
 import io.opentelemetry.api.trace.Tracer;
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -60,7 +60,7 @@ public class ArmeriaClientTracer
   }
 
   @Override
-  protected Setter<ClientRequestContext> getSetter() {
+  protected TextMapSetter<ClientRequestContext> getSetter() {
     return ArmeriaSetter.INSTANCE;
   }
 
@@ -69,7 +69,7 @@ public class ArmeriaClientTracer
     return "io.opentelemetry.armeria";
   }
 
-  private static class ArmeriaSetter implements Setter<ClientRequestContext> {
+  private static class ArmeriaSetter implements TextMapSetter<ClientRequestContext> {
 
     private static final ArmeriaSetter INSTANCE = new ArmeriaSetter();
 

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/server/ArmeriaServerTracer.java

@@ -11,7 +11,7 @@ import com.linecorp.armeria.server.ServiceRequestContext;
 import io.netty.util.AsciiString;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -66,7 +66,7 @@ public class ArmeriaServerTracer
   }
 
   @Override
-  protected Getter<HttpRequest> getGetter() {
+  protected TextMapGetter<HttpRequest> getGetter() {
     return ArmeriaGetter.INSTANCE;
   }
 
@@ -94,7 +94,7 @@ public class ArmeriaServerTracer
   @Override
   protected void attachServerContext(Context context, Void ctx) {}
 
-  private static class ArmeriaGetter implements Getter<HttpRequest> {
+  private static class ArmeriaGetter implements TextMapGetter<HttpRequest> {
 
     private static final ArmeriaGetter INSTANCE = new ArmeriaGetter();
 

instrumentation/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientInjectAdapter.java

@@ -6,9 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient;
 
 import com.ning.http.client.Request;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 
-public class AsyncHttpClientInjectAdapter implements TextMapPropagator.Setter<Request> {
+public class AsyncHttpClientInjectAdapter implements TextMapSetter<Request> {
 
   public static final AsyncHttpClientInjectAdapter SETTER = new AsyncHttpClientInjectAdapter();
 

instrumentation/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientTracer.java

@@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.asynchttpclient;
 
 import com.ning.http.client.Request;
 import com.ning.http.client.Response;
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -46,7 +46,7 @@ public class AsyncHttpClientTracer extends HttpClientTracer<Request, Request, Re
   }
 
   @Override
-  protected Setter<Request> getSetter() {
+  protected TextMapSetter<Request> getSetter() {
     return AsyncHttpClientInjectAdapter.SETTER;
   }
 

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

@@ -10,7 +10,7 @@ import static io.opentelemetry.instrumentation.awslambda.v1_0.MapUtils.lowercase
 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.context.propagation.TextMapGetter;
 import io.opentelemetry.extension.aws.AwsXrayPropagator;
 import io.opentelemetry.instrumentation.api.tracer.BaseTracer;
 import java.util.Collections;
@@ -58,7 +58,7 @@ public class ParentContextExtractor {
             MapGetter.INSTANCE);
   }
 
-  private static class MapGetter implements TextMapPropagator.Getter<Map<String, String>> {
+  private static class MapGetter implements TextMapGetter<Map<String, String>> {
 
     private static final MapGetter INSTANCE = new MapGetter();
 

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

@@ -35,7 +35,7 @@ class ApiGatewayProxyRequestTest {
   public void shouldCreateNoopRequestIfNoPropagatorsSet() throws IOException {
     // given
     InputStream mock = mock(InputStream.class);
-    GlobalOpenTelemetry.set(OpenTelemetry.getDefault());
+    GlobalOpenTelemetry.set(OpenTelemetry.noop());
     // when
     ApiGatewayProxyRequest created = ApiGatewayProxyRequest.forStream(mock);
     // then
@@ -48,7 +48,7 @@ class ApiGatewayProxyRequestTest {
     // given
     InputStream mock = mock(InputStream.class);
     GlobalOpenTelemetry.set(
-        OpenTelemetry.getPropagating(ContextPropagators.create(AwsXrayPropagator.getInstance())));
+        OpenTelemetry.propagating(ContextPropagators.create(AwsXrayPropagator.getInstance())));
     // when
     ApiGatewayProxyRequest created = ApiGatewayProxyRequest.forStream(mock);
     // then
@@ -62,7 +62,7 @@ class ApiGatewayProxyRequestTest {
     InputStream mock = mock(InputStream.class);
     given(mock.markSupported()).willReturn(true);
     GlobalOpenTelemetry.set(
-        OpenTelemetry.getPropagating(ContextPropagators.create(B3Propagator.getInstance())));
+        OpenTelemetry.propagating(ContextPropagators.create(B3Propagator.injectingSingleHeader())));
     // when
     ApiGatewayProxyRequest created = ApiGatewayProxyRequest.forStream(mock);
     // then
@@ -78,7 +78,7 @@ class ApiGatewayProxyRequestTest {
     given(mock.markSupported()).willReturn(false);
     given(mock.read(any(byte[].class))).willReturn(-1);
     GlobalOpenTelemetry.set(
-        OpenTelemetry.getPropagating(ContextPropagators.create(B3Propagator.getInstance())));
+        OpenTelemetry.propagating(ContextPropagators.create(B3Propagator.injectingSingleHeader())));
     // when
     ApiGatewayProxyRequest created = ApiGatewayProxyRequest.forStream(mock);
     // then

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

@@ -28,7 +28,7 @@ public class ParentContextExtractorTest {
   @Rule public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
 
   private static final OpenTelemetry OTEL =
-      OpenTelemetry.getPropagating(ContextPropagators.create(B3Propagator.getInstance()));
+      OpenTelemetry.propagating(ContextPropagators.create(B3Propagator.injectingSingleHeader()));
 
   private static final AwsLambdaTracer TRACER = new AwsLambdaTracer(OTEL);
 

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

@@ -12,7 +12,7 @@ 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.context.propagation.TextMapSetter;
 import io.opentelemetry.extension.aws.AwsXrayPropagator;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
@@ -119,7 +119,7 @@ public class AwsSdkClientTracer extends HttpClientTracer<Request<?>, Request<?>,
   }
 
   @Override
-  protected TextMapPropagator.Setter<Request<?>> getSetter() {
+  protected TextMapSetter<Request<?>> getSetter() {
     // We override injection and don't want to have the base class do it accidentally.
     return null;
   }

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

@@ -6,9 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.awssdk.v1_11;
 
 import com.amazonaws.Request;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 
-final class AwsSdkInjectAdapter implements TextMapPropagator.Setter<Request<?>> {
+final class AwsSdkInjectAdapter implements TextMapSetter<Request<?>> {
 
   static final AwsSdkInjectAdapter INSTANCE = new AwsSdkInjectAdapter();
 

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

@@ -6,14 +6,14 @@
 package io.opentelemetry.javaagent.instrumentation.awssdk.v1_11;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.extension.aws.AwsXrayPropagator;
 import java.util.Collections;
 import java.util.Map;
 
 class SqsParentContext {
 
-  private static class MapGetter implements TextMapPropagator.Getter<Map<String, String>> {
+  private static class MapGetter implements TextMapGetter<Map<String, String>> {
 
     private static final MapGetter INSTANCE = new MapGetter();
 

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

@@ -9,7 +9,7 @@ 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.context.propagation.TextMapSetter;
 import io.opentelemetry.extension.aws.AwsXrayPropagator;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
@@ -65,7 +65,7 @@ final class AwsSdkHttpClientTracer
   }
 
   @Override
-  protected TextMapPropagator.Setter<SdkHttpRequest.Builder> getSetter() {
+  protected TextMapSetter<SdkHttpRequest.Builder> getSetter() {
     return AwsSdkInjectAdapter.INSTANCE;
   }
 

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

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.instrumentation.awssdk.v2_2;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import software.amazon.awssdk.http.SdkHttpRequest;
 
-final class AwsSdkInjectAdapter implements TextMapPropagator.Setter<SdkHttpRequest.Builder> {
+final class AwsSdkInjectAdapter implements TextMapSetter<SdkHttpRequest.Builder> {
 
   static final AwsSdkInjectAdapter INSTANCE = new AwsSdkInjectAdapter();
 

instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientTracer.java

@@ -11,7 +11,7 @@ import com.google.api.client.http.HttpHeaders;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpResponse;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -63,7 +63,7 @@ public class GoogleHttpClientTracer
   }
 
   @Override
-  protected TextMapPropagator.Setter<HttpHeaders> getSetter() {
+  protected TextMapSetter<HttpHeaders> getSetter() {
     return SETTER;
   }
 

instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/HeadersInjectAdapter.java

@@ -6,9 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.googlehttpclient;
 
 import com.google.api.client.http.HttpHeaders;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 
-public class HeadersInjectAdapter implements TextMapPropagator.Setter<HttpHeaders> {
+public class HeadersInjectAdapter implements TextMapSetter<HttpHeaders> {
 
   public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter();
 

instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/ExtractAdapter.java

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.javaagent.instrumentation.grizzly;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import org.glassfish.grizzly.http.HttpRequestPacket;
 
-public class ExtractAdapter implements TextMapPropagator.Getter<HttpRequestPacket> {
+public class ExtractAdapter implements TextMapGetter<HttpRequestPacket> {
   public static final ExtractAdapter GETTER = new ExtractAdapter();
 
   @Override

instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpServerTracer.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.grizzly;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -84,7 +84,7 @@ public class GrizzlyHttpServerTracer
   }
 
   @Override
-  protected Getter<HttpRequestPacket> getGetter() {
+  protected TextMapGetter<HttpRequestPacket> getGetter() {
     return ExtractAdapter.GETTER;
   }
 

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

@@ -6,9 +6,9 @@
 package io.opentelemetry.instrumentation.grpc.v1_5.client;
 
 import io.grpc.Metadata;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 
-final class GrpcInjectAdapter implements TextMapPropagator.Setter<Metadata> {
+final class GrpcInjectAdapter implements TextMapSetter<Metadata> {
 
   static final GrpcInjectAdapter SETTER = new GrpcInjectAdapter();
 

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

@@ -6,9 +6,9 @@
 package io.opentelemetry.instrumentation.grpc.v1_5.server;
 
 import io.grpc.Metadata;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 
-final class GrpcExtractAdapter implements TextMapPropagator.Getter<Metadata> {
+final class GrpcExtractAdapter implements TextMapGetter<Metadata> {
 
   static final GrpcExtractAdapter GETTER = new GrpcExtractAdapter();
 

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

@@ -12,7 +12,7 @@ import io.grpc.Status;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.Tracer;
-import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.tracer.RpcServerTracer;
 import io.opentelemetry.instrumentation.grpc.v1_5.common.GrpcHelper;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
@@ -52,7 +52,7 @@ public class GrpcServerTracer extends RpcServerTracer<Metadata> {
   }
 
   @Override
-  protected Getter<Metadata> getGetter() {
+  protected TextMapGetter<Metadata> getGetter() {
     return GrpcExtractAdapter.GETTER;
   }
 }

instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HeadersInjectAdapter.java

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.javaagent.instrumentation.httpurlconnection;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import java.net.HttpURLConnection;
 
-public class HeadersInjectAdapter implements TextMapPropagator.Setter<HttpURLConnection> {
+public class HeadersInjectAdapter implements TextMapSetter<HttpURLConnection> {
 
   public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter();
 

instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTracer.java

@@ -8,7 +8,7 @@ package io.opentelemetry.javaagent.instrumentation.httpurlconnection;
 import static io.opentelemetry.javaagent.instrumentation.httpurlconnection.HeadersInjectAdapter.SETTER;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.HttpURLConnection;
 import java.net.URI;
@@ -53,7 +53,7 @@ public class HttpUrlConnectionTracer
   }
 
   @Override
-  protected TextMapPropagator.Setter<HttpURLConnection> getSetter() {
+  protected TextMapSetter<HttpURLConnection> getSetter() {
     return SETTER;
   }
 

instrumentation/java-httpclient/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/HttpHeadersInjectAdapter.java

@@ -5,11 +5,11 @@
 
 package io.opentelemetry.javaagent.instrumentation.httpclient;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import java.net.http.HttpRequest;
 
 /** Context propagation is implemented via {@link HttpHeadersInstrumentation}. */
-public class HttpHeadersInjectAdapter implements TextMapPropagator.Setter<HttpRequest> {
+public class HttpHeadersInjectAdapter implements TextMapSetter<HttpRequest> {
   public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
 
   @Override

instrumentation/java-httpclient/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpClientTracer.java

@@ -8,7 +8,7 @@ package io.opentelemetry.javaagent.instrumentation.httpclient;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.net.URI;
@@ -72,7 +72,7 @@ public class JdkHttpClientTracer
   }
 
   @Override
-  protected Setter<HttpRequest> getSetter() {
+  protected TextMapSetter<HttpRequest> getSetter() {
     return HttpHeadersInjectAdapter.SETTER;
   }
 

instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/InjectAdapter.java

@@ -6,9 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.jaxrsclient.v1_1;
 
 import com.sun.jersey.api.client.ClientRequest;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 
-public final class InjectAdapter implements TextMapPropagator.Setter<ClientRequest> {
+public final class InjectAdapter implements TextMapSetter<ClientRequest> {
 
   public static final InjectAdapter SETTER = new InjectAdapter();
 

instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientV1Tracer.java

@@ -9,7 +9,7 @@ import static io.opentelemetry.javaagent.instrumentation.jaxrsclient.v1_1.Inject
 
 import com.sun.jersey.api.client.ClientRequest;
 import com.sun.jersey.api.client.ClientResponse;
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 
@@ -48,7 +48,7 @@ public class JaxRsClientV1Tracer
   }
 
   @Override
-  protected Setter<ClientRequest> getSetter() {
+  protected TextMapSetter<ClientRequest> getSetter() {
     return SETTER;
   }
 

instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/InjectAdapter.java

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.javaagent.instrumentation.jaxrsclient.v2_0;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import javax.ws.rs.client.ClientRequestContext;
 
-public final class InjectAdapter implements TextMapPropagator.Setter<ClientRequestContext> {
+public final class InjectAdapter implements TextMapSetter<ClientRequestContext> {
 
   public static final InjectAdapter SETTER = new InjectAdapter();
 

instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/JaxRsClientTracer.java

@@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.jaxrsclient.v2_0;
 
 import static io.opentelemetry.javaagent.instrumentation.jaxrsclient.v2_0.InjectAdapter.SETTER;
 
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import javax.ws.rs.client.ClientRequestContext;
@@ -47,7 +47,7 @@ public class JaxRsClientTracer
   }
 
   @Override
-  protected Setter<ClientRequestContext> getSetter() {
+  protected TextMapSetter<ClientRequestContext> getSetter() {
     return SETTER;
   }
 

instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ResteasyClientTracer.java

@@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.jaxrsclient.v2_0;
 
 import static io.opentelemetry.javaagent.instrumentation.jaxrsclient.v2_0.ResteasyInjectAdapter.SETTER;
 
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import javax.ws.rs.core.Response;
@@ -47,7 +47,7 @@ public class ResteasyClientTracer
   }
 
   @Override
-  protected Setter<ClientInvocation> getSetter() {
+  protected TextMapSetter<ClientInvocation> getSetter() {
     return SETTER;
   }
 

instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v2_0/ResteasyInjectAdapter.java

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.javaagent.instrumentation.jaxrsclient.v2_0;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import org.jboss.resteasy.client.jaxrs.internal.ClientInvocation;
 
-public final class ResteasyInjectAdapter implements TextMapPropagator.Setter<ClientInvocation> {
+public final class ResteasyInjectAdapter implements TextMapSetter<ClientInvocation> {
 
   public static final ResteasyInjectAdapter SETTER = new ResteasyInjectAdapter();
 

instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessageExtractAdapter.java

@@ -5,12 +5,12 @@
 
 package io.opentelemetry.javaagent.instrumentation.jms;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import java.util.Collections;
 import javax.jms.JMSException;
 import javax.jms.Message;
 
-public class MessageExtractAdapter implements TextMapPropagator.Getter<Message> {
+public class MessageExtractAdapter implements TextMapGetter<Message> {
 
   public static final MessageExtractAdapter GETTER = new MessageExtractAdapter();
 

instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessageInjectAdapter.java

@@ -5,13 +5,13 @@
 
 package io.opentelemetry.javaagent.instrumentation.jms;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class MessageInjectAdapter implements TextMapPropagator.Setter<Message> {
+public class MessageInjectAdapter implements TextMapSetter<Message> {
 
   private static final Logger log = LoggerFactory.getLogger(MessageInjectAdapter.class);
 

instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TextMapExtractAdapter.java

@@ -5,14 +5,14 @@
 
 package io.opentelemetry.javaagent.instrumentation.kafkaclients;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import java.nio.charset.StandardCharsets;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 import org.apache.kafka.common.header.Header;
 import org.apache.kafka.common.header.Headers;
 
-public class TextMapExtractAdapter implements TextMapPropagator.Getter<Headers> {
+public class TextMapExtractAdapter implements TextMapGetter<Headers> {
 
   public static final TextMapExtractAdapter GETTER = new TextMapExtractAdapter();
 

instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TextMapInjectAdapter.java

@@ -5,11 +5,11 @@
 
 package io.opentelemetry.javaagent.instrumentation.kafkaclients;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import java.nio.charset.StandardCharsets;
 import org.apache.kafka.common.header.Headers;
 
-public class TextMapInjectAdapter implements TextMapPropagator.Setter<Headers> {
+public class TextMapInjectAdapter implements TextMapSetter<Headers> {
 
   public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
 

instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/TextMapExtractAdapter.java

@@ -5,14 +5,14 @@
 
 package io.opentelemetry.javaagent.instrumentation.kafkastreams;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import java.nio.charset.StandardCharsets;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 import org.apache.kafka.common.header.Header;
 import org.apache.kafka.common.header.Headers;
 
-public class TextMapExtractAdapter implements TextMapPropagator.Getter<Headers> {
+public class TextMapExtractAdapter implements TextMapGetter<Headers> {
 
   public static final TextMapExtractAdapter GETTER = new TextMapExtractAdapter();
 

instrumentation/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsTest.groovy

@@ -9,7 +9,7 @@ import static io.opentelemetry.api.trace.SpanKind.PRODUCER
 import io.opentelemetry.api.trace.Span
 import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator
 import io.opentelemetry.context.Context
-import io.opentelemetry.context.propagation.TextMapPropagator
+import io.opentelemetry.context.propagation.TextMapGetter
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
 import java.util.concurrent.LinkedBlockingQueue
@@ -207,7 +207,7 @@ class KafkaStreamsTest extends AgentInstrumentationSpecification {
     def headers = received.headers()
     headers.iterator().hasNext()
     def traceparent = new String(headers.headers("traceparent").iterator().next().value())
-    Context context = W3CTraceContextPropagator.instance.extract(Context.root(), "", new TextMapPropagator.Getter<String>() {
+    Context context = W3CTraceContextPropagator.instance.extract(Context.root(), "", new TextMapGetter<String>() {
       @Override
       Iterable<String> keys(String carrier) {
         return Collections.singleton("traceparent")

instrumentation/khttp-0.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/khttp/KHttpHeadersInjectAdapter.java

@@ -5,11 +5,11 @@
 
 package io.opentelemetry.javaagent.instrumentation.khttp;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import java.util.HashMap;
 import java.util.Map;
 
-public class KHttpHeadersInjectAdapter implements TextMapPropagator.Setter<Map<String, String>> {
+public class KHttpHeadersInjectAdapter implements TextMapSetter<Map<String, String>> {
 
   public static Map<String, String> asWritable(Map<String, String> headers) {
     // Kotlin likes to use read-only data structures, so wrap into new writable map

instrumentation/khttp-0.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/khttp/KHttpTracer.java

@@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.khttp;
 
 import static io.opentelemetry.javaagent.instrumentation.khttp.KHttpHeadersInjectAdapter.SETTER;
 
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -47,7 +47,7 @@ public class KHttpTracer extends HttpClientTracer<RequestWrapper, Map<String, St
   }
 
   @Override
-  protected Setter<Map<String, String>> getSetter() {
+  protected TextMapSetter<Map<String, String>> getSetter() {
     return SETTER;
   }
 

instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTracer.java

@@ -10,7 +10,7 @@ import static io.opentelemetry.api.trace.SpanKind.CLIENT;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import okhttp3.Request;
@@ -70,7 +70,7 @@ public class KubernetesClientTracer extends HttpClientTracer<Request, Request, R
   }
 
   @Override
-  protected Setter<Request> getSetter() {
+  protected TextMapSetter<Request> getSetter() {
     // TODO (trask) no propagation implemented yet?
     return null;
   }

instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherTracer.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.liberty.dispatcher;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -46,8 +46,8 @@ public class LibertyDispatcherTracer
     return libertyConnectionWrapper.getProtocol();
   }
 
-  private static final TextMapPropagator.Getter<LibertyRequestWrapper> GETTER =
+  private static final TextMapGetter<LibertyRequestWrapper> GETTER =
-      new TextMapPropagator.Getter<LibertyRequestWrapper>() {
+      new TextMapGetter<LibertyRequestWrapper>() {
 
         @Override
         public Iterable<String> keys(LibertyRequestWrapper carrier) {
@@ -61,7 +61,7 @@ public class LibertyDispatcherTracer
       };
 
   @Override
-  protected TextMapPropagator.Getter<LibertyRequestWrapper> getGetter() {
+  protected TextMapGetter<LibertyRequestWrapper> getGetter() {
     return GETTER;
   }
 

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientTracer.java

@@ -12,7 +12,7 @@ import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.HOST;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import io.opentelemetry.instrumentation.api.tracer.utils.NetPeerUtils;
 import java.net.InetSocketAddress;
@@ -85,7 +85,7 @@ public class NettyHttpClientTracer
   }
 
   @Override
-  protected TextMapPropagator.Setter<HttpHeaders> getSetter() {
+  protected TextMapSetter<HttpHeaders> getSetter() {
     return SETTER;
   }
 

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyResponseInjectAdapter.java

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.javaagent.instrumentation.netty.v3_8.client;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import org.jboss.netty.handler.codec.http.HttpHeaders;
 
-public class NettyResponseInjectAdapter implements TextMapPropagator.Setter<HttpHeaders> {
+public class NettyResponseInjectAdapter implements TextMapSetter<HttpHeaders> {
 
   public static final NettyResponseInjectAdapter SETTER = new NettyResponseInjectAdapter();
 

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerTracer.java

@@ -8,7 +8,7 @@ package io.opentelemetry.javaagent.instrumentation.netty.v3_8.server;
 import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.HOST;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
 import io.opentelemetry.javaagent.instrumentation.netty.v3_8.ChannelTraceContext;
 import java.net.InetSocketAddress;
@@ -75,7 +75,7 @@ public class NettyHttpServerTracer
   }
 
   @Override
-  protected Getter<HttpRequest> getGetter() {
+  protected TextMapGetter<HttpRequest> getGetter() {
     return NettyRequestExtractAdapter.GETTER;
   }
 

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyRequestExtractAdapter.java

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.javaagent.instrumentation.netty.v3_8.server;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import org.jboss.netty.handler.codec.http.HttpRequest;
 
-public class NettyRequestExtractAdapter implements TextMapPropagator.Getter<HttpRequest> {
+public class NettyRequestExtractAdapter implements TextMapGetter<HttpRequest> {
 
   public static final NettyRequestExtractAdapter GETTER = new NettyRequestExtractAdapter();
 

instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyHttpClientTracer.java

@@ -16,7 +16,7 @@ import io.netty.handler.codec.http.HttpResponse;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import io.opentelemetry.instrumentation.api.tracer.utils.NetPeerUtils;
 import java.net.InetSocketAddress;
@@ -85,7 +85,7 @@ public class NettyHttpClientTracer
   }
 
   @Override
-  protected TextMapPropagator.Setter<HttpHeaders> getSetter() {
+  protected TextMapSetter<HttpHeaders> getSetter() {
     return SETTER;
   }
 

instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyResponseInjectAdapter.java

@@ -6,9 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.netty.v4_0.client;
 
 import io.netty.handler.codec.http.HttpHeaders;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 
-public class NettyResponseInjectAdapter implements TextMapPropagator.Setter<HttpHeaders> {
+public class NettyResponseInjectAdapter implements TextMapSetter<HttpHeaders> {
 
   public static final NettyResponseInjectAdapter SETTER = new NettyResponseInjectAdapter();
 

instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyHttpServerTracer.java

@@ -11,7 +11,7 @@ import io.netty.channel.Channel;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponse;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
 import io.opentelemetry.javaagent.instrumentation.netty.v4_0.AttributeKeys;
 import java.net.InetSocketAddress;
@@ -56,7 +56,7 @@ public class NettyHttpServerTracer
   }
 
   @Override
-  protected Getter<HttpRequest> getGetter() {
+  protected TextMapGetter<HttpRequest> getGetter() {
     return NettyRequestExtractAdapter.GETTER;
   }
 

instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyRequestExtractAdapter.java

@@ -6,9 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.netty.v4_0.server;
 
 import io.netty.handler.codec.http.HttpRequest;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 
-public class NettyRequestExtractAdapter implements TextMapPropagator.Getter<HttpRequest> {
+public class NettyRequestExtractAdapter implements TextMapGetter<HttpRequest> {
 
   public static final NettyRequestExtractAdapter GETTER = new NettyRequestExtractAdapter();
 

instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyHttpClientTracer.java

@@ -16,7 +16,7 @@ import io.netty.handler.codec.http.HttpResponse;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import io.opentelemetry.instrumentation.api.tracer.utils.NetPeerUtils;
 import java.net.InetSocketAddress;
@@ -85,7 +85,7 @@ public class NettyHttpClientTracer
   }
 
   @Override
-  protected TextMapPropagator.Setter<HttpHeaders> getSetter() {
+  protected TextMapSetter<HttpHeaders> getSetter() {
     return SETTER;
   }
 

instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyResponseInjectAdapter.java

@@ -6,9 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.netty.v4_1.client;
 
 import io.netty.handler.codec.http.HttpHeaders;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 
-public class NettyResponseInjectAdapter implements TextMapPropagator.Setter<HttpHeaders> {
+public class NettyResponseInjectAdapter implements TextMapSetter<HttpHeaders> {
 
   public static final NettyResponseInjectAdapter SETTER = new NettyResponseInjectAdapter();
 

instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyHttpServerTracer.java

@@ -11,7 +11,7 @@ import io.netty.channel.Channel;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponse;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
 import io.opentelemetry.instrumentation.netty.v4_1.AttributeKeys;
 import java.net.InetSocketAddress;
@@ -56,7 +56,7 @@ public class NettyHttpServerTracer
   }
 
   @Override
-  protected Getter<HttpRequest> getGetter() {
+  protected TextMapGetter<HttpRequest> getGetter() {
     return NettyRequestExtractAdapter.GETTER;
   }
 

instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyRequestExtractAdapter.java

@@ -6,9 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.netty.v4_1.server;
 
 import io.netty.handler.codec.http.HttpRequest;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 
-public class NettyRequestExtractAdapter implements TextMapPropagator.Getter<HttpRequest> {
+public class NettyRequestExtractAdapter implements TextMapGetter<HttpRequest> {
 
   public static final NettyRequestExtractAdapter GETTER = new NettyRequestExtractAdapter();
 

instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttpClientTracer.java

@@ -9,7 +9,7 @@ import static io.opentelemetry.javaagent.instrumentation.okhttp.v2_2.RequestBuil
 
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.Response;
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -47,7 +47,7 @@ public class OkHttpClientTracer extends HttpClientTracer<Request, Request.Builde
   }
 
   @Override
-  protected Setter<Request.Builder> getSetter() {
+  protected TextMapSetter<Request.Builder> getSetter() {
     return SETTER;
   }
 

instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/RequestBuilderInjectAdapter.java

@@ -6,9 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.okhttp.v2_2;
 
 import com.squareup.okhttp.Request;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 
-public class RequestBuilderInjectAdapter implements TextMapPropagator.Setter<Request.Builder> {
+public class RequestBuilderInjectAdapter implements TextMapSetter<Request.Builder> {
   public static final RequestBuilderInjectAdapter SETTER = new RequestBuilderInjectAdapter();
 
   @Override

instrumentation/okhttp/okhttp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/OkHttpClientTracer.java

@@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.okhttp.v3_0;
 
 import static io.opentelemetry.javaagent.instrumentation.okhttp.v3_0.RequestBuilderInjectAdapter.SETTER;
 
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import okhttp3.Request;
@@ -46,7 +46,7 @@ public class OkHttpClientTracer extends HttpClientTracer<Request, Request.Builde
   }
 
   @Override
-  protected Setter<Request.Builder> getSetter() {
+  protected TextMapSetter<Request.Builder> getSetter() {
     return SETTER;
   }
 

instrumentation/okhttp/okhttp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/RequestBuilderInjectAdapter.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.okhttp.v3_0;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import okhttp3.Request;
 
 /**
@@ -13,7 +13,7 @@ import okhttp3.Request;
  *
  * @author Pavol Loffay
  */
-public class RequestBuilderInjectAdapter implements TextMapPropagator.Setter<Request.Builder> {
+public class RequestBuilderInjectAdapter implements TextMapSetter<Request.Builder> {
 
   public static final RequestBuilderInjectAdapter SETTER = new RequestBuilderInjectAdapter();
 

instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/baggage/BaggageBridging.java

@@ -12,7 +12,7 @@ import application.io.opentelemetry.api.baggage.BaggageEntryMetadata;
 public final class BaggageBridging {
 
   public static Baggage toApplication(io.opentelemetry.api.baggage.Baggage agentBaggage) {
-    BaggageBuilder applicationBaggageBuilder = Baggage.builder().setNoParent();
+    BaggageBuilder applicationBaggageBuilder = Baggage.builder();
     agentBaggage.forEach(
         (key, entry) ->
             applicationBaggageBuilder.put(
@@ -24,7 +24,7 @@ public final class BaggageBridging {
 
   public static io.opentelemetry.api.baggage.Baggage toAgent(Baggage applicationBaggage) {
     io.opentelemetry.api.baggage.BaggageBuilder agentBaggageBuilder =
-        io.opentelemetry.api.baggage.Baggage.builder().setNoParent();
+        io.opentelemetry.api.baggage.Baggage.builder();
     applicationBaggage.forEach(
         (key, entry) ->
             agentBaggageBuilder.put(

instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/propagation/ApplicationTextMapPropagator.java

@@ -6,7 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.propagation;
 
 import application.io.opentelemetry.context.Context;
+import application.io.opentelemetry.context.propagation.TextMapGetter;
 import application.io.opentelemetry.context.propagation.TextMapPropagator;
+import application.io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.context.AgentContextStorage;
 import java.util.Collection;
 
@@ -26,7 +28,7 @@ class ApplicationTextMapPropagator implements TextMapPropagator {
 
   @Override
   public <C> Context extract(
-      Context applicationContext, C carrier, TextMapPropagator.Getter<C> applicationGetter) {
+      Context applicationContext, C carrier, TextMapGetter<C> applicationGetter) {
     io.opentelemetry.context.Context agentContext =
         AgentContextStorage.getAgentContext(applicationContext);
     io.opentelemetry.context.Context agentUpdatedContext =
@@ -39,18 +41,18 @@ class ApplicationTextMapPropagator implements TextMapPropagator {
 
   @Override
   public <C> void inject(
-      Context applicationContext, C carrier, TextMapPropagator.Setter<C> applicationSetter) {
+      Context applicationContext, C carrier, TextMapSetter<C> applicationSetter) {
     io.opentelemetry.context.Context agentContext =
         AgentContextStorage.getAgentContext(applicationContext);
     agentTextMapPropagator.inject(agentContext, carrier, new AgentSetter<>(applicationSetter));
   }
 
   private static class AgentGetter<C>
-      implements io.opentelemetry.context.propagation.TextMapPropagator.Getter<C> {
+      implements io.opentelemetry.context.propagation.TextMapGetter<C> {
 
-    private final TextMapPropagator.Getter<C> applicationGetter;
+    private final TextMapGetter<C> applicationGetter;
 
-    AgentGetter(TextMapPropagator.Getter<C> applicationGetter) {
+    AgentGetter(TextMapGetter<C> applicationGetter) {
       this.applicationGetter = applicationGetter;
     }
 
@@ -66,11 +68,11 @@ class ApplicationTextMapPropagator implements TextMapPropagator {
   }
 
   private static class AgentSetter<C>
-      implements io.opentelemetry.context.propagation.TextMapPropagator.Setter<C> {
+      implements io.opentelemetry.context.propagation.TextMapSetter<C> {
 
-    private final TextMapPropagator.Setter<C> applicationSetter;
+    private final TextMapSetter<C> applicationSetter;
 
-    AgentSetter(Setter<C> applicationSetter) {
+    AgentSetter(TextMapSetter<C> applicationSetter) {
       this.applicationSetter = applicationSetter;
     }
 

instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/Bridging.java

@@ -63,7 +63,7 @@ public class Bridging {
 
   private static TraceState toApplication(io.opentelemetry.api.trace.TraceState agentTraceState) {
     TraceStateBuilder applicationTraceState = TraceState.builder();
-    agentTraceState.forEach(applicationTraceState::set);
+    agentTraceState.forEach(applicationTraceState::put);
     return applicationTraceState.build();
   }
 
@@ -158,7 +158,7 @@ public class Bridging {
   private static io.opentelemetry.api.trace.TraceState toAgent(TraceState applicationTraceState) {
     io.opentelemetry.api.trace.TraceStateBuilder agentTraceState =
         io.opentelemetry.api.trace.TraceState.builder();
-    applicationTraceState.forEach(agentTraceState::set);
+    applicationTraceState.forEach(agentTraceState::put);
     return agentTraceState.build();
   }
 

instrumentation/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/HeadersInjectAdapter.java

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.javaagent.instrumentation.playws;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import play.shaded.ahc.io.netty.handler.codec.http.HttpHeaders;
 
-public class HeadersInjectAdapter implements TextMapPropagator.Setter<HttpHeaders> {
+public class HeadersInjectAdapter implements TextMapSetter<HttpHeaders> {
 
   public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter();
 

instrumentation/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientTracer.java

@@ -7,7 +7,7 @@ package io.opentelemetry.javaagent.instrumentation.playws;
 
 import static io.opentelemetry.javaagent.instrumentation.playws.HeadersInjectAdapter.SETTER;
 
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -48,7 +48,7 @@ public class PlayWsClientTracer extends HttpClientTracer<Request, HttpHeaders, R
   }
 
   @Override
-  protected Setter<HttpHeaders> getSetter() {
+  protected TextMapSetter<HttpHeaders> getSetter() {
     return SETTER;
   }
 

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TextMapExtractAdapter.java

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.javaagent.instrumentation.rabbitmq;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import java.util.Map;
 
-public class TextMapExtractAdapter implements TextMapPropagator.Getter<Map<String, Object>> {
+public class TextMapExtractAdapter implements TextMapGetter<Map<String, Object>> {
 
   public static final TextMapExtractAdapter GETTER = new TextMapExtractAdapter();
 

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TextMapInjectAdapter.java

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.javaagent.instrumentation.rabbitmq;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import java.util.Map;
 
-public class TextMapInjectAdapter implements TextMapPropagator.Setter<Map<String, Object>> {
+public class TextMapInjectAdapter implements TextMapSetter<Map<String, Object>> {
 
   public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
 

instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/ContextPayload.java

@@ -9,7 +9,8 @@ import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
@@ -69,7 +70,7 @@ public class ContextPayload {
     out.writeObject(context);
   }
 
-  public static class ExtractAdapter implements TextMapPropagator.Getter<ContextPayload> {
+  public static class ExtractAdapter implements TextMapGetter<ContextPayload> {
     @Override
     public Iterable<String> keys(ContextPayload contextPayload) {
       return contextPayload.getSpanContext().keySet();
@@ -81,7 +82,7 @@ public class ContextPayload {
     }
   }
 
-  public static class InjectAdapter implements TextMapPropagator.Setter<ContextPayload> {
+  public static class InjectAdapter implements TextMapSetter<ContextPayload> {
     @Override
     public void set(ContextPayload carrier, String key, String value) {
       carrier.getSpanContext().put(key, value);

instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerTracer.java

@@ -10,7 +10,7 @@ import static io.opentelemetry.api.trace.SpanKind.SERVER;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.tracer.RpcServerTracer;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.lang.reflect.Method;
@@ -36,7 +36,7 @@ public class RmiServerTracer extends RpcServerTracer {
   }
 
   @Override
-  protected Getter getGetter() {
+  protected TextMapGetter getGetter() {
     return null;
   }
 

instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/JaegerSpanExporterAutoConfigurationTest.java

@@ -51,14 +51,14 @@ class JaegerSpanExporterAutoConfigurationTest {
     this.contextRunner
         .withPropertyValues(
             "opentelemetry.trace.exporter.jaeger.enabled=true",
-            "opentelemetry.trace.exporter.jaeger.endpoint=localhost:8080/test",
+            "opentelemetry.trace.exporter.jaeger.endpoint=http://localhost:8080/test",
             "opentelemetry.trace.exporter.jaeger.spantimeout=420ms")
         .run(
             (context) -> {
               JaegerSpanExporterProperties jaegerSpanExporterProperties =
                   context.getBean(JaegerSpanExporterProperties.class);
               assertThat(jaegerSpanExporterProperties.getEndpoint())
-                  .isEqualTo("localhost:8080/test");
+                  .isEqualTo("http://localhost:8080/test");
               assertThat(jaegerSpanExporterProperties.getSpanTimeout()).hasMillis(420);
             });
   }

instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/OtlpGrpcSpanExporterAutoConfigurationTest.java

@@ -51,13 +51,14 @@ class OtlpGrpcSpanExporterAutoConfigurationTest {
     this.contextRunner
         .withPropertyValues(
             "opentelemetry.trace.exporter.otlp.enabled=true",
-            "opentelemetry.trace.exporter.otlp.endpoint=localhost:8080/test",
+            "opentelemetry.trace.exporter.otlp.endpoint=http://localhost:8080/test",
             "opentelemetry.trace.exporter.otlp.spantimeout=69ms")
         .run(
             (context) -> {
               OtlpGrpcSpanExporterProperties otlpSpanExporterProperties =
                   context.getBean(OtlpGrpcSpanExporterProperties.class);
-              assertThat(otlpSpanExporterProperties.getEndpoint()).isEqualTo("localhost:8080/test");
+              assertThat(otlpSpanExporterProperties.getEndpoint())
+                  .isEqualTo("http://localhost:8080/test");
               assertThat(otlpSpanExporterProperties.getSpanTimeout()).hasMillis(69);
             });
   }

instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/HttpHeadersInjectAdapter.java

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.instrumentation.spring.httpclients;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import org.springframework.http.HttpHeaders;
 
-class HttpHeadersInjectAdapter implements TextMapPropagator.Setter<HttpHeaders> {
+class HttpHeadersInjectAdapter implements TextMapSetter<HttpHeaders> {
 
   public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
 

instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateTracer.java

@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.spring.httpclients;
 
 import static io.opentelemetry.instrumentation.spring.httpclients.HttpHeadersInjectAdapter.SETTER;
 
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.io.IOException;
 import java.net.URI;
@@ -54,7 +54,7 @@ class RestTemplateTracer extends HttpClientTracer<HttpRequest, HttpHeaders, Clie
   }
 
   @Override
-  protected Setter<HttpHeaders> getSetter() {
+  protected TextMapSetter<HttpHeaders> getSetter() {
     return SETTER;
   }
 

instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/HttpHeadersInjectAdapter.java

@@ -5,10 +5,10 @@
 
 package io.opentelemetry.instrumentation.spring.webflux.client;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import org.springframework.web.reactive.function.client.ClientRequest;
 
-class HttpHeadersInjectAdapter implements TextMapPropagator.Setter<ClientRequest.Builder> {
+class HttpHeadersInjectAdapter implements TextMapSetter<ClientRequest.Builder> {
 
   public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
 

instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientTracer.java

@@ -10,7 +10,7 @@ import static io.opentelemetry.instrumentation.spring.webflux.client.HttpHeaders
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
+import io.opentelemetry.context.propagation.TextMapSetter;
 import io.opentelemetry.instrumentation.api.config.Config;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
 import java.lang.invoke.MethodHandle;
@@ -76,7 +76,7 @@ public class SpringWebfluxHttpClientTracer
   }
 
   @Override
-  protected Setter<ClientRequest.Builder> getSetter() {
+  protected TextMapSetter<ClientRequest.Builder> getSetter() {
     return SETTER;
   }
 

instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcServerTracer.java

@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.spring.webmvc;
 
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
 import io.opentelemetry.instrumentation.servlet.HttpServletRequestGetter;
 import javax.servlet.http.HttpServletRequest;
@@ -32,7 +32,7 @@ class SpringWebMvcServerTracer
   }
 
   @Override
-  protected Getter<HttpServletRequest> getGetter() {
+  protected TextMapGetter<HttpServletRequest> getGetter() {
     return HttpServletRequestGetter.GETTER;
   }
 

instrumentation/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat7/TomcatTracer.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.tomcat7;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.servlet.AppServerBridge;
 import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
 import java.lang.reflect.Method;
@@ -20,7 +20,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class TomcatTracer extends HttpServerTracer<Request, Response, Request, Request>
-    implements TextMapPropagator.Getter<Request> {
+    implements TextMapGetter<Request> {
 
   private static final Logger log = LoggerFactory.getLogger(TomcatTracer.class);
   private static final TomcatTracer TRACER = new TomcatTracer();
@@ -68,7 +68,7 @@ public class TomcatTracer extends HttpServerTracer<Request, Response, Request, R
   }
 
   @Override
-  protected TextMapPropagator.Getter<Request> getGetter() {
+  protected TextMapGetter<Request> getGetter() {
     return this;
   }
 

instrumentation/undertow/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowExchangeGetter.java

@@ -5,12 +5,12 @@
 
 package io.opentelemetry.javaagent.instrumentation.undertow;
 
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.undertow.server.HttpServerExchange;
 import io.undertow.util.HttpString;
 import java.util.stream.Collectors;
 
-public class UndertowExchangeGetter implements TextMapPropagator.Getter<HttpServerExchange> {
+public class UndertowExchangeGetter implements TextMapGetter<HttpServerExchange> {
 
   public static final UndertowExchangeGetter GETTER = new UndertowExchangeGetter();
 

instrumentation/undertow/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpServerTracer.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.undertow;
 
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.servlet.AppServerBridge;
 import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
 import io.opentelemetry.javaagent.instrumentation.api.undertow.KeyHolder;
@@ -71,7 +71,7 @@ public class UndertowHttpServerTracer
   }
 
   @Override
-  protected TextMapPropagator.Getter<HttpServerExchange> getGetter() {
+  protected TextMapGetter<HttpServerExchange> getGetter() {
     return UndertowExchangeGetter.GETTER;
   }