Make preparations for Spring Web & WebMVC 6 instrumentations (#7343)

Just moving things around, extracting parent dir for `spring-web` and
`spring-webmvc`

docs/supported-libraries.md

@@ -115,8 +115,8 @@ These are the supported libraries and frameworks:
 | [Spring Kafka](https://spring.io/projects/spring-kafka)                                                                                     | 2.7+                          | [opentelemetry-spring-kafka-2.7](../instrumentation/spring/spring-kafka-2.7/library)                                                                                                                                                                                                                                                                                                    |                                                                                        |
 | [Spring RabbitMQ](https://spring.io/projects/spring-amqp)                                                                                   | 1.0+                          | N/A                                                                                                                                                                                                                                                                                                                                                                                     |                                                                                        |
 | [Spring Scheduling](https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/scheduling/package-summary.html)             | 3.1+                          | N/A                                                                                                                                                                                                                                                                                                                                                                                     |                                                                                        |
-| [Spring RestTemplate](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/client/package-summary.html) | 3.1+                          | [opentelemetry-spring-web-3.1](../instrumentation/spring/spring-web-3.1/library)                                                                                                                                                                                                                                                                                                        |                                                                                        |
-| [Spring Web MVC](https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/servlet/mvc/package-summary.html)           | 3.1+                          | [opentelemetry-spring-webmvc-5.3](../instrumentation/spring/spring-webmvc-5.3/library)                                                                                                                                                                                                                                                                                                  |                                                                                        |
+| [Spring RestTemplate](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/client/package-summary.html) | 3.1+                          | [opentelemetry-spring-web-3.1](../instrumentation/spring/spring-web/spring-web-3.1/library)                                                                                                                                                                                                                                                                                             |                                                                                        |
+| [Spring Web MVC](https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/servlet/mvc/package-summary.html)           | 3.1+                          | [opentelemetry-spring-webmvc-5.3](../instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library)                                                                                                                                                                                                                                                                                    |                                                                                        |
 | [Spring Web Services](https://spring.io/projects/spring-ws)                                                                                 | 2.0+                          | N/A                                                                                                                                                                                                                                                                                                                                                                                     |                                                                                        |
 | [Spring WebFlux](https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/reactive/package-summary.html)              | 5.0+                          | [opentelemetry-spring-webflux-5.0](../instrumentation/spring/spring-webflux-5.0/library)                                                                                                                                                                                                                                                                                                |                                                                                        |
 | [Spymemcached](https://github.com/couchbase/spymemcached)                                                                                   | 2.12+                         | N/A                                                                                                                                                                                                                                                                                                                                                                                     |                                                                                        |

instrumentation/grails-3.0/javaagent/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
   testInstrumentation(project(":instrumentation:tomcat:tomcat-7.0:javaagent"))
-  testInstrumentation(project(":instrumentation:spring:spring-webmvc-3.1:javaagent"))
+  testInstrumentation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-3.1:javaagent"))
 
   testLibrary("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
   testLibrary("org.springframework.boot:spring-boot-starter-tomcat:$springBootVersion")

instrumentation/spring/spring-boot-autoconfigure/README.md

@@ -1,10 +1,10 @@
 # OpenTelemetry Spring Auto-Configuration
 
-Auto-configures OpenTelemetry instrumentation for [spring-web](../spring-web-3.1/library)
-, [spring-webmvc](../spring-webmvc-5.3/library), and [spring-webflux](../spring-webflux-5.0/library)
-. Leverages Spring Aspect Oriented Programming, dependency injection, and bean post-processing to
-trace spring applications. To include all features listed below use
-the [opentelemetry-spring-boot-starter](../starters/spring-boot-starter/README.md).
+Auto-configures OpenTelemetry instrumentation for [spring-web](../spring-web/spring-web-3.1/library)
+, [spring-webmvc](../spring-webmvc/spring-webmvc-5.3/library),
+and [spring-webflux](../spring-webflux-5.0/library). Leverages Spring Aspect Oriented Programming,
+dependency injection, and bean post-processing to trace spring applications. To include all features
+listed below use the [opentelemetry-spring-boot-starter](../starters/spring-boot-starter/README.md).
 
 ## Quickstart
 
@@ -154,16 +154,16 @@ Provides a OpenTelemetry tracer bean (`io.opentelemetry.api.trace.Tracer`) if on
 
 #### Spring Web Auto Configuration
 
-Provides auto-configuration for the OpenTelemetry RestTemplate trace interceptor defined in [opentelemetry-spring-web-3.1](../spring-web-3.1). This auto-configuration instruments all requests sent using Spring RestTemplate beans by applying a RestTemplate bean post processor. This feature is supported for spring web versions 3.1+ and can be disabled by adding `opentelemetry.trace.httpclients.enabled=false` to your `resources/applications.properties` file. [Spring Web - RestTemplate Client Span](#spring-web---resttemplate-client-span) show cases a sample client span generated by this auto-configuration. Check out [opentelemetry-spring-web-3.1](../spring-web-3.1) to learn more about the OpenTelemetry RestTemplateInterceptor.
+Provides auto-configuration for the OpenTelemetry RestTemplate trace interceptor defined in [opentelemetry-spring-web-3.1](../spring-web/spring-web-3.1). This auto-configuration instruments all requests sent using Spring RestTemplate beans by applying a RestTemplate bean post processor. This feature is supported for spring web versions 3.1+ and can be disabled by adding `opentelemetry.trace.httpclients.enabled=false` to your `resources/applications.properties` file. [Spring Web - RestTemplate Client Span](#spring-web---resttemplate-client-span) show cases a sample client span generated by this auto-configuration. Check out [opentelemetry-spring-web-3.1](../spring-web/spring-web-3.1) to learn more about the OpenTelemetry RestTemplateInterceptor.
 
 #### Spring Web MVC Auto Configuration
 
 This feature autoconfigures instrumentation for Spring WebMVC controllers by adding
-a [telemetry producing servlet `Filter`](../spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/WebMvcTelemetryProducingFilter.java)
+a [telemetry producing servlet `Filter`](../spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/WebMvcTelemetryProducingFilter.java)
 bean to the application context. This filter decorates the request execution with an OpenTelemetry
 server span, propagating the incoming tracing context if received in the HTTP request. Check
-out [`opentelemetry-spring-webmvc-5.3` instrumentation library](../spring-webmvc-5.3/library) to
-learn more about the OpenTelemetry Spring WebMVC instrumentation.
+out [`opentelemetry-spring-webmvc-5.3` instrumentation library](../spring-webmvc/spring-webmvc-5.3/library)
+to learn more about the OpenTelemetry Spring WebMVC instrumentation.
 
 #### Spring WebFlux Auto Configuration
 

instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts

@@ -17,8 +17,8 @@ dependencies {
   implementation(project(":instrumentation-annotations-support"))
   implementation(project(":instrumentation:kafka:kafka-clients:kafka-clients-2.6:library"))
   implementation(project(":instrumentation:spring:spring-kafka-2.7:library"))
-  implementation(project(":instrumentation:spring:spring-web-3.1:library"))
-  implementation(project(":instrumentation:spring:spring-webmvc-5.3:library"))
+  implementation(project(":instrumentation:spring:spring-web:spring-web-3.1:library"))
+  implementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-5.3:library"))
   implementation(project(":instrumentation:spring:spring-webflux-5.0:library"))
   implementation(project(":instrumentation:micrometer:micrometer-1.5:library"))
 

instrumentation/spring/spring-web-3.1/javaagent/build.gradle.kts → instrumentation/spring/spring-web/spring-web-3.1/javaagent/build.gradle.kts

@@ -6,7 +6,7 @@ muzzle {
   pass {
     group.set("org.springframework")
     module.set("spring-web")
-    versions.set("[3.1.0.RELEASE,)")
+    versions.set("[3.1.0.RELEASE,6)")
     // these versions depend on javax.faces:jsf-api:1.1 which was released as pom only
     skip("1.2.1", "1.2.2", "1.2.3", "1.2.4")
     assertInverse.set(true)

instrumentation/spring/spring-web-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springweb/SpringWebInstrumentationModule.java → instrumentation/spring/spring-web/spring-web-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springweb/v3_1/SpringWebInstrumentationModule.java

@@ -3,10 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.springweb;
+package io.opentelemetry.javaagent.instrumentation.springweb.v3_1;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Collections.singletonList;
+import static net.bytebuddy.matcher.ElementMatchers.not;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
@@ -23,7 +24,9 @@ public class SpringWebInstrumentationModule extends InstrumentationModule {
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     // class added in 3.1
-    return hasClassesNamed("org.springframework.web.method.HandlerMethod");
+    return hasClassesNamed("org.springframework.web.method.HandlerMethod")
+        // class added in 6.0
+        .and(not(hasClassesNamed("org.springframework.web.ErrorResponse")));
   }
 
   @Override

instrumentation/spring/spring-web-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springweb/WebApplicationContextInstrumentation.java → instrumentation/spring/spring-web/spring-web-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springweb/v3_1/WebApplicationContextInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.springweb;
+package io.opentelemetry.javaagent.instrumentation.springweb.v3_1;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.extendsClass;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;

instrumentation/spring/spring-webmvc-3.1/javaagent/build.gradle.kts → instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
   testInstrumentation(project(":instrumentation:tomcat:tomcat-7.0:javaagent"))
-  testInstrumentation(project(":instrumentation:spring:spring-web-3.1:javaagent"))
+  testInstrumentation(project(":instrumentation:spring:spring-web:spring-web-3.1:javaagent"))
 
   testImplementation("javax.validation:validation-api:1.1.0.Final")
   testImplementation("org.hibernate:hibernate-validator:5.4.2.Final")

instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/DispatcherServletInstrumentation.java → instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/DispatcherServletInstrumentation.java

@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.springwebmvc;
+package io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1;
 
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
-import static io.opentelemetry.javaagent.instrumentation.springwebmvc.SpringWebMvcSingletons.modelAndViewInstrumenter;
+import static io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1.SpringWebMvcSingletons.modelAndViewInstrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isProtected;
 import static net.bytebuddy.matcher.ElementMatchers.named;

instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/HandlerAdapterInstrumentation.java → instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/HandlerAdapterInstrumentation.java

@@ -3,13 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.springwebmvc;
+package io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1;
 
 import static io.opentelemetry.instrumentation.api.instrumenter.http.HttpRouteSource.CONTROLLER;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
-import static io.opentelemetry.javaagent.instrumentation.springwebmvc.IsGrailsHandler.isGrailsHandler;
-import static io.opentelemetry.javaagent.instrumentation.springwebmvc.SpringWebMvcSingletons.handlerInstrumenter;
+import static io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1.SpringWebMvcSingletons.handlerInstrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
@@ -61,7 +60,7 @@ public class HandlerAdapterInstrumentation implements TypeInstrumentation {
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope) {
       // TODO (trask) should there be a way to customize Instrumenter.shouldStart()?
-      if (isGrailsHandler(handler)) {
+      if (IsGrailsHandler.isGrailsHandler(handler)) {
         // skip creating handler span for grails, grails instrumentation will take care of it
         return;
       }

instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/HandlerSpanNameExtractor.java → instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/HandlerSpanNameExtractor.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.springwebmvc;
+package io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1;
 
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.util.SpanNames;

instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/IsGrailsHandler.java → instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/IsGrailsHandler.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.springwebmvc;
+package io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1;
 
 public final class IsGrailsHandler {
 

instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/ModelAndViewAttributesExtractor.java → instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/ModelAndViewAttributesExtractor.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.springwebmvc;
+package io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1;
 
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;

instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/ModelAndViewSpanNameExtractor.java → instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/ModelAndViewSpanNameExtractor.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.springwebmvc;
+package io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1;
 
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
 import org.springframework.web.servlet.ModelAndView;

instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/SpringWebMvcInstrumentationModule.java → instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcInstrumentationModule.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.springwebmvc;
+package io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1;
 
 import static java.util.Arrays.asList;
 

instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/SpringWebMvcServerSpanNaming.java → instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcServerSpanNaming.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.springwebmvc;
+package io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1;
 
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpRouteGetter;
 import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath;

instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/springwebmvc/SpringWebMvcSingletons.java → instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcSingletons.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.springwebmvc;
+package io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;

instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/org/springframework/web/servlet/OpenTelemetryHandlerMappingFilter.java → instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/org/springframework/web/servlet/OpenTelemetryHandlerMappingFilter.java

@@ -10,7 +10,7 @@ import static io.opentelemetry.instrumentation.api.instrumenter.http.HttpRouteSo
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpRouteGetter;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpRouteHolder;
-import io.opentelemetry.javaagent.instrumentation.springwebmvc.SpringWebMvcServerSpanNaming;
+import io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1.SpringWebMvcServerSpanNaming;
 import java.io.IOException;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;

instrumentation/spring/spring-webmvc-3.1/wildfly-testing/build.gradle.kts → instrumentation/spring/spring-webmvc/spring-webmvc-3.1/wildfly-testing/build.gradle.kts

@@ -21,8 +21,8 @@ dependencies {
   testRuntimeOnly("org.wildfly.arquillian:wildfly-arquillian-container-embedded:2.2.0.Final")
 
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
-  testInstrumentation(project(":instrumentation:spring:spring-webmvc-3.1:javaagent"))
-  testInstrumentation(project(":instrumentation:spring:spring-web-3.1:javaagent"))
+  testInstrumentation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-3.1:javaagent"))
+  testInstrumentation(project(":instrumentation:spring:spring-web:spring-web-3.1:javaagent"))
 
   // wildfly version used to run tests
   testServer("org.wildfly:wildfly-dist:18.0.0.Final@zip")

settings.gradle.kts

@@ -444,12 +444,12 @@ hideFromDependabot(":instrumentation:spring:spring-kafka-2.7:testing")
 hideFromDependabot(":instrumentation:spring:spring-rabbit-1.0:javaagent")
 hideFromDependabot(":instrumentation:spring:spring-rmi-4.0:javaagent")
 hideFromDependabot(":instrumentation:spring:spring-scheduling-3.1:javaagent")
-hideFromDependabot(":instrumentation:spring:spring-web-3.1:javaagent")
-hideFromDependabot(":instrumentation:spring:spring-web-3.1:library")
-hideFromDependabot(":instrumentation:spring:spring-web-3.1:testing")
-hideFromDependabot(":instrumentation:spring:spring-webmvc-3.1:javaagent")
-hideFromDependabot(":instrumentation:spring:spring-webmvc-3.1:wildfly-testing")
-hideFromDependabot(":instrumentation:spring:spring-webmvc-5.3:library")
+hideFromDependabot(":instrumentation:spring:spring-web:spring-web-3.1:javaagent")
+hideFromDependabot(":instrumentation:spring:spring-web:spring-web-3.1:library")
+hideFromDependabot(":instrumentation:spring:spring-web:spring-web-3.1:testing")
+hideFromDependabot(":instrumentation:spring:spring-webmvc:spring-webmvc-3.1:javaagent")
+hideFromDependabot(":instrumentation:spring:spring-webmvc:spring-webmvc-3.1:wildfly-testing")
+hideFromDependabot(":instrumentation:spring:spring-webmvc:spring-webmvc-5.3:library")
 hideFromDependabot(":instrumentation:spring:spring-webflux-5.0:javaagent")
 hideFromDependabot(":instrumentation:spring:spring-webflux-5.0:library")
 hideFromDependabot(":instrumentation:spring:spring-ws-2.0:javaagent")