Skip to content

Commit 000df96

Browse files
author
Anuraag Agrawal
authored
Update to SDK 0.17.0 (#2338)
* Update to SDK 0.17.0 * Finish * ottrace
1 parent b86748f commit 000df96

File tree

111 files changed

+241
-262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+241
-262
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class SpringBootSmokeTest extends SmokeTest {
1515

1616
protected String getTargetImage(int jdk) {
1717
return "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk" + jdk
18-
+ "-20210209.550405798";
18+
+ "-20210218.577304949";
1919
}
2020

2121
@Test

‎gradle/dependencies.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ configurations.all {
88

99
ext {
1010
versions = [
11-
opentelemetry : '0.16.0',
12-
opentelemetryAlpha: "0.16.0-alpha",
11+
opentelemetry : '0.17.0',
12+
opentelemetryAlpha: "0.17.0-alpha",
1313

1414
slf4j : "1.7.30",
1515
guava : "30.1-jre",

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import io.opentelemetry.context.Context;
2020
import io.opentelemetry.context.ContextKey;
2121
import io.opentelemetry.context.propagation.ContextPropagators;
22-
import io.opentelemetry.context.propagation.TextMapPropagator;
22+
import io.opentelemetry.context.propagation.TextMapGetter;
2323
import io.opentelemetry.instrumentation.api.InstrumentationVersion;
2424
import io.opentelemetry.instrumentation.api.context.ContextPropagationDebug;
2525
import java.lang.reflect.Method;
@@ -287,17 +287,16 @@ public void addThrowable(Span span, Throwable throwable) {
287287
* @deprecated We should eliminate all static usages so we can use the non-global propagators.
288288
*/
289289
@Deprecated
290-
public static <C> Context extractWithGlobalPropagators(
291-
C carrier, TextMapPropagator.Getter<C> getter) {
290+
public static <C> Context extractWithGlobalPropagators(C carrier, TextMapGetter<C> getter) {
292291
return extract(GlobalOpenTelemetry.getPropagators(), carrier, getter);
293292
}
294293

295-
public <C> Context extract(C carrier, TextMapPropagator.Getter<C> getter) {
294+
public <C> Context extract(C carrier, TextMapGetter<C> getter) {
296295
return extract(propagators, carrier, getter);
297296
}
298297

299298
private static <C> Context extract(
300-
ContextPropagators propagators, C carrier, TextMapPropagator.Getter<C> getter) {
299+
ContextPropagators propagators, C carrier, TextMapGetter<C> getter) {
301300
ContextPropagationDebug.debugContextLeakIfEnabled();
302301

303302
// Using Context.ROOT here may be quite unexpected, but the reason is simple.

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
import io.opentelemetry.api.trace.SpanKind;
1414
import io.opentelemetry.api.trace.Tracer;
1515
import io.opentelemetry.context.Context;
16-
import io.opentelemetry.context.propagation.TextMapPropagator;
17-
import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
16+
import io.opentelemetry.context.propagation.TextMapSetter;
1817
import io.opentelemetry.instrumentation.api.tracer.utils.NetPeerUtils;
1918
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
2019
import java.net.URI;
@@ -70,7 +69,7 @@ protected String flavor(REQUEST request) {
7069
@Nullable
7170
protected abstract String responseHeader(RESPONSE response, String name);
7271

73-
protected abstract TextMapPropagator.Setter<CARRIER> getSetter();
72+
protected abstract TextMapSetter<CARRIER> getSetter();
7473

7574
public boolean shouldStartSpan(Context parentContext) {
7675
return shouldStartSpan(CLIENT, parentContext);
@@ -96,7 +95,7 @@ public Context startSpan(
9695
}
9796

9897
protected void inject(Context context, CARRIER carrier) {
99-
Setter<CARRIER> setter = getSetter();
98+
TextMapSetter<CARRIER> setter = getSetter();
10099
if (setter == null) {
101100
throw new IllegalStateException(
102101
"getSetter() not defined but calling inject(), either getSetter must be implemented or the scope should be setup manually");

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import io.opentelemetry.api.trace.SpanBuilder;
1313
import io.opentelemetry.api.trace.Tracer;
1414
import io.opentelemetry.context.Context;
15-
import io.opentelemetry.context.propagation.TextMapPropagator;
15+
import io.opentelemetry.context.propagation.TextMapGetter;
1616
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
1717
import java.lang.reflect.Method;
1818
import java.util.concurrent.TimeUnit;
@@ -272,7 +272,7 @@ private static void endSpan(Span span, long timestamp) {
272272

273273
protected abstract String flavor(CONNECTION connection, REQUEST request);
274274

275-
protected abstract TextMapPropagator.Getter<REQUEST> getGetter();
275+
protected abstract TextMapGetter<REQUEST> getGetter();
276276

277277
protected abstract String url(REQUEST request);
278278

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import io.opentelemetry.api.OpenTelemetry;
99
import io.opentelemetry.api.trace.Tracer;
10-
import io.opentelemetry.context.propagation.TextMapPropagator;
10+
import io.opentelemetry.context.propagation.TextMapGetter;
1111

1212
public abstract class RpcServerTracer<REQUEST> extends BaseTracer {
1313

@@ -28,5 +28,5 @@ protected RpcServerTracer(OpenTelemetry openTelemetry) {
2828
super(openTelemetry);
2929
}
3030

31-
protected abstract TextMapPropagator.Getter<REQUEST> getGetter();
31+
protected abstract TextMapGetter<REQUEST> getGetter();
3232
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package io.opentelemetry.instrumentation.api.tracer
77

88
import io.opentelemetry.api.trace.Span
99
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
10-
import io.opentelemetry.context.propagation.TextMapPropagator
10+
import io.opentelemetry.context.propagation.TextMapSetter
1111
import io.opentelemetry.instrumentation.api.config.Config
1212
import io.opentelemetry.instrumentation.api.config.ConfigBuilder
1313
import spock.lang.Shared
@@ -190,7 +190,7 @@ class HttpClientTracerTest extends BaseTracerTest {
190190
}
191191

192192
@Override
193-
protected TextMapPropagator.Setter<Map> getSetter() {
193+
protected TextMapSetter<Map> getSetter() {
194194
return null
195195
}
196196

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
package io.opentelemetry.instrumentation.servlet;
77

8-
import io.opentelemetry.context.propagation.TextMapPropagator;
8+
import io.opentelemetry.context.propagation.TextMapGetter;
99
import java.util.Collections;
1010
import javax.servlet.http.HttpServletRequest;
1111

12-
public class HttpServletRequestGetter implements TextMapPropagator.Getter<HttpServletRequest> {
12+
public class HttpServletRequestGetter implements TextMapGetter<HttpServletRequest> {
1313

1414
public static final HttpServletRequestGetter GETTER = new HttpServletRequestGetter();
1515

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import io.opentelemetry.api.trace.Span;
99
import io.opentelemetry.context.Context;
10-
import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
10+
import io.opentelemetry.context.propagation.TextMapGetter;
1111
import io.opentelemetry.instrumentation.api.servlet.AppServerBridge;
1212
import io.opentelemetry.instrumentation.api.servlet.ServletContextPath;
1313
import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
@@ -109,7 +109,7 @@ public void onRequest(Span span, HttpServletRequest request) {
109109
}
110110

111111
@Override
112-
protected Getter<HttpServletRequest> getGetter() {
112+
protected TextMapGetter<HttpServletRequest> getGetter() {
113113
return HttpServletRequestGetter.GETTER;
114114
}
115115

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import com.google.auto.service.AutoService;
1818
import io.opentelemetry.context.Context;
1919
import io.opentelemetry.context.Scope;
20-
import io.opentelemetry.context.propagation.TextMapPropagator;
20+
import io.opentelemetry.context.propagation.TextMapSetter;
2121
import io.opentelemetry.javaagent.tooling.InstrumentationModule;
2222
import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
2323
import java.util.Collections;
@@ -145,7 +145,7 @@ public void setRequest(HttpRequest request) {
145145
}
146146
}
147147

148-
public static class InjectAdapter implements TextMapPropagator.Setter<AkkaHttpHeaders> {
148+
public static class InjectAdapter implements TextMapSetter<AkkaHttpHeaders> {
149149

150150
public static final InjectAdapter SETTER = new InjectAdapter();
151151

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import akka.http.javadsl.model.HttpHeader;
1111
import akka.http.scaladsl.model.HttpRequest;
1212
import akka.http.scaladsl.model.HttpResponse;
13-
import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
13+
import io.opentelemetry.context.propagation.TextMapSetter;
1414
import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
1515
import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpClientInstrumentationModule.AkkaHttpHeaders;
1616
import java.net.URI;
@@ -55,7 +55,7 @@ protected String responseHeader(HttpResponse httpResponse, String name) {
5555
}
5656

5757
@Override
58-
protected Setter<AkkaHttpHeaders> getSetter() {
58+
protected TextMapSetter<AkkaHttpHeaders> getSetter() {
5959
return SETTER;
6060
}
6161

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
import akka.http.javadsl.model.HttpHeader;
99
import akka.http.scaladsl.model.HttpRequest;
10-
import io.opentelemetry.context.propagation.TextMapPropagator;
10+
import io.opentelemetry.context.propagation.TextMapGetter;
1111
import java.util.Optional;
1212
import java.util.stream.Collectors;
1313
import java.util.stream.StreamSupport;
1414

15-
public class AkkaHttpServerHeaders implements TextMapPropagator.Getter<HttpRequest> {
15+
public class AkkaHttpServerHeaders implements TextMapGetter<HttpRequest> {
1616

1717
public static final AkkaHttpServerHeaders GETTER = new AkkaHttpServerHeaders();
1818

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import akka.http.scaladsl.model.HttpRequest;
1010
import akka.http.scaladsl.model.HttpResponse;
1111
import io.opentelemetry.context.Context;
12-
import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
12+
import io.opentelemetry.context.propagation.TextMapGetter;
1313
import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
1414

1515
public class AkkaHttpServerTracer
@@ -59,7 +59,7 @@ protected String flavor(HttpRequest connection, HttpRequest request) {
5959
}
6060

6161
@Override
62-
protected Getter<HttpRequest> getGetter() {
62+
protected TextMapGetter<HttpRequest> getGetter() {
6363
return AkkaHttpServerHeaders.GETTER;
6464
}
6565

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class CamelPropagationUtilTest {
3131
@BeforeAll
3232
public static void setUp() {
3333
GlobalOpenTelemetry.set(
34-
OpenTelemetry.getPropagating(ContextPropagators.create(JaegerPropagator.getInstance())));
34+
OpenTelemetry.propagating(ContextPropagators.create(JaegerPropagator.getInstance())));
3535
}
3636

3737
@Test

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
99
import io.opentelemetry.context.Context;
10-
import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
11-
import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
10+
import io.opentelemetry.context.propagation.TextMapGetter;
11+
import io.opentelemetry.context.propagation.TextMapSetter;
1212
import io.opentelemetry.extension.aws.AwsXrayPropagator;
1313
import java.util.Collections;
1414
import java.util.Map;
@@ -48,7 +48,7 @@ static void injectParent(Context context, final Map<String, Object> exchangeHead
4848
.inject(context, exchangeHeaders, MapSetter.INSTANCE);
4949
}
5050

51-
private static class MapGetter implements Getter<Map<String, Object>> {
51+
private static class MapGetter implements TextMapGetter<Map<String, Object>> {
5252

5353
private static final MapGetter INSTANCE = new MapGetter();
5454

@@ -64,7 +64,7 @@ public String get(Map<String, Object> map, String key) {
6464
}
6565
}
6666

67-
private static class MapSetter implements Setter<Map<String, Object>> {
67+
private static class MapSetter implements TextMapSetter<Map<String, Object>> {
6868

6969
private static final MapSetter INSTANCE = new MapSetter();
7070

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
package io.opentelemetry.instrumentation.apachedubbo.v2_7;
77

8-
import io.opentelemetry.context.propagation.TextMapPropagator;
8+
import io.opentelemetry.context.propagation.TextMapGetter;
99
import org.apache.dubbo.rpc.RpcInvocation;
1010

11-
class DubboExtractAdapter implements TextMapPropagator.Getter<RpcInvocation> {
11+
class DubboExtractAdapter implements TextMapGetter<RpcInvocation> {
1212

1313
static final DubboExtractAdapter GETTER = new DubboExtractAdapter();
1414

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
package io.opentelemetry.instrumentation.apachedubbo.v2_7;
77

8-
import io.opentelemetry.context.propagation.TextMapPropagator;
8+
import io.opentelemetry.context.propagation.TextMapSetter;
99
import org.apache.dubbo.rpc.RpcInvocation;
1010

11-
class DubboInjectAdapter implements TextMapPropagator.Setter<RpcInvocation> {
11+
class DubboInjectAdapter implements TextMapSetter<RpcInvocation> {
1212

1313
static final DubboInjectAdapter SETTER = new DubboInjectAdapter();
1414

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import io.opentelemetry.api.trace.SpanBuilder;
1313
import io.opentelemetry.api.trace.Tracer;
1414
import io.opentelemetry.context.Context;
15-
import io.opentelemetry.context.propagation.TextMapPropagator.Getter;
15+
import io.opentelemetry.context.propagation.TextMapGetter;
1616
import io.opentelemetry.instrumentation.api.tracer.RpcServerTracer;
1717
import io.opentelemetry.instrumentation.api.tracer.utils.NetPeerUtils;
1818
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
@@ -63,7 +63,7 @@ protected String getInstrumentationName() {
6363
}
6464

6565
@Override
66-
protected Getter<RpcInvocation> getGetter() {
66+
protected TextMapGetter<RpcInvocation> getGetter() {
6767
return DubboExtractAdapter.GETTER;
6868
}
6969
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import io.opentelemetry.api.trace.Span;
1212
import io.opentelemetry.context.Context;
13-
import io.opentelemetry.context.propagation.TextMapPropagator.Setter;
13+
import io.opentelemetry.context.propagation.TextMapSetter;
1414
import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
1515
import java.net.URI;
1616
import java.net.URISyntaxException;
@@ -89,7 +89,7 @@ protected String responseHeader(HttpResponse response, String name) {
8989
}
9090

9191
@Override
92-
protected Setter<HttpRequest> getSetter() {
92+
protected TextMapSetter<HttpRequest> getSetter() {
9393
return SETTER;
9494
}
9595

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
package io.opentelemetry.javaagent.instrumentation.apachehttpasyncclient;
77

8-
import io.opentelemetry.context.propagation.TextMapPropagator;
8+
import io.opentelemetry.context.propagation.TextMapSetter;
99
import org.apache.http.HttpRequest;
1010

11-
public class HttpHeadersInjectAdapter implements TextMapPropagator.Setter<HttpRequest> {
11+
public class HttpHeadersInjectAdapter implements TextMapSetter<HttpRequest> {
1212

1313
public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
1414

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v2_0;
77

88
import io.opentelemetry.context.Context;
9-
import io.opentelemetry.context.propagation.TextMapPropagator;
9+
import io.opentelemetry.context.propagation.TextMapSetter;
1010
import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
1111
import java.net.URI;
1212
import java.net.URISyntaxException;
@@ -65,7 +65,7 @@ protected String responseHeader(HttpMethod httpMethod, String name) {
6565
}
6666

6767
@Override
68-
protected TextMapPropagator.Setter<HttpMethod> getSetter() {
68+
protected TextMapSetter<HttpMethod> getSetter() {
6969
return HttpHeadersInjectAdapter.SETTER;
7070
}
7171
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
package io.opentelemetry.javaagent.instrumentation.apachehttpclient.v2_0;
77

8-
import io.opentelemetry.context.propagation.TextMapPropagator;
8+
import io.opentelemetry.context.propagation.TextMapSetter;
99
import org.apache.commons.httpclient.Header;
1010
import org.apache.commons.httpclient.HttpMethod;
1111

12-
public class HttpHeadersInjectAdapter implements TextMapPropagator.Setter<HttpMethod> {
12+
public class HttpHeadersInjectAdapter implements TextMapSetter<HttpMethod> {
1313

1414
public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
1515

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import static io.opentelemetry.javaagent.instrumentation.apachehttpclient.v4_0.HttpHeadersInjectAdapter.SETTER;
99

1010
import io.opentelemetry.context.Context;
11-
import io.opentelemetry.context.propagation.TextMapPropagator;
11+
import io.opentelemetry.context.propagation.TextMapSetter;
1212
import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
1313
import java.net.URI;
1414
import org.apache.http.Header;
@@ -73,7 +73,7 @@ protected String responseHeader(HttpResponse response, String name) {
7373
}
7474

7575
@Override
76-
protected TextMapPropagator.Setter<HttpUriRequest> getSetter() {
76+
protected TextMapSetter<HttpUriRequest> getSetter() {
7777
return SETTER;
7878
}
7979

0 commit comments

Comments
 (0)