diff --git a/examples/pom.xml b/examples/pom.xml index 2dc5c0c4a..21625cdad 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -24,6 +24,7 @@ ${java.version} true false + 0.10.0 @@ -76,17 +77,17 @@ io.opentelemetry opentelemetry-sdk - 0.7.1 + ${opentelemetry.version} io.opentelemetry - opentelemetry-exporters-logging - 0.7.1 + opentelemetry-exporter-logging + ${opentelemetry.version} io.opentelemetry - opentelemetry-exporters-zipkin - 0.7.1 + opentelemetry-exporter-zipkin + ${opentelemetry.version} io.dapr diff --git a/examples/src/main/java/io/dapr/examples/tracing/InvokeClient.java b/examples/src/main/java/io/dapr/examples/tracing/InvokeClient.java index 7d4c252b5..4fbec63cf 100644 --- a/examples/src/main/java/io/dapr/examples/tracing/InvokeClient.java +++ b/examples/src/main/java/io/dapr/examples/tracing/InvokeClient.java @@ -12,11 +12,11 @@ import io.dapr.client.domain.InvokeServiceRequest; import io.dapr.client.domain.InvokeServiceRequestBuilder; import io.dapr.springboot.OpenTelemetryConfig; import io.dapr.utils.TypeRef; -import io.grpc.Context; +import io.opentelemetry.api.trace.Span; +import io.opentelemetry.api.trace.Tracer; +import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.sdk.OpenTelemetrySdk; -import io.opentelemetry.trace.Span; -import io.opentelemetry.trace.Tracer; import java.io.IOException; @@ -46,7 +46,7 @@ public class InvokeClient { Span span = tracer.spanBuilder("Example's Main").setSpanKind(Span.Kind.CLIENT).startSpan(); try (DaprClient client = (new DaprClientBuilder()).build()) { for (String message : args) { - try (Scope scope = tracer.withSpan(span)) { + try (Scope scope = span.makeCurrent()) { InvokeServiceRequestBuilder builder = new InvokeServiceRequestBuilder(SERVICE_APP_ID, "echo"); InvokeServiceRequest request = builder.withBody(message).withHttpExtension(HttpExtension.POST).withContext(Context.current()).build(); @@ -73,7 +73,7 @@ public class InvokeClient { } private static void shutdown() { - OpenTelemetrySdk.getTracerProvider().shutdown(); + OpenTelemetrySdk.getGlobalTracerManagement().shutdown(); } } diff --git a/examples/src/main/java/io/dapr/examples/tracing/README.md b/examples/src/main/java/io/dapr/examples/tracing/README.md index 7907fd58e..ced0a8f1b 100644 --- a/examples/src/main/java/io/dapr/examples/tracing/README.md +++ b/examples/src/main/java/io/dapr/examples/tracing/README.md @@ -175,7 +175,7 @@ private static final String SERVICE_APP_ID = "invokedemo"; } ``` -The class knows the app id for the remote application. It uses `invokeService` method to invoke API calls on the service endpoint. The request object includes an instance of `io.grpc.Context` for the proper tracing headers to be propagated. +The class knows the app id for the remote application. It uses `invokeService` method to invoke API calls on the service endpoint. The request object includes an instance of `io.opentelemetry.context.Context` for the proper tracing headers to be propagated. Execute the follow script in order to run the InvokeClient example, passing two messages for the remote method: ```sh diff --git a/examples/src/main/java/io/dapr/examples/tracing/TracingDemoServiceController.java b/examples/src/main/java/io/dapr/examples/tracing/TracingDemoServiceController.java index 1138cee9c..46aee0666 100644 --- a/examples/src/main/java/io/dapr/examples/tracing/TracingDemoServiceController.java +++ b/examples/src/main/java/io/dapr/examples/tracing/TracingDemoServiceController.java @@ -6,7 +6,7 @@ package io.dapr.examples.tracing; import com.fasterxml.jackson.databind.ObjectMapper; -import io.opentelemetry.trace.Tracer; +import io.opentelemetry.api.trace.Tracer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/examples/src/main/java/io/dapr/springboot/OpenTelemetryConfig.java b/examples/src/main/java/io/dapr/springboot/OpenTelemetryConfig.java index b31b08cc2..0be176192 100644 --- a/examples/src/main/java/io/dapr/springboot/OpenTelemetryConfig.java +++ b/examples/src/main/java/io/dapr/springboot/OpenTelemetryConfig.java @@ -6,12 +6,14 @@ package io.dapr.springboot; import io.dapr.examples.invoke.http.InvokeClient; -import io.opentelemetry.OpenTelemetry; -import io.opentelemetry.exporters.logging.LoggingSpanExporter; -import io.opentelemetry.exporters.zipkin.ZipkinSpanExporter; +import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.api.trace.Tracer; +import io.opentelemetry.api.trace.propagation.HttpTraceContext; +import io.opentelemetry.context.propagation.DefaultContextPropagators; +import io.opentelemetry.exporter.logging.LoggingSpanExporter; +import io.opentelemetry.exporter.zipkin.ZipkinSpanExporter; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; -import io.opentelemetry.trace.Tracer; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; @@ -40,27 +42,31 @@ public class OpenTelemetryConfig { * @return New tracer's instance. */ public static Tracer createTracer(String instrumentationName) { - final Tracer tracer = OpenTelemetry.getTracer(instrumentationName); + OpenTelemetry.setGlobalPropagators( + DefaultContextPropagators.builder() + .addTextMapPropagator(HttpTraceContext.getInstance()) + .build()); + final Tracer tracer = OpenTelemetry.getGlobalTracer(instrumentationName); // Only exports to Zipkin if it is up. Otherwise, ignore it. // This is helpful to avoid exceptions for examples that do not require Zipkin. if (isZipkinUp()) { String httpUrl = String.format("http://localhost:%d", ZIPKIN_PORT); ZipkinSpanExporter zipkinExporter = - ZipkinSpanExporter.newBuilder() + ZipkinSpanExporter.builder() .setEndpoint(httpUrl + ENDPOINT_V2_SPANS) .setServiceName(InvokeClient.class.getName()) .build(); - OpenTelemetrySdk.getTracerProvider() - .addSpanProcessor(SimpleSpanProcessor.newBuilder(zipkinExporter).build()); + OpenTelemetrySdk.getGlobalTracerManagement() + .addSpanProcessor(SimpleSpanProcessor.builder(zipkinExporter).build()); } else { System.out.println("WARNING: Zipkin is not available."); } final LoggingSpanExporter loggingExporter = new LoggingSpanExporter(); - OpenTelemetrySdk.getTracerProvider() - .addSpanProcessor(SimpleSpanProcessor.newBuilder(loggingExporter).build()); + OpenTelemetrySdk.getGlobalTracerManagement() + .addSpanProcessor(SimpleSpanProcessor.builder(loggingExporter).build()); return tracer; } diff --git a/examples/src/main/java/io/dapr/springboot/OpenTelemetryInterceptor.java b/examples/src/main/java/io/dapr/springboot/OpenTelemetryInterceptor.java index 3bbdf5275..7a344240e 100644 --- a/examples/src/main/java/io/dapr/springboot/OpenTelemetryInterceptor.java +++ b/examples/src/main/java/io/dapr/springboot/OpenTelemetryInterceptor.java @@ -5,11 +5,12 @@ package io.dapr.springboot; -import io.grpc.Context; -import io.opentelemetry.OpenTelemetry; -import io.opentelemetry.context.propagation.HttpTextFormat; -import io.opentelemetry.trace.Span; -import io.opentelemetry.trace.Tracer; +import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.api.trace.Span; +import io.opentelemetry.api.trace.Tracer; +import io.opentelemetry.context.Context; +import io.opentelemetry.context.propagation.TextMapPropagator; +import org.jetbrains.annotations.Nullable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; @@ -18,17 +19,30 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.DispatcherType; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Collections; @Component public class OpenTelemetryInterceptor implements HandlerInterceptor { + private static final TextMapPropagator.Getter HTTP_SERVLET_REQUEST_GETTER = + new TextMapPropagator.Getter<>() { + @Override + public Iterable keys(HttpServletRequest carrier) { + return Collections.list(carrier.getHeaderNames()); + } + @Nullable + @Override + public String get(@Nullable HttpServletRequest carrier, String key) { + return carrier.getHeader(key); + } + }; @Autowired Tracer tracer; @Override public boolean preHandle( HttpServletRequest request, HttpServletResponse response, Object handler) { - final HttpTextFormat textFormat = OpenTelemetry.getPropagators().getHttpTextFormat(); + final TextMapPropagator textFormat = OpenTelemetry.getGlobalPropagators().getTextMapPropagator(); // preHandle is called twice for asynchronous request. For more information, read: // https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/servlet/AsyncHandlerInterceptor.html if (request.getDispatcherType() == DispatcherType.ASYNC) { @@ -37,15 +51,7 @@ public class OpenTelemetryInterceptor implements HandlerInterceptor { Span span; try { - Context context = textFormat.extract( - Context.current(), - request, - new HttpTextFormat.Getter() { - @Override - public String get(HttpServletRequest req, String key) { - return req.getHeader(key); - } - }); + Context context = textFormat.extract(Context.current(), request, HTTP_SERVLET_REQUEST_GETTER); request.setAttribute("opentelemetry-context", context); span = tracer.spanBuilder(request.getRequestURI()).setParent(context).startSpan(); span.setAttribute("handler", "pre"); @@ -77,14 +83,8 @@ public class OpenTelemetryInterceptor implements HandlerInterceptor { Context context = (Context) contextObject; Span span = (Span) spanObject; span.setAttribute("handler", "afterCompletion"); - final HttpTextFormat textFormat = OpenTelemetry.getPropagators().getHttpTextFormat(); - textFormat.inject(context, response, - new HttpTextFormat.Setter() { - @Override - public void set(HttpServletResponse response, String key, String value) { - response.addHeader(key, value); - } - }); + final TextMapPropagator textFormat = OpenTelemetry.getGlobalPropagators().getTextMapPropagator(); + textFormat.inject(context, response, HttpServletResponse::addHeader); span.end(); } diff --git a/sdk/pom.xml b/sdk/pom.xml index 920710eb8..13b5ece6c 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -55,7 +55,7 @@ io.opentelemetry opentelemetry-api - 0.7.1 + 0.10.0 io.opencensus diff --git a/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java b/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java index 1d87737f1..f9b4233ca 100644 --- a/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java +++ b/sdk/src/main/java/io/dapr/client/DaprClientGrpc.java @@ -34,7 +34,6 @@ import io.grpc.CallOptions; import io.grpc.Channel; import io.grpc.ClientCall; import io.grpc.ClientInterceptor; -import io.grpc.Context; import io.grpc.ForwardingClientCall; import io.grpc.Metadata; import io.grpc.Metadata.Key; @@ -45,8 +44,9 @@ import io.opencensus.trace.SpanContext; import io.opencensus.trace.propagation.BinaryFormat; import io.opencensus.trace.propagation.SpanContextParseException; import io.opencensus.trace.propagation.TextFormat; -import io.opentelemetry.OpenTelemetry; -import io.opentelemetry.context.propagation.HttpTextFormat; +import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.context.Context; +import io.opentelemetry.context.propagation.TextMapPropagator; import org.jetbrains.annotations.Nullable; import reactor.core.publisher.Mono; @@ -66,6 +66,13 @@ import java.util.stream.Collectors; */ public class DaprClientGrpc extends AbstractDaprClient { + private static final TextMapPropagator.Setter> MAP_SETTER = + (mapper, key, value) -> { + if (mapper != null) { + mapper.put(key, value); + } + }; + /** * Binary formatter to generate grpc-trace-bin. */ @@ -154,6 +161,7 @@ public class DaprClientGrpc extends AbstractDaprClient { /** * {@inheritDoc} */ + @Override public Mono> invokeService(InvokeServiceRequest invokeServiceRequest, TypeRef type) { try { String appId = invokeServiceRequest.getAppId(); @@ -629,18 +637,8 @@ public class DaprClientGrpc extends AbstractDaprClient { */ private static SpanContext extractOpenCensusSpanContext(Context openTelemetryContext) { Map map = new HashMap<>(); - - OpenTelemetry.getPropagators().getHttpTextFormat().inject( - openTelemetryContext, - map, - new HttpTextFormat.Setter>() { - @Override - public void set(Map map, String key, String value) { - if (map != null) { - map.put(key, value); - } - } - }); + OpenTelemetry.getGlobalPropagators().getTextMapPropagator().inject( + openTelemetryContext, map, MAP_SETTER); if (!map.containsKey("traceparent")) { // Trying to extract context without this key will throw an "expected" exception, so we avoid it here. diff --git a/sdk/src/main/java/io/dapr/client/DaprClientHttp.java b/sdk/src/main/java/io/dapr/client/DaprClientHttp.java index ab1699342..3c37e95c8 100644 --- a/sdk/src/main/java/io/dapr/client/DaprClientHttp.java +++ b/sdk/src/main/java/io/dapr/client/DaprClientHttp.java @@ -26,7 +26,7 @@ import io.dapr.config.Properties; import io.dapr.serializer.DaprObjectSerializer; import io.dapr.serializer.DefaultObjectSerializer; import io.dapr.utils.TypeRef; -import io.grpc.Context; +import io.opentelemetry.context.Context; import reactor.core.publisher.Mono; import java.io.IOException; diff --git a/sdk/src/main/java/io/dapr/client/DaprHttp.java b/sdk/src/main/java/io/dapr/client/DaprHttp.java index c24484714..15a492d01 100644 --- a/sdk/src/main/java/io/dapr/client/DaprHttp.java +++ b/sdk/src/main/java/io/dapr/client/DaprHttp.java @@ -9,9 +9,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.dapr.config.Properties; import io.dapr.exceptions.DaprError; import io.dapr.exceptions.DaprException; -import io.grpc.Context; -import io.opentelemetry.OpenTelemetry; -import io.opentelemetry.context.propagation.HttpTextFormat; +import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.api.trace.propagation.HttpTraceContext; +import io.opentelemetry.context.Context; +import io.opentelemetry.context.propagation.TextMapPropagator; import okhttp3.HttpUrl; import okhttp3.MediaType; import okhttp3.OkHttpClient; @@ -51,13 +52,8 @@ public class DaprHttp implements Closeable { /** * Sets the headers for OpenTelemetry SDK. */ - private static final HttpTextFormat.Setter OPENTELEMETRY_SETTER = - new HttpTextFormat.Setter() { - @Override - public void set(Request.Builder requestBuilder, String key, String value) { - requestBuilder.addHeader(key, value); - } - }; + private static final HttpTraceContext.Setter OPENTELEMETRY_SETTER = + (requestBuilder, key, value) -> requestBuilder.addHeader(key, value); /** * HTTP Methods supported. @@ -270,7 +266,7 @@ public class DaprHttp implements Closeable { .url(urlBuilder.build()) .addHeader(HEADER_DAPR_REQUEST_ID, requestId); if (context != null) { - OpenTelemetry.getPropagators().getHttpTextFormat().inject(context, requestBuilder, OPENTELEMETRY_SETTER); + OpenTelemetry.getGlobalPropagators().getTextMapPropagator().inject(context, requestBuilder, OPENTELEMETRY_SETTER); } if (HttpMethods.GET.name().equals(method)) { requestBuilder.get(); diff --git a/sdk/src/main/java/io/dapr/client/domain/DeleteStateRequest.java b/sdk/src/main/java/io/dapr/client/domain/DeleteStateRequest.java index 002694943..61d0a3337 100644 --- a/sdk/src/main/java/io/dapr/client/domain/DeleteStateRequest.java +++ b/sdk/src/main/java/io/dapr/client/domain/DeleteStateRequest.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.Collections; import java.util.Map; diff --git a/sdk/src/main/java/io/dapr/client/domain/DeleteStateRequestBuilder.java b/sdk/src/main/java/io/dapr/client/domain/DeleteStateRequestBuilder.java index 606befdd2..819e4b4b0 100644 --- a/sdk/src/main/java/io/dapr/client/domain/DeleteStateRequestBuilder.java +++ b/sdk/src/main/java/io/dapr/client/domain/DeleteStateRequestBuilder.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.Collections; import java.util.Map; diff --git a/sdk/src/main/java/io/dapr/client/domain/ExecuteStateTransactionRequest.java b/sdk/src/main/java/io/dapr/client/domain/ExecuteStateTransactionRequest.java index 53d04ee32..82020212f 100644 --- a/sdk/src/main/java/io/dapr/client/domain/ExecuteStateTransactionRequest.java +++ b/sdk/src/main/java/io/dapr/client/domain/ExecuteStateTransactionRequest.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.List; import java.util.Map; diff --git a/sdk/src/main/java/io/dapr/client/domain/ExecuteStateTransactionRequestBuilder.java b/sdk/src/main/java/io/dapr/client/domain/ExecuteStateTransactionRequestBuilder.java index 13c605b4c..795d7daed 100644 --- a/sdk/src/main/java/io/dapr/client/domain/ExecuteStateTransactionRequestBuilder.java +++ b/sdk/src/main/java/io/dapr/client/domain/ExecuteStateTransactionRequestBuilder.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.Arrays; import java.util.Collections; diff --git a/sdk/src/main/java/io/dapr/client/domain/GetSecretRequest.java b/sdk/src/main/java/io/dapr/client/domain/GetSecretRequest.java index 2fbfa978b..c1c0d5a78 100644 --- a/sdk/src/main/java/io/dapr/client/domain/GetSecretRequest.java +++ b/sdk/src/main/java/io/dapr/client/domain/GetSecretRequest.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.Map; diff --git a/sdk/src/main/java/io/dapr/client/domain/GetSecretRequestBuilder.java b/sdk/src/main/java/io/dapr/client/domain/GetSecretRequestBuilder.java index 383fe17b5..47cbbbc04 100644 --- a/sdk/src/main/java/io/dapr/client/domain/GetSecretRequestBuilder.java +++ b/sdk/src/main/java/io/dapr/client/domain/GetSecretRequestBuilder.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.Collections; import java.util.Map; diff --git a/sdk/src/main/java/io/dapr/client/domain/GetStateRequest.java b/sdk/src/main/java/io/dapr/client/domain/GetStateRequest.java index e6457a3b5..6cf0cccf9 100644 --- a/sdk/src/main/java/io/dapr/client/domain/GetStateRequest.java +++ b/sdk/src/main/java/io/dapr/client/domain/GetStateRequest.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.Collections; import java.util.Map; diff --git a/sdk/src/main/java/io/dapr/client/domain/GetStateRequestBuilder.java b/sdk/src/main/java/io/dapr/client/domain/GetStateRequestBuilder.java index 5a3eb34b2..f6248857a 100644 --- a/sdk/src/main/java/io/dapr/client/domain/GetStateRequestBuilder.java +++ b/sdk/src/main/java/io/dapr/client/domain/GetStateRequestBuilder.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.Collections; import java.util.Map; diff --git a/sdk/src/main/java/io/dapr/client/domain/GetStatesRequest.java b/sdk/src/main/java/io/dapr/client/domain/GetStatesRequest.java index ca90eed2a..e7a2eec2c 100644 --- a/sdk/src/main/java/io/dapr/client/domain/GetStatesRequest.java +++ b/sdk/src/main/java/io/dapr/client/domain/GetStatesRequest.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.List; diff --git a/sdk/src/main/java/io/dapr/client/domain/GetStatesRequestBuilder.java b/sdk/src/main/java/io/dapr/client/domain/GetStatesRequestBuilder.java index 9152416f1..19479523f 100644 --- a/sdk/src/main/java/io/dapr/client/domain/GetStatesRequestBuilder.java +++ b/sdk/src/main/java/io/dapr/client/domain/GetStatesRequestBuilder.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.Arrays; import java.util.Collections; diff --git a/sdk/src/main/java/io/dapr/client/domain/InvokeBindingRequest.java b/sdk/src/main/java/io/dapr/client/domain/InvokeBindingRequest.java index 6f15f35c8..c7cbf5099 100644 --- a/sdk/src/main/java/io/dapr/client/domain/InvokeBindingRequest.java +++ b/sdk/src/main/java/io/dapr/client/domain/InvokeBindingRequest.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.Map; diff --git a/sdk/src/main/java/io/dapr/client/domain/InvokeBindingRequestBuilder.java b/sdk/src/main/java/io/dapr/client/domain/InvokeBindingRequestBuilder.java index 42f7d52e7..167575274 100644 --- a/sdk/src/main/java/io/dapr/client/domain/InvokeBindingRequestBuilder.java +++ b/sdk/src/main/java/io/dapr/client/domain/InvokeBindingRequestBuilder.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.Collections; import java.util.HashMap; diff --git a/sdk/src/main/java/io/dapr/client/domain/InvokeServiceRequest.java b/sdk/src/main/java/io/dapr/client/domain/InvokeServiceRequest.java index 29e756b97..5b94421be 100644 --- a/sdk/src/main/java/io/dapr/client/domain/InvokeServiceRequest.java +++ b/sdk/src/main/java/io/dapr/client/domain/InvokeServiceRequest.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.Map; diff --git a/sdk/src/main/java/io/dapr/client/domain/InvokeServiceRequestBuilder.java b/sdk/src/main/java/io/dapr/client/domain/InvokeServiceRequestBuilder.java index fbd584bd9..030301d6f 100644 --- a/sdk/src/main/java/io/dapr/client/domain/InvokeServiceRequestBuilder.java +++ b/sdk/src/main/java/io/dapr/client/domain/InvokeServiceRequestBuilder.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.Collections; import java.util.HashMap; diff --git a/sdk/src/main/java/io/dapr/client/domain/PublishEventRequest.java b/sdk/src/main/java/io/dapr/client/domain/PublishEventRequest.java index 06d3a4464..b68fb9f26 100644 --- a/sdk/src/main/java/io/dapr/client/domain/PublishEventRequest.java +++ b/sdk/src/main/java/io/dapr/client/domain/PublishEventRequest.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.Map; diff --git a/sdk/src/main/java/io/dapr/client/domain/PublishEventRequestBuilder.java b/sdk/src/main/java/io/dapr/client/domain/PublishEventRequestBuilder.java index 08220d840..cbfd69a3d 100644 --- a/sdk/src/main/java/io/dapr/client/domain/PublishEventRequestBuilder.java +++ b/sdk/src/main/java/io/dapr/client/domain/PublishEventRequestBuilder.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.Collections; import java.util.HashMap; diff --git a/sdk/src/main/java/io/dapr/client/domain/Response.java b/sdk/src/main/java/io/dapr/client/domain/Response.java index 435af0e0f..b3e14f3c4 100644 --- a/sdk/src/main/java/io/dapr/client/domain/Response.java +++ b/sdk/src/main/java/io/dapr/client/domain/Response.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; /** * A Dapr Response. diff --git a/sdk/src/main/java/io/dapr/client/domain/SaveStateRequest.java b/sdk/src/main/java/io/dapr/client/domain/SaveStateRequest.java index 867bae697..e4c8260f3 100644 --- a/sdk/src/main/java/io/dapr/client/domain/SaveStateRequest.java +++ b/sdk/src/main/java/io/dapr/client/domain/SaveStateRequest.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.List; diff --git a/sdk/src/main/java/io/dapr/client/domain/SaveStateRequestBuilder.java b/sdk/src/main/java/io/dapr/client/domain/SaveStateRequestBuilder.java index 39e1bd25a..f19ea8022 100644 --- a/sdk/src/main/java/io/dapr/client/domain/SaveStateRequestBuilder.java +++ b/sdk/src/main/java/io/dapr/client/domain/SaveStateRequestBuilder.java @@ -5,7 +5,7 @@ package io.dapr.client.domain; -import io.grpc.Context; +import io.opentelemetry.context.Context; import java.util.ArrayList; import java.util.Arrays; diff --git a/sdk/src/test/java/io/dapr/client/DaprHttpStub.java b/sdk/src/test/java/io/dapr/client/DaprHttpStub.java index 63d2f5276..5fdd7f060 100644 --- a/sdk/src/test/java/io/dapr/client/DaprHttpStub.java +++ b/sdk/src/test/java/io/dapr/client/DaprHttpStub.java @@ -5,7 +5,7 @@ package io.dapr.client; -import io.grpc.Context; +import io.opentelemetry.context.Context; import reactor.core.publisher.Mono; import java.io.IOException; diff --git a/sdk/src/test/java/io/dapr/client/DaprHttpTest.java b/sdk/src/test/java/io/dapr/client/DaprHttpTest.java index 74c376ee9..05c080da0 100644 --- a/sdk/src/test/java/io/dapr/client/DaprHttpTest.java +++ b/sdk/src/test/java/io/dapr/client/DaprHttpTest.java @@ -6,7 +6,7 @@ package io.dapr.client; import io.dapr.config.Properties; import io.dapr.exceptions.DaprException; -import io.grpc.Context; +import io.opentelemetry.context.Context; import okhttp3.MediaType; import okhttp3.OkHttpClient; import okhttp3.ResponseBody;