Skip to content

Commit a0ee8d1

Browse files
artur-ciocanuArtur Ciocanu
artur-ciocanu
and
Artur Ciocanu
authored
Upgrade OTEL to v1.39.0 in integration tests (#1064)
* Upgrading OTEL to 1.39.0 Signed-off-by: Artur Ciocanu <ciocanu@adobe.com> * Revert timeout for GRPC health Signed-off-by: Artur Ciocanu <ciocanu@adobe.com> --------- Signed-off-by: Artur Ciocanu <ciocanu@adobe.com> Co-authored-by: Artur Ciocanu <ciocanu@adobe.com>
1 parent 9afbc3c commit a0ee8d1

File tree

6 files changed

+50
-39
lines changed

6 files changed

+50
-39
lines changed

‎sdk-tests/pom.xml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory>
2121
<grpc.version>1.59.0</grpc.version>
2222
<protobuf.version>3.17.3</protobuf.version>
23-
<opentelemetry.version>0.14.0</opentelemetry.version>
23+
<opentelemetry.version>1.39.0</opentelemetry.version>
2424
<spring-boot.version>3.0.13</spring-boot.version>
2525
</properties>
2626

@@ -103,7 +103,12 @@
103103
<dependency>
104104
<groupId>io.opentelemetry</groupId>
105105
<artifactId>opentelemetry-sdk-metrics</artifactId>
106-
<version>${opentelemetry.version}-alpha</version>
106+
<version>${opentelemetry.version}</version>
107+
</dependency>
108+
<dependency>
109+
<groupId>io.opentelemetry</groupId>
110+
<artifactId>opentelemetry-exporter-common</artifactId>
111+
<version>${opentelemetry.version}</version>
107112
</dependency>
108113
<dependency>
109114
<groupId>io.opentelemetry</groupId>
@@ -115,6 +120,17 @@
115120
<artifactId>opentelemetry-exporter-zipkin</artifactId>
116121
<version>${opentelemetry.version}</version>
117122
</dependency>
123+
<!-- https://mvnrepository.com/artifact/io.zipkin.reporter2/zipkin-reporter -->
124+
<dependency>
125+
<groupId>io.zipkin.reporter2</groupId>
126+
<artifactId>zipkin-reporter</artifactId>
127+
<version>3.4.0</version>
128+
</dependency>
129+
<dependency>
130+
<groupId>io.zipkin.reporter2</groupId>
131+
<artifactId>zipkin-sender-okhttp3</artifactId>
132+
<version>3.4.0</version>
133+
</dependency>
118134
<dependency>
119135
<groupId>io.dapr</groupId>
120136
<artifactId>dapr-sdk</artifactId>

‎sdk-tests/src/test/java/io/dapr/it/tracing/OpenTelemetry.java‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414
package io.dapr.it.tracing;
1515

1616
import io.dapr.utils.NetworkUtils;
17-
import io.opentelemetry.api.GlobalOpenTelemetry;
1817
import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
1918
import io.opentelemetry.context.Context;
2019
import io.opentelemetry.context.propagation.ContextPropagators;
21-
import io.opentelemetry.context.propagation.TextMapPropagator;
20+
import io.opentelemetry.context.propagation.TextMapSetter;
2221
import io.opentelemetry.exporter.zipkin.ZipkinSpanExporter;
2322
import io.opentelemetry.sdk.OpenTelemetrySdk;
2423
import io.opentelemetry.sdk.trace.SdkTracerProvider;
@@ -41,11 +40,7 @@ public class OpenTelemetry {
4140
public static io.opentelemetry.api.OpenTelemetry createOpenTelemetry(String serviceName) throws InterruptedException {
4241
waitForZipkin();
4342
String httpUrl = String.format("http://localhost:%d", ZIPKIN_PORT);
44-
ZipkinSpanExporter zipkinExporter =
45-
ZipkinSpanExporter.builder()
46-
.setEndpoint(httpUrl + ENDPOINT_V2_SPANS)
47-
.setServiceName(serviceName)
48-
.build();
43+
ZipkinSpanExporter zipkinExporter = ZipkinSpanExporter.builder().setEndpoint(httpUrl + ENDPOINT_V2_SPANS).build();
4944

5045
SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
5146
.addSpanProcessor(SimpleSpanProcessor.create(zipkinExporter))
@@ -54,28 +49,28 @@ public static io.opentelemetry.api.OpenTelemetry createOpenTelemetry(String serv
5449
return OpenTelemetrySdk.builder()
5550
.setTracerProvider(sdkTracerProvider)
5651
.setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance()))
57-
.buildAndRegisterGlobal();
52+
.build();
5853
}
5954

6055
/**
6156
* Converts current OpenTelemetry's context into Reactor's context.
6257
* @return Reactor's context.
6358
*/
64-
public static reactor.util.context.Context getReactorContext() {
65-
return getReactorContext(Context.current());
59+
public static reactor.util.context.Context getReactorContext(io.opentelemetry.api.OpenTelemetry openTelemetry) {
60+
return getReactorContext(openTelemetry, Context.current());
6661
}
6762

6863
/**
6964
* Converts given OpenTelemetry's context into Reactor's context.
7065
* @param context OpenTelemetry's context.
7166
* @return Reactor's context.
7267
*/
73-
public static reactor.util.context.Context getReactorContext(Context context) {
68+
public static reactor.util.context.Context getReactorContext(io.opentelemetry.api.OpenTelemetry openTelemetry,
69+
Context context) {
7470
Map<String, String> map = new HashMap<>();
75-
TextMapPropagator.Setter<Map<String, String>> setter =
76-
(carrier, key, value) -> map.put(key, value);
71+
TextMapSetter<Map<String, String>> setter = (carrier, key, value) -> map.put(key, value);
7772

78-
GlobalOpenTelemetry.getPropagators().getTextMapPropagator().inject(context, map, setter);
73+
openTelemetry.getPropagators().getTextMapPropagator().inject(context, map, setter);
7974
reactor.util.context.Context reactorContext = reactor.util.context.Context.empty();
8075
for (Map.Entry<String, String> entry : map.entrySet()) {
8176
reactorContext = reactorContext.put(entry.getKey(), entry.getValue());

‎sdk-tests/src/test/java/io/dapr/it/tracing/grpc/TracingIT.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import io.dapr.it.tracing.Validation;
1010
import io.opentelemetry.api.OpenTelemetry;
1111
import io.opentelemetry.api.trace.Span;
12+
import io.opentelemetry.api.trace.SpanKind;
1213
import io.opentelemetry.api.trace.Tracer;
1314
import io.opentelemetry.context.Scope;
14-
import io.opentelemetry.sdk.OpenTelemetrySdk;
1515
import org.junit.jupiter.api.BeforeEach;
1616
import org.junit.jupiter.api.Test;
1717

@@ -42,23 +42,22 @@ public void setup() throws Exception {
4242

4343
@Test
4444
public void testInvoke() throws Exception {
45-
final OpenTelemetry openTelemetry = createOpenTelemetry("service over grpc");
46-
final Tracer tracer = openTelemetry.getTracer("grpc integration test tracer");
47-
48-
final String spanName = UUID.randomUUID().toString();
49-
Span span = tracer.spanBuilder(spanName).setSpanKind(Span.Kind.CLIENT).startSpan();
45+
OpenTelemetry openTelemetry = createOpenTelemetry("service over grpc");
46+
Tracer tracer = openTelemetry.getTracer("grpc integration test tracer");
47+
String spanName = UUID.randomUUID().toString();
48+
Span span = tracer.spanBuilder(spanName).setSpanKind(SpanKind.CLIENT).startSpan();
5049

5150
try (DaprClient client = new DaprClientBuilder().build()) {
5251
client.waitForSidecar(10000).block();
5352
try (Scope scope = span.makeCurrent()) {
5453
SleepRequest req = SleepRequest.newBuilder().setSeconds(1).build();
5554
client.invokeMethod(daprRun.getAppName(), "sleepOverGRPC", req.toByteArray(), HttpExtension.POST)
56-
.contextWrite(getReactorContext())
55+
.contextWrite(getReactorContext(openTelemetry))
5756
.block();
5857
}
5958
}
59+
6060
span.end();
61-
OpenTelemetrySdk.getGlobalTracerManagement().shutdown();
6261

6362
Validation.validate(spanName, "calllocal/tracingitgrpc-service/sleepovergrpc");
6463
}

‎sdk-tests/src/test/java/io/dapr/it/tracing/http/OpenTelemetryInterceptor.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import io.opentelemetry.api.OpenTelemetry;
1717
import io.opentelemetry.context.Context;
18+
import io.opentelemetry.context.propagation.TextMapGetter;
1819
import io.opentelemetry.context.propagation.TextMapPropagator;
1920
import jakarta.servlet.DispatcherType;
2021
import jakarta.servlet.http.HttpServletRequest;
@@ -32,9 +33,9 @@ public class OpenTelemetryInterceptor implements HandlerInterceptor {
3233
@Autowired
3334
private OpenTelemetry openTelemetry;
3435

35-
// implmentation for springboot 3.0, which uses jakarta.servlet instead of javax.servlet
36-
private static final TextMapPropagator.Getter<HttpServletRequest> JAKARTA_HTTP_SERVLET_REQUEST_GETTER =
37-
new TextMapPropagator.Getter<>() {
36+
// Implementation for springboot 3.0, which uses jakarta.servlet instead of javax.servlet
37+
private static final TextMapGetter<HttpServletRequest> JAKARTA_HTTP_SERVLET_REQUEST_GETTER =
38+
new TextMapGetter<>() {
3839
@Override
3940
public Iterable<String> keys(HttpServletRequest carrier) {
4041
return Collections.list(carrier.getHeaderNames());
@@ -67,9 +68,9 @@ public void postHandle(
6768
}
6869

6970

70-
// implmentation for springboot 3.0, which uses jakarta.servlet instead of javax.servlet
71-
private static final TextMapPropagator.Getter<javax.servlet.http.HttpServletRequest> JAVA_HTTP_SERVLET_REQUEST_GETTER =
72-
new TextMapPropagator.Getter<>() {
71+
// Implementation for springboot 3.0, which uses jakarta.servlet instead of javax.servlet
72+
private static final TextMapGetter<javax.servlet.http.HttpServletRequest> JAVA_HTTP_SERVLET_REQUEST_GETTER =
73+
new TextMapGetter<>() {
7374
@Override
7475
public Iterable<String> keys(javax.servlet.http.HttpServletRequest carrier) {
7576
return Collections.list(carrier.getHeaderNames());

‎sdk-tests/src/test/java/io/dapr/it/tracing/http/OpenTelemetryInterceptorConfig.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ public class OpenTelemetryInterceptorConfig extends WebMvcConfigurationSupport {
2828
public void addInterceptors(InterceptorRegistry registry) {
2929
registry.addInterceptor(interceptor);
3030
}
31-
}
31+
32+
}

‎sdk-tests/src/test/java/io/dapr/it/tracing/http/TracingIT.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import io.dapr.it.tracing.Validation;
99
import io.opentelemetry.api.OpenTelemetry;
1010
import io.opentelemetry.api.trace.Span;
11+
import io.opentelemetry.api.trace.SpanKind;
1112
import io.opentelemetry.api.trace.Tracer;
1213
import io.opentelemetry.context.Scope;
13-
import io.opentelemetry.sdk.OpenTelemetrySdk;
1414
import org.junit.jupiter.api.BeforeEach;
1515
import org.junit.jupiter.api.Test;
1616

@@ -41,22 +41,21 @@ public void setup() throws Exception {
4141

4242
@Test
4343
public void testInvoke() throws Exception {
44-
final OpenTelemetry openTelemetry = createOpenTelemetry(OpenTelemetryConfig.SERVICE_NAME);
45-
final Tracer tracer = openTelemetry.getTracer(OpenTelemetryConfig.TRACER_NAME);
46-
47-
final String spanName = UUID.randomUUID().toString();
48-
Span span = tracer.spanBuilder(spanName).setSpanKind(Span.Kind.CLIENT).startSpan();
44+
OpenTelemetry openTelemetry = createOpenTelemetry(OpenTelemetryConfig.SERVICE_NAME);
45+
Tracer tracer = openTelemetry.getTracer(OpenTelemetryConfig.TRACER_NAME);
46+
String spanName = UUID.randomUUID().toString();
47+
Span span = tracer.spanBuilder(spanName).setSpanKind(SpanKind.CLIENT).startSpan();
4948

5049
try (DaprClient client = new DaprClientBuilder().build()) {
5150
client.waitForSidecar(10000).block();
5251
try (Scope scope = span.makeCurrent()) {
5352
client.invokeMethod(daprRun.getAppName(), "sleep", 1, HttpExtension.POST)
54-
.contextWrite(getReactorContext())
53+
.contextWrite(getReactorContext(openTelemetry))
5554
.block();
5655
}
5756
}
57+
5858
span.end();
59-
OpenTelemetrySdk.getGlobalTracerManagement().shutdown();
6059

6160
Validation.validate(spanName, "calllocal/tracingithttp-service/sleep");
6261
}

0 commit comments

Comments
 (0)