diff --git a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java b/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java index f0005a86f5..813605add7 100644 --- a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java +++ b/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 diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 9ed1a60d39..c367a98075 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -8,8 +8,8 @@ configurations.all { ext { versions = [ - opentelemetry : '0.16.0', - opentelemetryAlpha: "0.16.0-alpha", + opentelemetry : '0.17.0', + opentelemetryAlpha: "0.17.0-alpha", slf4j : "1.7.30", guava : "30.1-jre", diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/BaseTracer.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/BaseTracer.java index 98d1c6d44a..8e12b198d8 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/BaseTracer.java +++ b/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 Context extractWithGlobalPropagators( - C carrier, TextMapPropagator.Getter getter) { + public static Context extractWithGlobalPropagators(C carrier, TextMapGetter getter) { return extract(GlobalOpenTelemetry.getPropagators(), carrier, getter); } - public Context extract(C carrier, TextMapPropagator.Getter getter) { + public Context extract(C carrier, TextMapGetter getter) { return extract(propagators, carrier, getter); } private static Context extract( - ContextPropagators propagators, C carrier, TextMapPropagator.Getter getter) { + ContextPropagators propagators, C carrier, TextMapGetter getter) { ContextPropagationDebug.debugContextLeakIfEnabled(); // Using Context.ROOT here may be quite unexpected, but the reason is simple. diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpClientTracer.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpClientTracer.java index 3eea969bc7..a60fcdde74 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpClientTracer.java +++ b/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.TextMapPropagator.Setter; +import io.opentelemetry.context.propagation.TextMapSetter; 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 extends BaseT @Nullable protected abstract String responseHeader(RESPONSE response, String name); - protected abstract TextMapPropagator.Setter getSetter(); + protected abstract TextMapSetter getSetter(); public boolean shouldStartSpan(Context parentContext) { return shouldStartSpan(CLIENT, parentContext); @@ -96,7 +95,7 @@ public abstract class HttpClientTracer extends BaseT } protected void inject(Context context, CARRIER carrier) { - Setter setter = getSetter(); + TextMapSetter 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"); diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpServerTracer.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpServerTracer.java index bb95f0fecf..1450dc078e 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpServerTracer.java +++ b/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 e protected abstract String flavor(CONNECTION connection, REQUEST request); - protected abstract TextMapPropagator.Getter getGetter(); + protected abstract TextMapGetter getGetter(); protected abstract String url(REQUEST request); diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/RpcServerTracer.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/RpcServerTracer.java index 2c50f535bb..2b3856139e 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/RpcServerTracer.java +++ b/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 extends BaseTracer { @@ -28,5 +28,5 @@ public abstract class RpcServerTracer extends BaseTracer { super(openTelemetry); } - protected abstract TextMapPropagator.Getter getGetter(); + protected abstract TextMapGetter getGetter(); } diff --git a/instrumentation-api/src/test/groovy/io/opentelemetry/instrumentation/api/tracer/HttpClientTracerTest.groovy b/instrumentation-api/src/test/groovy/io/opentelemetry/instrumentation/api/tracer/HttpClientTracerTest.groovy index aad7386d58..65d3c981fd 100644 --- a/instrumentation-api/src/test/groovy/io/opentelemetry/instrumentation/api/tracer/HttpClientTracerTest.groovy +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return null } diff --git a/instrumentation-core/servlet-2.2/src/main/java/io/opentelemetry/instrumentation/servlet/HttpServletRequestGetter.java b/instrumentation-core/servlet-2.2/src/main/java/io/opentelemetry/instrumentation/servlet/HttpServletRequestGetter.java index 22bd84a18b..18096c3497 100644 --- a/instrumentation-core/servlet-2.2/src/main/java/io/opentelemetry/instrumentation/servlet/HttpServletRequestGetter.java +++ b/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 { +public class HttpServletRequestGetter implements TextMapGetter { public static final HttpServletRequestGetter GETTER = new HttpServletRequestGetter(); diff --git a/instrumentation-core/servlet-2.2/src/main/java/io/opentelemetry/instrumentation/servlet/ServletHttpServerTracer.java b/instrumentation-core/servlet-2.2/src/main/java/io/opentelemetry/instrumentation/servlet/ServletHttpServerTracer.java index ab84187221..3f4ed5db2c 100644 --- a/instrumentation-core/servlet-2.2/src/main/java/io/opentelemetry/instrumentation/servlet/ServletHttpServerTracer.java +++ b/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 } @Override - protected Getter getGetter() { + protected TextMapGetter getGetter() { return HttpServletRequestGetter.GETTER; } diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientInstrumentationModule.java b/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientInstrumentationModule.java index 888de6a4fc..22d89b6046 100644 --- a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientInstrumentationModule.java +++ b/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 { + public static class InjectAdapter implements TextMapSetter { public static final InjectAdapter SETTER = new InjectAdapter(); diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientTracer.java b/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientTracer.java index 919d228ae7..14be754a14 100644 --- a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerHeaders.java b/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerHeaders.java index 0b74a92c44..1d1f842f77 100644 --- a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerHeaders.java +++ b/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 { +public class AkkaHttpServerHeaders implements TextMapGetter { public static final AkkaHttpServerHeaders GETTER = new AkkaHttpServerHeaders(); diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerTracer.java b/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerTracer.java index 803c685c96..ae5cb9c3dc 100644 --- a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerTracer.java +++ b/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 getGetter() { + protected TextMapGetter getGetter() { return AkkaHttpServerHeaders.GETTER; } diff --git a/instrumentation/apache-camel-2.20/javaagent-unittests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtilTest.java b/instrumentation/apache-camel-2.20/javaagent-unittests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtilTest.java index f863c9c42c..38dfafead3 100644 --- a/instrumentation/apache-camel-2.20/javaagent-unittests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtilTest.java +++ b/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 diff --git a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtil.java b/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtil.java index eb94c902d9..498c5580b2 100644 --- a/instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtil.java +++ b/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.TextMapPropagator.Setter; +import io.opentelemetry.context.propagation.TextMapGetter; +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> { + private static class MapGetter implements TextMapGetter> { private static final MapGetter INSTANCE = new MapGetter(); @@ -64,7 +64,7 @@ final class CamelPropagationUtil { } } - private static class MapSetter implements Setter> { + private static class MapSetter implements TextMapSetter> { private static final MapSetter INSTANCE = new MapSetter(); diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboExtractAdapter.java b/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboExtractAdapter.java index 36a0f18efb..9b1038807b 100644 --- a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboExtractAdapter.java +++ b/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 { +class DubboExtractAdapter implements TextMapGetter { static final DubboExtractAdapter GETTER = new DubboExtractAdapter(); diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboInjectAdapter.java b/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboInjectAdapter.java index a3ae1e956a..46b4efcb25 100644 --- a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboInjectAdapter.java +++ b/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 { +class DubboInjectAdapter implements TextMapSetter { static final DubboInjectAdapter SETTER = new DubboInjectAdapter(); diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java b/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java index 75433909ae..9d910012a5 100644 --- a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java +++ b/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 { } @Override - protected Getter getGetter() { + protected TextMapGetter getGetter() { return DubboExtractAdapter.GETTER; } } diff --git a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientTracer.java b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientTracer.java index 2ac9c034e2..cd7278a8cc 100644 --- a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java index 561b8ddbae..839a24b91f 100644 --- a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java +++ b/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 { +public class HttpHeadersInjectAdapter implements TextMapSetter { public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter(); diff --git a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/CommonsHttpClientTracer.java b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/CommonsHttpClientTracer.java index 7c86864307..27c9e54770 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/CommonsHttpClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return HttpHeadersInjectAdapter.SETTER; } } diff --git a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/HttpHeadersInjectAdapter.java b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/HttpHeadersInjectAdapter.java index 807113a69c..b523ae55d5 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/HttpHeadersInjectAdapter.java +++ b/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 { +public class HttpHeadersInjectAdapter implements TextMapSetter { public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter(); diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientTracer.java b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientTracer.java index a46b7bb512..a0e382efa1 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/HttpHeadersInjectAdapter.java b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/HttpHeadersInjectAdapter.java index 4afd43d798..d352c0fc83 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/HttpHeadersInjectAdapter.java +++ b/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 { +class HttpHeadersInjectAdapter implements TextMapSetter { public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter(); diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientTracer.java b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientTracer.java index 989a7d6d0e..a983fa8635 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return HttpHeadersInjectAdapter.SETTER; } diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/HttpHeadersInjectAdapter.java b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/HttpHeadersInjectAdapter.java index dabbe9af65..34230b3488 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/HttpHeadersInjectAdapter.java +++ b/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 { +class HttpHeadersInjectAdapter implements TextMapSetter { public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter(); diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/client/ArmeriaClientTracer.java b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/client/ArmeriaClientTracer.java index b77a72c762..2b62d987d0 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/client/ArmeriaClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return ArmeriaSetter.INSTANCE; } @@ -69,7 +69,7 @@ public class ArmeriaClientTracer return "io.opentelemetry.armeria"; } - private static class ArmeriaSetter implements Setter { + private static class ArmeriaSetter implements TextMapSetter { private static final ArmeriaSetter INSTANCE = new ArmeriaSetter(); diff --git a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/server/ArmeriaServerTracer.java b/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/server/ArmeriaServerTracer.java index 1de23bc20d..f815b25187 100644 --- a/instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/server/ArmeriaServerTracer.java +++ b/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 getGetter() { + protected TextMapGetter 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 { + private static class ArmeriaGetter implements TextMapGetter { private static final ArmeriaGetter INSTANCE = new ArmeriaGetter(); diff --git a/instrumentation/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientInjectAdapter.java b/instrumentation/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientInjectAdapter.java index 45c532463c..63bd0e6f62 100644 --- a/instrumentation/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientInjectAdapter.java +++ b/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 { +public class AsyncHttpClientInjectAdapter implements TextMapSetter { public static final AsyncHttpClientInjectAdapter SETTER = new AsyncHttpClientInjectAdapter(); diff --git a/instrumentation/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientTracer.java b/instrumentation/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientTracer.java index 48355b6e89..0694e262ec 100644 --- a/instrumentation/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return AsyncHttpClientInjectAdapter.SETTER; } diff --git a/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractor.java b/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractor.java index 38fd561e8e..b142272539 100644 --- a/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractor.java +++ b/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> { + private static class MapGetter implements TextMapGetter> { private static final MapGetter INSTANCE = new MapGetter(); diff --git a/instrumentation/aws-lambda-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambda/v1_0/ApiGatewayProxyRequestTest.java b/instrumentation/aws-lambda-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambda/v1_0/ApiGatewayProxyRequestTest.java index b663ce9838..04832becf9 100644 --- a/instrumentation/aws-lambda-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambda/v1_0/ApiGatewayProxyRequestTest.java +++ b/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 diff --git a/instrumentation/aws-lambda-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractorTest.java b/instrumentation/aws-lambda-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractorTest.java index 3ca0909ca1..32663fecc0 100644 --- a/instrumentation/aws-lambda-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractorTest.java +++ b/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); diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkClientTracer.java b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkClientTracer.java index 6b70989e70..14ffda4974 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkClientTracer.java +++ b/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, } @Override - protected TextMapPropagator.Setter> getSetter() { + protected TextMapSetter> getSetter() { // We override injection and don't want to have the base class do it accidentally. return null; } diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInjectAdapter.java b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInjectAdapter.java index 49263b80af..f6156508f1 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSdkInjectAdapter.java +++ b/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> { +final class AwsSdkInjectAdapter implements TextMapSetter> { static final AwsSdkInjectAdapter INSTANCE = new AwsSdkInjectAdapter(); diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/SqsParentContext.java b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/SqsParentContext.java index 5ecbd7bc95..e384017bc9 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/SqsParentContext.java +++ b/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> { + private static class MapGetter implements TextMapGetter> { private static final MapGetter INSTANCE = new MapGetter(); diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpClientTracer.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpClientTracer.java index ee6ba7e574..da95e1558a 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkHttpClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return AwsSdkInjectAdapter.INSTANCE; } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkInjectAdapter.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkInjectAdapter.java index 6021c2acb6..46d2f64106 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AwsSdkInjectAdapter.java +++ b/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 { +final class AwsSdkInjectAdapter implements TextMapSetter { static final AwsSdkInjectAdapter INSTANCE = new AwsSdkInjectAdapter(); diff --git a/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientTracer.java b/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientTracer.java index 21d21ba1cd..cf975397da 100644 --- a/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/GoogleHttpClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/HeadersInjectAdapter.java b/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/HeadersInjectAdapter.java index c64be1516a..370b70f1fe 100644 --- a/instrumentation/google-http-client-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/googlehttpclient/HeadersInjectAdapter.java +++ b/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 { +public class HeadersInjectAdapter implements TextMapSetter { public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter(); diff --git a/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/ExtractAdapter.java b/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/ExtractAdapter.java index a827e5ca75..c85e21cd27 100644 --- a/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/ExtractAdapter.java +++ b/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 { +public class ExtractAdapter implements TextMapGetter { public static final ExtractAdapter GETTER = new ExtractAdapter(); @Override diff --git a/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpServerTracer.java b/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpServerTracer.java index d53ceadc18..4eb8900312 100644 --- a/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpServerTracer.java +++ b/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 getGetter() { + protected TextMapGetter getGetter() { return ExtractAdapter.GETTER; } diff --git a/instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/client/GrpcInjectAdapter.java b/instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/client/GrpcInjectAdapter.java index 6e0a08cccb..cddffcafff 100644 --- a/instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/client/GrpcInjectAdapter.java +++ b/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 { +final class GrpcInjectAdapter implements TextMapSetter { static final GrpcInjectAdapter SETTER = new GrpcInjectAdapter(); diff --git a/instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/server/GrpcExtractAdapter.java b/instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/server/GrpcExtractAdapter.java index 10b9382b04..dc38e5a2c1 100644 --- a/instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/server/GrpcExtractAdapter.java +++ b/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 { +final class GrpcExtractAdapter implements TextMapGetter { static final GrpcExtractAdapter GETTER = new GrpcExtractAdapter(); diff --git a/instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/server/GrpcServerTracer.java b/instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/server/GrpcServerTracer.java index dd3fb92382..d68fb13b37 100644 --- a/instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/server/GrpcServerTracer.java +++ b/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 { } @Override - protected Getter getGetter() { + protected TextMapGetter getGetter() { return GrpcExtractAdapter.GETTER; } } diff --git a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HeadersInjectAdapter.java b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HeadersInjectAdapter.java index 4a7105970e..b67a16b126 100644 --- a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HeadersInjectAdapter.java +++ b/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 { +public class HeadersInjectAdapter implements TextMapSetter { public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter(); diff --git a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTracer.java b/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTracer.java index 111a929ebf..0606d9dee8 100644 --- a/instrumentation/http-url-connection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/instrumentation/java-httpclient/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/HttpHeadersInjectAdapter.java b/instrumentation/java-httpclient/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/HttpHeadersInjectAdapter.java index 8f15d52cbb..801f02ad5e 100644 --- a/instrumentation/java-httpclient/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/HttpHeadersInjectAdapter.java +++ b/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 { +public class HttpHeadersInjectAdapter implements TextMapSetter { public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter(); @Override diff --git a/instrumentation/java-httpclient/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpClientTracer.java b/instrumentation/java-httpclient/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpClientTracer.java index f2a267de73..916bf6f08d 100644 --- a/instrumentation/java-httpclient/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/httpclient/JdkHttpClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return HttpHeadersInjectAdapter.SETTER; } diff --git a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/InjectAdapter.java b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/InjectAdapter.java index 40f3a7108d..b54e2517fe 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/InjectAdapter.java +++ b/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 { +public final class InjectAdapter implements TextMapSetter { public static final InjectAdapter SETTER = new InjectAdapter(); diff --git a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientV1Tracer.java b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientV1Tracer.java index b8ff93b259..448ba9541a 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/v1_1/JaxRsClientV1Tracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/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 b/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 index b282052fd8..7ec0094bf8 100644 --- a/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 +++ b/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 { +public final class InjectAdapter implements TextMapSetter { public static final InjectAdapter SETTER = new InjectAdapter(); diff --git a/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 b/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 index 4ec89ebaad..cd957f5b93 100644 --- a/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 +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/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 b/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 index 39be1ba03e..7870d7a88f 100644 --- a/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 +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/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 b/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 index 4492978d66..40aafeba3c 100644 --- a/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 +++ b/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 { +public final class ResteasyInjectAdapter implements TextMapSetter { public static final ResteasyInjectAdapter SETTER = new ResteasyInjectAdapter(); diff --git a/instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessageExtractAdapter.java b/instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessageExtractAdapter.java index 6d35b08401..64233d942b 100644 --- a/instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessageExtractAdapter.java +++ b/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 { +public class MessageExtractAdapter implements TextMapGetter { public static final MessageExtractAdapter GETTER = new MessageExtractAdapter(); diff --git a/instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessageInjectAdapter.java b/instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessageInjectAdapter.java index c2c3f843f6..0a79da5606 100644 --- a/instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/MessageInjectAdapter.java +++ b/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 { +public class MessageInjectAdapter implements TextMapSetter { private static final Logger log = LoggerFactory.getLogger(MessageInjectAdapter.class); diff --git a/instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TextMapExtractAdapter.java b/instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TextMapExtractAdapter.java index 94344549db..324550787e 100644 --- a/instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TextMapExtractAdapter.java +++ b/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 { +public class TextMapExtractAdapter implements TextMapGetter { public static final TextMapExtractAdapter GETTER = new TextMapExtractAdapter(); diff --git a/instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TextMapInjectAdapter.java b/instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TextMapInjectAdapter.java index 8393b6d032..9664065b81 100644 --- a/instrumentation/kafka-clients-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/TextMapInjectAdapter.java +++ b/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 { +public class TextMapInjectAdapter implements TextMapSetter { public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter(); diff --git a/instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/TextMapExtractAdapter.java b/instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/TextMapExtractAdapter.java index 6f13bb5197..9cc353618b 100644 --- a/instrumentation/kafka-streams-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/TextMapExtractAdapter.java +++ b/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 { +public class TextMapExtractAdapter implements TextMapGetter { public static final TextMapExtractAdapter GETTER = new TextMapExtractAdapter(); diff --git a/instrumentation/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsTest.groovy b/instrumentation/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsTest.groovy index e6c9e2b67a..457747abfb 100644 --- a/instrumentation/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsTest.groovy +++ b/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() { + Context context = W3CTraceContextPropagator.instance.extract(Context.root(), "", new TextMapGetter() { @Override Iterable keys(String carrier) { return Collections.singleton("traceparent") diff --git a/instrumentation/khttp-0.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/khttp/KHttpHeadersInjectAdapter.java b/instrumentation/khttp-0.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/khttp/KHttpHeadersInjectAdapter.java index b74c5a0e6e..15d4f46856 100644 --- a/instrumentation/khttp-0.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/khttp/KHttpHeadersInjectAdapter.java +++ b/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> { +public class KHttpHeadersInjectAdapter implements TextMapSetter> { public static Map asWritable(Map headers) { // Kotlin likes to use read-only data structures, so wrap into new writable map diff --git a/instrumentation/khttp-0.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/khttp/KHttpTracer.java b/instrumentation/khttp-0.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/khttp/KHttpTracer.java index d25b301ce3..1e1d757194 100644 --- a/instrumentation/khttp-0.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/khttp/KHttpTracer.java +++ b/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> getSetter() { + protected TextMapSetter> getSetter() { return SETTER; } diff --git a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTracer.java b/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTracer.java index 4c6d0ef998..d0d1a43738 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kubernetesclient/KubernetesClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { // TODO (trask) no propagation implemented yet? return null; } diff --git a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherTracer.java b/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherTracer.java index b95786bba8..f79c4e5f1d 100644 --- a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherTracer.java +++ b/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 GETTER = - new TextMapPropagator.Getter() { + private static final TextMapGetter GETTER = + new TextMapGetter() { @Override public Iterable keys(LibertyRequestWrapper carrier) { @@ -61,7 +61,7 @@ public class LibertyDispatcherTracer }; @Override - protected TextMapPropagator.Getter getGetter() { + protected TextMapGetter getGetter() { return GETTER; } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientTracer.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientTracer.java index 7dddc26b7a..2598f1b8cf 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyHttpClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyResponseInjectAdapter.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyResponseInjectAdapter.java index 2d2ebca6b6..d093107d5a 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/NettyResponseInjectAdapter.java +++ b/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 { +public class NettyResponseInjectAdapter implements TextMapSetter { public static final NettyResponseInjectAdapter SETTER = new NettyResponseInjectAdapter(); diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerTracer.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerTracer.java index c0a521191e..1f33b14448 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerTracer.java +++ b/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 getGetter() { + protected TextMapGetter getGetter() { return NettyRequestExtractAdapter.GETTER; } diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyRequestExtractAdapter.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyRequestExtractAdapter.java index dcb7421c9b..f54bd90b60 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyRequestExtractAdapter.java +++ b/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 { +public class NettyRequestExtractAdapter implements TextMapGetter { public static final NettyRequestExtractAdapter GETTER = new NettyRequestExtractAdapter(); diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyHttpClientTracer.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyHttpClientTracer.java index 356dbd5d64..9bc871d1f5 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyHttpClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyResponseInjectAdapter.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyResponseInjectAdapter.java index 297a99a9c7..48638b89fe 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/NettyResponseInjectAdapter.java +++ b/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 { +public class NettyResponseInjectAdapter implements TextMapSetter { public static final NettyResponseInjectAdapter SETTER = new NettyResponseInjectAdapter(); diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyHttpServerTracer.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyHttpServerTracer.java index 16e929ae05..28f1311a01 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyHttpServerTracer.java +++ b/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 getGetter() { + protected TextMapGetter getGetter() { return NettyRequestExtractAdapter.GETTER; } diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyRequestExtractAdapter.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyRequestExtractAdapter.java index 47230e9d1a..f87ce54ebc 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyRequestExtractAdapter.java +++ b/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 { +public class NettyRequestExtractAdapter implements TextMapGetter { public static final NettyRequestExtractAdapter GETTER = new NettyRequestExtractAdapter(); diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyHttpClientTracer.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyHttpClientTracer.java index 0682a66e4b..f0beb4447f 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyHttpClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyResponseInjectAdapter.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyResponseInjectAdapter.java index 0bc60e021c..dfb130e289 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/NettyResponseInjectAdapter.java +++ b/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 { +public class NettyResponseInjectAdapter implements TextMapSetter { public static final NettyResponseInjectAdapter SETTER = new NettyResponseInjectAdapter(); diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyHttpServerTracer.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyHttpServerTracer.java index 0e42abcb3e..fc5377ef3d 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyHttpServerTracer.java +++ b/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 getGetter() { + protected TextMapGetter getGetter() { return NettyRequestExtractAdapter.GETTER; } diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyRequestExtractAdapter.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyRequestExtractAdapter.java index 7b399375d3..21ce54a93d 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyRequestExtractAdapter.java +++ b/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 { +public class NettyRequestExtractAdapter implements TextMapGetter { public static final NettyRequestExtractAdapter GETTER = new NettyRequestExtractAdapter(); diff --git a/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttpClientTracer.java b/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttpClientTracer.java index 56738b9e21..27dbb86a95 100644 --- a/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/OkHttpClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/RequestBuilderInjectAdapter.java b/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/RequestBuilderInjectAdapter.java index 8038c39687..d51312b36b 100644 --- a/instrumentation/okhttp/okhttp-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v2_2/RequestBuilderInjectAdapter.java +++ b/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 { +public class RequestBuilderInjectAdapter implements TextMapSetter { public static final RequestBuilderInjectAdapter SETTER = new RequestBuilderInjectAdapter(); @Override diff --git a/instrumentation/okhttp/okhttp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/OkHttpClientTracer.java b/instrumentation/okhttp/okhttp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/OkHttpClientTracer.java index 0e322c33c7..0dacecb761 100644 --- a/instrumentation/okhttp/okhttp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/OkHttpClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/instrumentation/okhttp/okhttp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/RequestBuilderInjectAdapter.java b/instrumentation/okhttp/okhttp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/RequestBuilderInjectAdapter.java index a0ff2bbd74..3a15f7735d 100644 --- a/instrumentation/okhttp/okhttp-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/okhttp/v3_0/RequestBuilderInjectAdapter.java +++ b/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 { +public class RequestBuilderInjectAdapter implements TextMapSetter { public static final RequestBuilderInjectAdapter SETTER = new RequestBuilderInjectAdapter(); diff --git a/instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/baggage/BaggageBridging.java b/instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/baggage/BaggageBridging.java index 81c6716e40..076cea38a6 100644 --- a/instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/baggage/BaggageBridging.java +++ b/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( diff --git a/instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/propagation/ApplicationTextMapPropagator.java b/instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/propagation/ApplicationTextMapPropagator.java index 9810aa6c20..92369337c5 100644 --- a/instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/context/propagation/ApplicationTextMapPropagator.java +++ b/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 Context extract( - Context applicationContext, C carrier, TextMapPropagator.Getter applicationGetter) { + Context applicationContext, C carrier, TextMapGetter applicationGetter) { io.opentelemetry.context.Context agentContext = AgentContextStorage.getAgentContext(applicationContext); io.opentelemetry.context.Context agentUpdatedContext = @@ -39,18 +41,18 @@ class ApplicationTextMapPropagator implements TextMapPropagator { @Override public void inject( - Context applicationContext, C carrier, TextMapPropagator.Setter applicationSetter) { + Context applicationContext, C carrier, TextMapSetter applicationSetter) { io.opentelemetry.context.Context agentContext = AgentContextStorage.getAgentContext(applicationContext); agentTextMapPropagator.inject(agentContext, carrier, new AgentSetter<>(applicationSetter)); } private static class AgentGetter - implements io.opentelemetry.context.propagation.TextMapPropagator.Getter { + implements io.opentelemetry.context.propagation.TextMapGetter { - private final TextMapPropagator.Getter applicationGetter; + private final TextMapGetter applicationGetter; - AgentGetter(TextMapPropagator.Getter applicationGetter) { + AgentGetter(TextMapGetter applicationGetter) { this.applicationGetter = applicationGetter; } @@ -66,11 +68,11 @@ class ApplicationTextMapPropagator implements TextMapPropagator { } private static class AgentSetter - implements io.opentelemetry.context.propagation.TextMapPropagator.Setter { + implements io.opentelemetry.context.propagation.TextMapSetter { - private final TextMapPropagator.Setter applicationSetter; + private final TextMapSetter applicationSetter; - AgentSetter(Setter applicationSetter) { + AgentSetter(TextMapSetter applicationSetter) { this.applicationSetter = applicationSetter; } diff --git a/instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/Bridging.java b/instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/Bridging.java index 18bf0f933d..9433298fb9 100644 --- a/instrumentation/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/Bridging.java +++ b/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(); } diff --git a/instrumentation/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/HeadersInjectAdapter.java b/instrumentation/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/HeadersInjectAdapter.java index c97081fcb4..b9953fffc4 100644 --- a/instrumentation/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/HeadersInjectAdapter.java +++ b/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 { +public class HeadersInjectAdapter implements TextMapSetter { public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter(); diff --git a/instrumentation/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientTracer.java b/instrumentation/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientTracer.java index e693dba988..36f36d0c97 100644 --- a/instrumentation/play-ws/play-ws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TextMapExtractAdapter.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TextMapExtractAdapter.java index 98ccba4ffd..75f0f90bc7 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TextMapExtractAdapter.java +++ b/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> { +public class TextMapExtractAdapter implements TextMapGetter> { public static final TextMapExtractAdapter GETTER = new TextMapExtractAdapter(); diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TextMapInjectAdapter.java b/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TextMapInjectAdapter.java index 64fa9c5331..724f9edaab 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TextMapInjectAdapter.java +++ b/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> { +public class TextMapInjectAdapter implements TextMapSetter> { public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter(); diff --git a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/ContextPayload.java b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/ContextPayload.java index d04fc3b322..2485d9315d 100644 --- a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/context/ContextPayload.java +++ b/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 { + public static class ExtractAdapter implements TextMapGetter { @Override public Iterable keys(ContextPayload contextPayload) { return contextPayload.getSpanContext().keySet(); @@ -81,7 +82,7 @@ public class ContextPayload { } } - public static class InjectAdapter implements TextMapPropagator.Setter { + public static class InjectAdapter implements TextMapSetter { @Override public void set(ContextPayload carrier, String key, String value) { carrier.getSpanContext().put(key, value); diff --git a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerTracer.java b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerTracer.java index 320e3f9d7a..4061c084e2 100644 --- a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RmiServerTracer.java +++ b/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; } diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/JaegerSpanExporterAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/JaegerSpanExporterAutoConfigurationTest.java index 399829e60e..b5e438f899 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/JaegerSpanExporterAutoConfigurationTest.java +++ b/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); }); } diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/OtlpGrpcSpanExporterAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/OtlpGrpcSpanExporterAutoConfigurationTest.java index 28e3632b1a..c886302409 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/OtlpGrpcSpanExporterAutoConfigurationTest.java +++ b/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); }); } diff --git a/instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/HttpHeadersInjectAdapter.java b/instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/HttpHeadersInjectAdapter.java index 57b9cbaf0e..557b9a957f 100644 --- a/instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/HttpHeadersInjectAdapter.java +++ b/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 { +class HttpHeadersInjectAdapter implements TextMapSetter { public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter(); diff --git a/instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateTracer.java b/instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateTracer.java index 1cf093463f..ce1ae0072a 100644 --- a/instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/HttpHeadersInjectAdapter.java b/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/HttpHeadersInjectAdapter.java index bcc0b9cf07..413c8a6e37 100644 --- a/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/HttpHeadersInjectAdapter.java +++ b/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 { +class HttpHeadersInjectAdapter implements TextMapSetter { public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter(); diff --git a/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientTracer.java b/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientTracer.java index 3340ed3877..5d3046235b 100644 --- a/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientTracer.java +++ b/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 getSetter() { + protected TextMapSetter getSetter() { return SETTER; } diff --git a/instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcServerTracer.java b/instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcServerTracer.java index 202175162b..b7f4af7aea 100644 --- a/instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcServerTracer.java +++ b/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 getGetter() { + protected TextMapGetter getGetter() { return HttpServletRequestGetter.GETTER; } diff --git a/instrumentation/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat7/TomcatTracer.java b/instrumentation/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat7/TomcatTracer.java index 8539004cf0..e5c98fd290 100644 --- a/instrumentation/tomcat-7.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat7/TomcatTracer.java +++ b/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 - implements TextMapPropagator.Getter { + implements TextMapGetter { 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 getGetter() { + protected TextMapGetter getGetter() { return this; } diff --git a/instrumentation/undertow/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowExchangeGetter.java b/instrumentation/undertow/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowExchangeGetter.java index a050eef7ed..19f27151ca 100644 --- a/instrumentation/undertow/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowExchangeGetter.java +++ b/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 { +public class UndertowExchangeGetter implements TextMapGetter { public static final UndertowExchangeGetter GETTER = new UndertowExchangeGetter(); diff --git a/instrumentation/undertow/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpServerTracer.java b/instrumentation/undertow/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpServerTracer.java index 962e82982e..3a0fb1e42e 100644 --- a/instrumentation/undertow/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpServerTracer.java +++ b/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 getGetter() { + protected TextMapGetter getGetter() { return UndertowExchangeGetter.GETTER; } diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AutoVersionResourceProvider.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AutoVersionResourceProvider.java index 44797d2ac5..83f25e648e 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AutoVersionResourceProvider.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AutoVersionResourceProvider.java @@ -9,18 +9,20 @@ import com.google.auto.service.AutoService; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.instrumentation.api.InstrumentationVersion; -import io.opentelemetry.sdk.resources.ResourceProvider; +import io.opentelemetry.sdk.autoconfigure.ConfigProperties; +import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; +import io.opentelemetry.sdk.resources.Resource; @AutoService(ResourceProvider.class) -public class AutoVersionResourceProvider extends ResourceProvider { +public class AutoVersionResourceProvider implements ResourceProvider { private static final AttributeKey TELEMETRY_AUTO_VERSION = AttributeKey.stringKey("telemetry.auto.version"); @Override - protected Attributes getAttributes() { + public Resource createResource(ConfigProperties config) { return InstrumentationVersion.VERSION == null - ? Attributes.empty() - : Attributes.of(TELEMETRY_AUTO_VERSION, InstrumentationVersion.VERSION); + ? Resource.empty() + : Resource.create(Attributes.of(TELEMETRY_AUTO_VERSION, InstrumentationVersion.VERSION)); } } diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java index 93f8cd741f..6eba351ca4 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java @@ -63,30 +63,5 @@ public class OpenTelemetryInstaller implements ComponentInstaller { System.setProperty(keyStr, (String) value); } }); - - // Reread after our calls to setProperty to determine whether we need to enforce agent defaults. - Properties environmentPropertiesWithCopies = - new ConfigBuilder() - .readEnvironmentVariables() - .readSystemProperties() - .build() - .asJavaProperties(); - - // Agent has different defaults than SDK - if (!environmentPropertiesWithCopies.containsKey("otel.propagators")) { - System.setProperty("otel.propagators", "tracecontext,baggage"); - } - String traceExporter = environmentPropertiesWithCopies.getProperty("otel.traces.exporter"); - if (traceExporter == null) { - System.setProperty("otel.traces.exporter", "otlp"); - } else if (traceExporter.equals("none")) { - System.clearProperty("otel.traces.exporter"); - } - String metricExporter = environmentPropertiesWithCopies.getProperty("otel.metrics.exporter"); - if (metricExporter == null) { - System.setProperty("otel.metrics.exporter", "otlp"); - } else if (metricExporter.equals("none")) { - System.clearProperty("otel.metrics.exporter"); - } } } diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy index e5c27749cb..dbf7a2af87 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy @@ -17,7 +17,7 @@ import spock.lang.Unroll class GrpcSmokeTest extends SmokeTest { protected String getTargetImage(String jdk, String serverVersion) { - "ghcr.io/open-telemetry/java-test-containers:smoke-grpc-jdk$jdk-20210209.550405800" + "ghcr.io/open-telemetry/java-test-containers:smoke-grpc-jdk$jdk-20210218.577304952" } @Unroll diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JaegerExporterSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JaegerExporterSmokeTest.groovy index 27322103fc..05719be563 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JaegerExporterSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JaegerExporterSmokeTest.groovy @@ -15,14 +15,14 @@ import okhttp3.Request class JaegerExporterSmokeTest extends SmokeTest { protected String getTargetImage(String jdk, String serverVersion) { - "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210209.550405798" + "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949" } @Override protected Map getExtraEnv() { return [ "OTEL_TRACES_EXPORTER" : "jaeger", - "OTEL_EXPORTER_JAEGER_ENDPOINT" : "collector:14250" + "OTEL_EXPORTER_JAEGER_ENDPOINT" : "http://collector:14250" ] } diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy index b7dc799a6b..2dfb60f9f1 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy @@ -14,7 +14,7 @@ abstract class PropagationTest extends SmokeTest { @Override protected String getTargetImage(String jdk, String serverVersion) { - "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210209.550405798" + "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949" } def "Should propagate test"() { @@ -75,10 +75,10 @@ class JaegerPropagationTest extends PropagationTest { } } -class OtTracerPropagationTest extends SmokeTest { +class OtTracePropagationTest extends SmokeTest { @Override protected String getTargetImage(String jdk, String serverVersion) { - "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210209.550405798" + "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949" } // OtTracer only propagates lower half of trace ID so we have to mangle the trace IDs similar to @@ -109,7 +109,7 @@ class OtTracerPropagationTest extends SmokeTest { @Override protected Map getExtraEnv() { - return ["otel.propagators": "ottracer"] + return ["otel.propagators": "ottrace"] } } diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy index c69fdda99e..c8ea95dc47 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy @@ -16,7 +16,7 @@ import spock.lang.Unroll class SpringBootSmokeTest extends SmokeTest { protected String getTargetImage(String jdk, String serverVersion) { - "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.576851845" + "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949" } @Unroll diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy index 99fe41f177..9bec99dac8 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy @@ -15,7 +15,7 @@ class SpringBootWithSamplingSmokeTest extends SmokeTest { static final int ALLOWED_DEVIATION = 0.1 * NUM_TRIES protected String getTargetImage(String jdk, String serverVersion) { - "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.576851845" + "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949" } @Override diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/ZipkinExporterSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/ZipkinExporterSmokeTest.groovy index 130b629b85..592dca7ac1 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/ZipkinExporterSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/ZipkinExporterSmokeTest.groovy @@ -11,7 +11,7 @@ import okhttp3.Request class ZipkinExporterSmokeTest extends SmokeTest { protected String getTargetImage(String jdk, String serverVersion) { - "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210209.550405798" + "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210218.577304949" } @Override diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/test/server/http/HttpServletRequestExtractAdapter.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/test/server/http/HttpServletRequestExtractAdapter.java index f13061dc12..8f5e27f009 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/test/server/http/HttpServletRequestExtractAdapter.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/test/server/http/HttpServletRequestExtractAdapter.java @@ -5,7 +5,7 @@ package io.opentelemetry.instrumentation.test.server.http; -import io.opentelemetry.context.propagation.TextMapPropagator; +import io.opentelemetry.context.propagation.TextMapGetter; import java.util.Collections; import javax.servlet.http.HttpServletRequest; @@ -15,8 +15,7 @@ import javax.servlet.http.HttpServletRequest; * @author Pavol Loffay */ // FIXME: This code is duplicated in several places. Extract to a common dependency. -public class HttpServletRequestExtractAdapter - implements TextMapPropagator.Getter { +public class HttpServletRequestExtractAdapter implements TextMapGetter { public static final HttpServletRequestExtractAdapter GETTER = new HttpServletRequestExtractAdapter(); diff --git a/testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentTestingExporterAccess.java b/testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentTestingExporterAccess.java index 7b37be7407..e6d8868974 100644 --- a/testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentTestingExporterAccess.java +++ b/testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentTestingExporterAccess.java @@ -490,7 +490,7 @@ public final class AgentTestingExporterAccess { for (int i = listMembers.length - 1; i >= 0; i--) { String listMember = listMembers[i]; int index = listMember.indexOf(TRACESTATE_KEY_VALUE_DELIMITER); - traceStateBuilder.set(listMember.substring(0, index), listMember.substring(index + 1)); + traceStateBuilder.put(listMember.substring(0, index), listMember.substring(index + 1)); } return traceStateBuilder.build(); } diff --git a/testing-common/testing-common.gradle b/testing-common/testing-common.gradle index 2980d9c55b..f8c4cd86a2 100644 --- a/testing-common/testing-common.gradle +++ b/testing-common/testing-common.gradle @@ -11,6 +11,7 @@ dependencies { api deps.opentelemetryApi api deps.opentelemetrySdk + api deps.opentelemetrySdkMetrics api deps.opentelemetrySdkTesting implementation(deps.opentelemetryProto) {