dapr
/
java-sdk
mirror of https://github.com/dapr/java-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
artur-ciocanu 2024-07-01 23:45:33 +03:00 committed by GitHub
parent 9afbc3cfc9
commit a0ee8d1199
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sdk-tests/pom.xml
View File

@ -20,7 +20,7 @@
<protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory> <protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory>
<grpc.version>1.59.0</grpc.version> <grpc.version>1.59.0</grpc.version>
<protobuf.version>3.17.3</protobuf.version> <protobuf.version>3.17.3</protobuf.version>
<opentelemetry.version>0.14.0</opentelemetry.version> <opentelemetry.version>1.39.0</opentelemetry.version>
<spring-boot.version>3.0.13</spring-boot.version> <spring-boot.version>3.0.13</spring-boot.version>
</properties> </properties>
@ -103,7 +103,12 @@
<dependency> <dependency>
<groupId>io.opentelemetry</groupId> <groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-metrics</artifactId> <artifactId>opentelemetry-sdk-metrics</artifactId>
<version>${opentelemetry.version}-alpha</version> <version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-common</artifactId>
<version>${opentelemetry.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.opentelemetry</groupId> <groupId>io.opentelemetry</groupId>
@ -115,6 +120,17 @@
<artifactId>opentelemetry-exporter-zipkin</artifactId> <artifactId>opentelemetry-exporter-zipkin</artifactId>
<version>${opentelemetry.version}</version> <version>${opentelemetry.version}</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/io.zipkin.reporter2/zipkin-reporter -->
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter</artifactId>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-sender-okhttp3</artifactId>
<version>3.4.0</version>
</dependency>
<dependency> <dependency>
<groupId>io.dapr</groupId> <groupId>io.dapr</groupId>
<artifactId>dapr-sdk</artifactId> <artifactId>dapr-sdk</artifactId>

23
sdk-tests/src/test/java/io/dapr/it/tracing/OpenTelemetry.java
View File

@ -14,11 +14,10 @@ limitations under the License.
package io.dapr.it.tracing; package io.dapr.it.tracing;
import io.dapr.utils.NetworkUtils; import io.dapr.utils.NetworkUtils;
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator; import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
import io.opentelemetry.context.Context; import io.opentelemetry.context.Context;
import io.opentelemetry.context.propagation.ContextPropagators; import io.opentelemetry.context.propagation.ContextPropagators;
import io.opentelemetry.context.propagation.TextMapPropagator; import io.opentelemetry.context.propagation.TextMapSetter;
import io.opentelemetry.exporter.zipkin.ZipkinSpanExporter; import io.opentelemetry.exporter.zipkin.ZipkinSpanExporter;
import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.SdkTracerProvider;
@ -41,11 +40,7 @@ public class OpenTelemetry {
public static io.opentelemetry.api.OpenTelemetry createOpenTelemetry(String serviceName) throws InterruptedException { public static io.opentelemetry.api.OpenTelemetry createOpenTelemetry(String serviceName) throws InterruptedException {
waitForZipkin(); waitForZipkin();
String httpUrl = String.format("http://localhost:%d", ZIPKIN_PORT); String httpUrl = String.format("http://localhost:%d", ZIPKIN_PORT);
ZipkinSpanExporter zipkinExporter = ZipkinSpanExporter zipkinExporter = ZipkinSpanExporter.builder().setEndpoint(httpUrl + ENDPOINT_V2_SPANS).build();
ZipkinSpanExporter.builder()
.setEndpoint(httpUrl + ENDPOINT_V2_SPANS)
.setServiceName(serviceName)
.build();
SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder() SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
.addSpanProcessor(SimpleSpanProcessor.create(zipkinExporter)) .addSpanProcessor(SimpleSpanProcessor.create(zipkinExporter))
@ -54,15 +49,15 @@ public class OpenTelemetry {
return OpenTelemetrySdk.builder() return OpenTelemetrySdk.builder()
.setTracerProvider(sdkTracerProvider) .setTracerProvider(sdkTracerProvider)
.setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance())) .setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance()))
.buildAndRegisterGlobal(); .build();
} }
/** /**
* Converts current OpenTelemetry's context into Reactor's context. * Converts current OpenTelemetry's context into Reactor's context.
* @return Reactor's context. * @return Reactor's context.
*/ */
public static reactor.util.context.Context getReactorContext() { public static reactor.util.context.Context getReactorContext(io.opentelemetry.api.OpenTelemetry openTelemetry) {
return getReactorContext(Context.current()); return getReactorContext(openTelemetry, Context.current());
} }
/** /**
@ -70,12 +65,12 @@ public class OpenTelemetry {
* @param context OpenTelemetry's context. * @param context OpenTelemetry's context.
* @return Reactor's context. * @return Reactor's context.
*/ */
public static reactor.util.context.Context getReactorContext(Context context) { public static reactor.util.context.Context getReactorContext(io.opentelemetry.api.OpenTelemetry openTelemetry,
Context context) {
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
TextMapPropagator.Setter<Map<String, String>> setter = TextMapSetter<Map<String, String>> setter = (carrier, key, value) -> map.put(key, value);
(carrier, key, value) -> map.put(key, value);
GlobalOpenTelemetry.getPropagators().getTextMapPropagator().inject(context, map, setter); openTelemetry.getPropagators().getTextMapPropagator().inject(context, map, setter);
reactor.util.context.Context reactorContext = reactor.util.context.Context.empty(); reactor.util.context.Context reactorContext = reactor.util.context.Context.empty();
for (Map.Entry<String, String> entry : map.entrySet()) { for (Map.Entry<String, String> entry : map.entrySet()) {
reactorContext = reactorContext.put(entry.getKey(), entry.getValue()); reactorContext = reactorContext.put(entry.getKey(), entry.getValue());

15
sdk-tests/src/test/java/io/dapr/it/tracing/grpc/TracingIT.java
View File

@ -9,9 +9,9 @@ import io.dapr.it.DaprRun;
import io.dapr.it.tracing.Validation; import io.dapr.it.tracing.Validation;
import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Scope; import io.opentelemetry.context.Scope;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -42,23 +42,22 @@ public class TracingIT extends BaseIT {
@Test @Test
public void testInvoke() throws Exception { public void testInvoke() throws Exception {
final OpenTelemetry openTelemetry = createOpenTelemetry("service over grpc"); OpenTelemetry openTelemetry = createOpenTelemetry("service over grpc");
final Tracer tracer = openTelemetry.getTracer("grpc integration test tracer"); Tracer tracer = openTelemetry.getTracer("grpc integration test tracer");
String spanName = UUID.randomUUID().toString();
final String spanName = UUID.randomUUID().toString(); Span span = tracer.spanBuilder(spanName).setSpanKind(SpanKind.CLIENT).startSpan();
Span span = tracer.spanBuilder(spanName).setSpanKind(Span.Kind.CLIENT).startSpan();
try (DaprClient client = new DaprClientBuilder().build()) { try (DaprClient client = new DaprClientBuilder().build()) {
client.waitForSidecar(10000).block(); client.waitForSidecar(10000).block();
try (Scope scope = span.makeCurrent()) { try (Scope scope = span.makeCurrent()) {
SleepRequest req = SleepRequest.newBuilder().setSeconds(1).build(); SleepRequest req = SleepRequest.newBuilder().setSeconds(1).build();
client.invokeMethod(daprRun.getAppName(), "sleepOverGRPC", req.toByteArray(), HttpExtension.POST) client.invokeMethod(daprRun.getAppName(), "sleepOverGRPC", req.toByteArray(), HttpExtension.POST)
.contextWrite(getReactorContext()) .contextWrite(getReactorContext(openTelemetry))
.block(); .block();
} }
} }
span.end(); span.end();
OpenTelemetrySdk.getGlobalTracerManagement().shutdown();
Validation.validate(spanName, "calllocal/tracingitgrpc-service/sleepovergrpc"); Validation.validate(spanName, "calllocal/tracingitgrpc-service/sleepovergrpc");
} }

13
sdk-tests/src/test/java/io/dapr/it/tracing/http/OpenTelemetryInterceptor.java
View File

@ -15,6 +15,7 @@ package io.dapr.it.tracing.http;
import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.context.Context; import io.opentelemetry.context.Context;
import io.opentelemetry.context.propagation.TextMapGetter;
import io.opentelemetry.context.propagation.TextMapPropagator; import io.opentelemetry.context.propagation.TextMapPropagator;
import jakarta.servlet.DispatcherType; import jakarta.servlet.DispatcherType;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
@ -32,9 +33,9 @@ public class OpenTelemetryInterceptor implements HandlerInterceptor {
@Autowired @Autowired
private OpenTelemetry openTelemetry; private OpenTelemetry openTelemetry;
// implmentation for springboot 3.0, which uses jakarta.servlet instead of javax.servlet // Implementation for springboot 3.0, which uses jakarta.servlet instead of javax.servlet
private static final TextMapPropagator.Getter<HttpServletRequest> JAKARTA_HTTP_SERVLET_REQUEST_GETTER = private static final TextMapGetter<HttpServletRequest> JAKARTA_HTTP_SERVLET_REQUEST_GETTER =
new TextMapPropagator.Getter<>() { new TextMapGetter<>() {
@Override @Override
public Iterable<String> keys(HttpServletRequest carrier) { public Iterable<String> keys(HttpServletRequest carrier) {
return Collections.list(carrier.getHeaderNames()); return Collections.list(carrier.getHeaderNames());
@ -67,9 +68,9 @@ public class OpenTelemetryInterceptor implements HandlerInterceptor {
} }
// implmentation for springboot 3.0, which uses jakarta.servlet instead of javax.servlet // Implementation for springboot 3.0, which uses jakarta.servlet instead of javax.servlet
private static final TextMapPropagator.Getter<javax.servlet.http.HttpServletRequest> JAVA_HTTP_SERVLET_REQUEST_GETTER = private static final TextMapGetter<javax.servlet.http.HttpServletRequest> JAVA_HTTP_SERVLET_REQUEST_GETTER =
new TextMapPropagator.Getter<>() { new TextMapGetter<>() {
@Override @Override
public Iterable<String> keys(javax.servlet.http.HttpServletRequest carrier) { public Iterable<String> keys(javax.servlet.http.HttpServletRequest carrier) {
return Collections.list(carrier.getHeaderNames()); return Collections.list(carrier.getHeaderNames());

3
sdk-tests/src/test/java/io/dapr/it/tracing/http/OpenTelemetryInterceptorConfig.java
View File

@ -28,4 +28,5 @@ public class OpenTelemetryInterceptorConfig extends WebMvcConfigurationSupport {
public void addInterceptors(InterceptorRegistry registry) { public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(interceptor); registry.addInterceptor(interceptor);
} }
}
}

15
sdk-tests/src/test/java/io/dapr/it/tracing/http/TracingIT.java
View File

@ -8,9 +8,9 @@ import io.dapr.it.DaprRun;
import io.dapr.it.tracing.Validation; import io.dapr.it.tracing.Validation;
import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Scope; import io.opentelemetry.context.Scope;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -41,22 +41,21 @@ public class TracingIT extends BaseIT {
@Test @Test
public void testInvoke() throws Exception { public void testInvoke() throws Exception {
final OpenTelemetry openTelemetry = createOpenTelemetry(OpenTelemetryConfig.SERVICE_NAME); OpenTelemetry openTelemetry = createOpenTelemetry(OpenTelemetryConfig.SERVICE_NAME);
final Tracer tracer = openTelemetry.getTracer(OpenTelemetryConfig.TRACER_NAME); Tracer tracer = openTelemetry.getTracer(OpenTelemetryConfig.TRACER_NAME);
String spanName = UUID.randomUUID().toString();
final String spanName = UUID.randomUUID().toString(); Span span = tracer.spanBuilder(spanName).setSpanKind(SpanKind.CLIENT).startSpan();
Span span = tracer.spanBuilder(spanName).setSpanKind(Span.Kind.CLIENT).startSpan();
try (DaprClient client = new DaprClientBuilder().build()) { try (DaprClient client = new DaprClientBuilder().build()) {
client.waitForSidecar(10000).block(); client.waitForSidecar(10000).block();
try (Scope scope = span.makeCurrent()) { try (Scope scope = span.makeCurrent()) {
client.invokeMethod(daprRun.getAppName(), "sleep", 1, HttpExtension.POST) client.invokeMethod(daprRun.getAppName(), "sleep", 1, HttpExtension.POST)
.contextWrite(getReactorContext()) .contextWrite(getReactorContext(openTelemetry))
.block(); .block();
} }
} }
span.end(); span.end();
OpenTelemetrySdk.getGlobalTracerManagement().shutdown();
Validation.validate(spanName, "calllocal/tracingithttp-service/sleep"); Validation.validate(spanName, "calllocal/tracingithttp-service/sleep");
} }