From 56e154937810e9cbffd6a6151d7072d89d190124 Mon Sep 17 00:00:00 2001 From: Munir Abdinur <62392438+mabdinur@users.noreply.github.com> Date: Wed, 12 Aug 2020 00:27:17 +0000 Subject: [PATCH] Add spring webflux documentation (#916) * add readme and rename springwebflux package * add readme and rename springwebflux package * fix bean type * fix readme * format * fix gradle * fix gradle * fix gradle * updated package name * clean up readme * Update README.md * Update instrumentation-core/spring/spring-webflux-5.0/README.md Co-authored-by: Trask Stalnaker * Update instrumentation-core/spring/spring-webflux-5.0/README.md Co-authored-by: Trask Stalnaker * format, clean up comments * clean ups * Update README.md * fix conflict * fix helper class names Co-authored-by: Trask Stalnaker --- .../webclient/WebClientBeanPostProcessor.java | 2 +- .../WebClientBeanPostProcessorTest.java | 2 +- .../spring/spring-webflux-5.0/README.md | 96 +++++++++++++++++++ .../spring-webflux-5.0.gradle | 2 +- .../client/HttpHeadersInjectAdapter.java | 2 +- .../SpringWebfluxHttpClientDecorator.java | 4 +- .../client/WebClientTracingFilter.java | 6 +- .../client/WebClientFilterAdvice.java | 4 +- .../WebClientFilterInstrumentation.java | 8 +- .../AbstractWebfluxInstrumentation.java | 2 +- .../webflux}/server/AdviceUtils.java | 4 +- .../server/DispatcherHandlerAdvice.java | 6 +- .../DispatcherHandlerInstrumentation.java | 2 +- .../webflux}/server/HandlerAdapterAdvice.java | 4 +- .../server/HandlerAdapterInstrumentation.java | 2 +- .../server/RouteOnSuccessOrError.java | 2 +- .../webflux}/server/RouterFunctionAdvice.java | 2 +- .../server/RouterFunctionInstrumentation.java | 2 +- .../SpringWebfluxHttpServerDecorator.java | 2 +- 19 files changed, 125 insertions(+), 29 deletions(-) create mode 100644 instrumentation-core/spring/spring-webflux-5.0/README.md rename instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/{springwebflux => spring/webflux}/client/HttpHeadersInjectAdapter.java (94%) rename instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/{springwebflux => spring/webflux}/client/SpringWebfluxHttpClientDecorator.java (93%) rename instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/{springwebflux => spring/webflux}/client/WebClientTracingFilter.java (90%) rename instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/{springwebflux => spring/webflux}/client/WebClientFilterAdvice.java (85%) rename instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/{springwebflux => spring/webflux}/client/WebClientFilterInstrumentation.java (86%) rename instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/{springwebflux => spring/webflux}/server/AbstractWebfluxInstrumentation.java (94%) rename instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/{springwebflux => spring/webflux}/server/AdviceUtils.java (96%) rename instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/{springwebflux => spring/webflux}/server/DispatcherHandlerAdvice.java (89%) rename instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/{springwebflux => spring/webflux}/server/DispatcherHandlerInstrumentation.java (96%) rename instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/{springwebflux => spring/webflux}/server/HandlerAdapterAdvice.java (94%) rename instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/{springwebflux => spring/webflux}/server/HandlerAdapterInstrumentation.java (97%) rename instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/{springwebflux => spring/webflux}/server/RouteOnSuccessOrError.java (97%) rename instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/{springwebflux => spring/webflux}/server/RouterFunctionAdvice.java (95%) rename instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/{springwebflux => spring/webflux}/server/RouterFunctionInstrumentation.java (97%) rename instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/{springwebflux => spring/webflux}/server/SpringWebfluxHttpServerDecorator.java (93%) diff --git a/instrumentation-core/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/httpclients/webclient/WebClientBeanPostProcessor.java b/instrumentation-core/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/httpclients/webclient/WebClientBeanPostProcessor.java index 7c600bb232..b218abe63a 100644 --- a/instrumentation-core/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/httpclients/webclient/WebClientBeanPostProcessor.java +++ b/instrumentation-core/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/httpclients/webclient/WebClientBeanPostProcessor.java @@ -16,7 +16,7 @@ package io.opentelemetry.instrumentation.spring.autoconfigure.httpclients.webclient; -import io.opentelemetry.instrumentation.springwebflux.client.WebClientTracingFilter; +import io.opentelemetry.instrumentation.spring.webflux.client.WebClientTracingFilter; import io.opentelemetry.trace.Tracer; import java.util.List; import java.util.function.Consumer; diff --git a/instrumentation-core/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/httpclients/webclient/WebClientBeanPostProcessorTest.java b/instrumentation-core/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/httpclients/webclient/WebClientBeanPostProcessorTest.java index e1d1e9f409..484645987e 100644 --- a/instrumentation-core/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/httpclients/webclient/WebClientBeanPostProcessorTest.java +++ b/instrumentation-core/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/httpclients/webclient/WebClientBeanPostProcessorTest.java @@ -18,7 +18,7 @@ package io.opentelemetry.instrumentation.spring.autoconfigure.httpclients.webcli import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.instrumentation.springwebflux.client.WebClientTracingFilter; +import io.opentelemetry.instrumentation.spring.webflux.client.WebClientTracingFilter; import io.opentelemetry.trace.Tracer; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/instrumentation-core/spring/spring-webflux-5.0/README.md b/instrumentation-core/spring/spring-webflux-5.0/README.md new file mode 100644 index 0000000000..6ba8e3eeb7 --- /dev/null +++ b/instrumentation-core/spring/spring-webflux-5.0/README.md @@ -0,0 +1,96 @@ +# Manual Instrumentation for Spring Webflux + +Provides OpenTelemetry instrumentation for Spring's WebClient. + +## Quickstart + +### Add these dependencies to your project. + +Replace `SPRING_VERSION` with the version of spring you're using. +`Minimum version: 5.0` + +Replace `OPENTELEMETRY_VERSION` with the latest stable [release](https://mvnrepository.com/artifact/io.opentelemetry). +`Minimum version: 0.8.0` + + +For Maven add to your `pom.xml`: + +```xml + + + + io.opentelemetry.instrumentation + opentelemetry-spring-webflux-5.0 + OPENTELEMETRY_VERSION + + + + + + io.opentelemetry + opentelemetry-exporters-logging + OPENTELEMETRY_VERSION + + + + + + org.springframework + spring-webflux + SPRING_VERSION + + + +``` + +For Gradle add to your dependencies: + +```groovy +// opentelemetry instrumentation +implementation 'io.opentelemetry.instrumentation:opentelemetry-spring-webflux-5.0:OPENTELEMETRY_VERSION' + +// opentelemetry exporter +// replace this default exporter with your opentelemetry exporter (ex. otlp/zipkin/jaeger/..) +implementation 'io.opentelemetry:opentelemetry-exporters-logging:OPENTELEMETRY_VERSION' + +// required to instrument spring-webmvc +// this artifact should already be present in your application +implementation 'org.springframework:spring-webflux:SPRING_VERSION' +``` + +### Features + +#### WebClientTracingFilter + +WebClientTracingFilter adds OpenTelemetry client spans to requests sent using WebClient by implementing the [ExchangeFilterFunction](https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/reactive/function/client/ExchangeFilterFunction.html) +interface. An example is shown below: + +##### Usage + +```java + +import io.opentelemetry.instrumentation.spring.webflux.client.WebClientTracingFilter +import io.opentelemetry.trace.Tracer; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.reactive.function.client.WebClient; + +@Configuration +public class WebClientConfig { + + @Bean + public WebClient.Builder webClient(Tracer tracer) { + + WebClient webClient = WebClient.create(); + WebClientTracingFilter webClientTracingFilter = new WebClientTracingFilter(tracer); + + return webClient.mutate().filter(webClientTracingFilter); + } +} +``` + +### Starter Guide + +Check out the opentelemetry [quick start](https://github.com/open-telemetry/opentelemetry-java/blob/master/QUICKSTART.md) to learn more about OpenTelemetry instrumentation. diff --git a/instrumentation-core/spring/spring-webflux-5.0/spring-webflux-5.0.gradle b/instrumentation-core/spring/spring-webflux-5.0/spring-webflux-5.0.gradle index 74901edb98..1758a17b0a 100644 --- a/instrumentation-core/spring/spring-webflux-5.0/spring-webflux-5.0.gradle +++ b/instrumentation-core/spring/spring-webflux-5.0/spring-webflux-5.0.gradle @@ -1,6 +1,6 @@ ext { minJavaVersionForTests = JavaVersion.VERSION_1_8 - javaSubPackage = 'springwebflux.client' + javaSubPackage = 'spring.webflux.client' } apply from: "$rootDir/gradle/instrumentation-library.gradle" diff --git a/instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/springwebflux/client/HttpHeadersInjectAdapter.java b/instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/HttpHeadersInjectAdapter.java similarity index 94% rename from instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/springwebflux/client/HttpHeadersInjectAdapter.java rename to instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/HttpHeadersInjectAdapter.java index d81aeaf637..dd5d92d71a 100644 --- a/instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/springwebflux/client/HttpHeadersInjectAdapter.java +++ b/instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/HttpHeadersInjectAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opentelemetry.instrumentation.springwebflux.client; +package io.opentelemetry.instrumentation.spring.webflux.client; import io.opentelemetry.context.propagation.HttpTextFormat; import org.springframework.http.HttpHeaders; diff --git a/instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java b/instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientDecorator.java similarity index 93% rename from instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java rename to instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientDecorator.java index 3148ccc7bf..6ec3f9b742 100644 --- a/instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java +++ b/instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientDecorator.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.opentelemetry.instrumentation.springwebflux.client; +package io.opentelemetry.instrumentation.spring.webflux.client; import static io.opentelemetry.OpenTelemetry.getPropagators; import static io.opentelemetry.OpenTelemetry.getTracerProvider; -import static io.opentelemetry.instrumentation.springwebflux.client.HttpHeadersInjectAdapter.SETTER; +import static io.opentelemetry.instrumentation.spring.webflux.client.HttpHeadersInjectAdapter.SETTER; import io.grpc.Context; import io.opentelemetry.instrumentation.api.decorator.HttpClientDecorator; diff --git a/instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/springwebflux/client/WebClientTracingFilter.java b/instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/WebClientTracingFilter.java similarity index 90% rename from instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/springwebflux/client/WebClientTracingFilter.java rename to instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/WebClientTracingFilter.java index 2b40e91016..7bb70e7b6f 100644 --- a/instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/springwebflux/client/WebClientTracingFilter.java +++ b/instrumentation-core/spring/spring-webflux-5.0/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/WebClientTracingFilter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.opentelemetry.instrumentation.springwebflux.client; +package io.opentelemetry.instrumentation.spring.webflux.client; -import static io.opentelemetry.instrumentation.springwebflux.client.SpringWebfluxHttpClientDecorator.DECORATE; -import static io.opentelemetry.instrumentation.springwebflux.client.SpringWebfluxHttpClientDecorator.TRACER; +import static io.opentelemetry.instrumentation.spring.webflux.client.SpringWebfluxHttpClientDecorator.DECORATE; +import static io.opentelemetry.instrumentation.spring.webflux.client.SpringWebfluxHttpClientDecorator.TRACER; import io.grpc.Context; import io.opentelemetry.context.Scope; diff --git a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientFilterAdvice.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/client/WebClientFilterAdvice.java similarity index 85% rename from instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientFilterAdvice.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/client/WebClientFilterAdvice.java index 1e4bf4356b..e308c21d14 100644 --- a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientFilterAdvice.java +++ b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/client/WebClientFilterAdvice.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.opentelemetry.auto.instrumentation.springwebflux.client; +package io.opentelemetry.auto.instrumentation.spring.webflux.client; -import io.opentelemetry.instrumentation.springwebflux.client.WebClientTracingFilter; +import io.opentelemetry.instrumentation.spring.webflux.client.WebClientTracingFilter; import net.bytebuddy.asm.Advice; import org.springframework.web.reactive.function.client.WebClient; diff --git a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientFilterInstrumentation.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/client/WebClientFilterInstrumentation.java similarity index 86% rename from instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientFilterInstrumentation.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/client/WebClientFilterInstrumentation.java index 451ed1356a..bf96ec7b24 100644 --- a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientFilterInstrumentation.java +++ b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/client/WebClientFilterInstrumentation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opentelemetry.auto.instrumentation.springwebflux.client; +package io.opentelemetry.auto.instrumentation.spring.webflux.client; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; @@ -46,9 +46,9 @@ public class WebClientFilterInstrumentation extends Instrumenter.Default { @Override public String[] helperClassNames() { return new String[] { - "io.opentelemetry.instrumentation.springwebflux.client.SpringWebfluxHttpClientDecorator", - "io.opentelemetry.instrumentation.springwebflux.client.HttpHeadersInjectAdapter", - "io.opentelemetry.instrumentation.springwebflux.client.WebClientTracingFilter" + "io.opentelemetry.instrumentation.spring.webflux.client.SpringWebfluxHttpClientDecorator", + "io.opentelemetry.instrumentation.spring.webflux.client.HttpHeadersInjectAdapter", + "io.opentelemetry.instrumentation.spring.webflux.client.WebClientTracingFilter" }; } diff --git a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/AbstractWebfluxInstrumentation.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/AbstractWebfluxInstrumentation.java similarity index 94% rename from instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/AbstractWebfluxInstrumentation.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/AbstractWebfluxInstrumentation.java index fa572c0051..0b562ad708 100644 --- a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/AbstractWebfluxInstrumentation.java +++ b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/AbstractWebfluxInstrumentation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opentelemetry.auto.instrumentation.springwebflux.server; +package io.opentelemetry.auto.instrumentation.spring.webflux.server; import io.opentelemetry.auto.tooling.Instrumenter; diff --git a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/AdviceUtils.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/AdviceUtils.java similarity index 96% rename from instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/AdviceUtils.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/AdviceUtils.java index dabfea61ad..7102cc2366 100644 --- a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/AdviceUtils.java +++ b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/AdviceUtils.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.opentelemetry.auto.instrumentation.springwebflux.server; +package io.opentelemetry.auto.instrumentation.spring.webflux.server; -import static io.opentelemetry.auto.instrumentation.springwebflux.server.SpringWebfluxHttpServerDecorator.DECORATE; +import static io.opentelemetry.auto.instrumentation.spring.webflux.server.SpringWebfluxHttpServerDecorator.DECORATE; import static io.opentelemetry.context.ContextUtils.withScopedContext; import io.opentelemetry.context.Scope; diff --git a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/DispatcherHandlerAdvice.java similarity index 89% rename from instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/DispatcherHandlerAdvice.java index 4b634ab81a..5783bea064 100644 --- a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java +++ b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/DispatcherHandlerAdvice.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.opentelemetry.auto.instrumentation.springwebflux.server; +package io.opentelemetry.auto.instrumentation.spring.webflux.server; -import static io.opentelemetry.auto.instrumentation.springwebflux.server.SpringWebfluxHttpServerDecorator.DECORATE; -import static io.opentelemetry.auto.instrumentation.springwebflux.server.SpringWebfluxHttpServerDecorator.TRACER; +import static io.opentelemetry.auto.instrumentation.spring.webflux.server.SpringWebfluxHttpServerDecorator.DECORATE; +import static io.opentelemetry.auto.instrumentation.spring.webflux.server.SpringWebfluxHttpServerDecorator.TRACER; import static io.opentelemetry.context.ContextUtils.withScopedContext; import static io.opentelemetry.trace.TracingContextUtils.withSpan; diff --git a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/DispatcherHandlerInstrumentation.java similarity index 96% rename from instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/DispatcherHandlerInstrumentation.java index ded575ef22..4e47380219 100644 --- a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerInstrumentation.java +++ b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/DispatcherHandlerInstrumentation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opentelemetry.auto.instrumentation.springwebflux.server; +package io.opentelemetry.auto.instrumentation.spring.webflux.server; import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isMethod; diff --git a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterAdvice.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/HandlerAdapterAdvice.java similarity index 94% rename from instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterAdvice.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/HandlerAdapterAdvice.java index f0dc35edd0..9e2ba41b55 100644 --- a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterAdvice.java +++ b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/HandlerAdapterAdvice.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.opentelemetry.auto.instrumentation.springwebflux.server; +package io.opentelemetry.auto.instrumentation.spring.webflux.server; -import static io.opentelemetry.auto.instrumentation.springwebflux.server.SpringWebfluxHttpServerDecorator.DECORATE; +import static io.opentelemetry.auto.instrumentation.spring.webflux.server.SpringWebfluxHttpServerDecorator.DECORATE; import static io.opentelemetry.trace.TracingContextUtils.currentContextWith; import io.grpc.Context; diff --git a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/HandlerAdapterInstrumentation.java similarity index 97% rename from instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/HandlerAdapterInstrumentation.java index 5f80c6203e..0e79fe7ce9 100644 --- a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterInstrumentation.java +++ b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/HandlerAdapterInstrumentation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opentelemetry.auto.instrumentation.springwebflux.server; +package io.opentelemetry.auto.instrumentation.spring.webflux.server; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; diff --git a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouteOnSuccessOrError.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/RouteOnSuccessOrError.java similarity index 97% rename from instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouteOnSuccessOrError.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/RouteOnSuccessOrError.java index 7f661b7340..ddb5a0a678 100644 --- a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouteOnSuccessOrError.java +++ b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/RouteOnSuccessOrError.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opentelemetry.auto.instrumentation.springwebflux.server; +package io.opentelemetry.auto.instrumentation.spring.webflux.server; import io.grpc.Context; import io.opentelemetry.instrumentation.api.decorator.BaseTracer; diff --git a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionAdvice.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/RouterFunctionAdvice.java similarity index 95% rename from instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionAdvice.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/RouterFunctionAdvice.java index a9eca488d9..5b943623bf 100644 --- a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionAdvice.java +++ b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/RouterFunctionAdvice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opentelemetry.auto.instrumentation.springwebflux.server; +package io.opentelemetry.auto.instrumentation.spring.webflux.server; import net.bytebuddy.asm.Advice; import org.springframework.web.reactive.function.server.HandlerFunction; diff --git a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/RouterFunctionInstrumentation.java similarity index 97% rename from instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/RouterFunctionInstrumentation.java index d1c22916c0..d24089be6d 100644 --- a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionInstrumentation.java +++ b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/RouterFunctionInstrumentation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opentelemetry.auto.instrumentation.springwebflux.server; +package io.opentelemetry.auto.instrumentation.spring.webflux.server; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass; diff --git a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/SpringWebfluxHttpServerDecorator.java similarity index 93% rename from instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/SpringWebfluxHttpServerDecorator.java index 2cb894fce6..1269e2f96c 100644 --- a/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java +++ b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/spring/webflux/server/SpringWebfluxHttpServerDecorator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.opentelemetry.auto.instrumentation.springwebflux.server; +package io.opentelemetry.auto.instrumentation.spring.webflux.server; import io.opentelemetry.OpenTelemetry; import io.opentelemetry.instrumentation.api.decorator.ServerDecorator;