Refactor Spring starter's instrumentation auto configuration classes (open-telemetry#8950)

Co-authored-by: Trask Stalnaker <[email protected]>

Author: Mateusz Rzeszutek

instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationInstrumentationModule.java

@@ -24,7 +24,7 @@
 public class AnnotationInstrumentationModule extends InstrumentationModule {
 
   public AnnotationInstrumentationModule() {
-    super("opentelemetry-instrumentation-annotations");
+    super("opentelemetry-instrumentation-annotations", "annotations");
   }
 
   @Override

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

@@ -398,16 +398,16 @@ If an exporter is present in the classpath during runtime and a spring bean of t
 
 ##### Enabling/Disabling Features
 
-| Feature          | Property                            | Default Value | ConditionalOnClass     |
-| ---------------- | ----------------------------------- | ------------- | ---------------------- |
-| spring-web       | otel.springboot.httpclients.enabled | `true`        | RestTemplate           |
-| spring-webmvc    | otel.springboot.httpclients.enabled | `true`        | OncePerRequestFilter   |
-| spring-webflux   | otel.springboot.httpclients.enabled | `true`        | WebClient              |
-| @WithSpan        | otel.springboot.aspects.enabled     | `true`        | WithSpan, Aspect       |
-| Otlp Exporter    | otel.exporter.otlp.enabled          | `true`        | OtlpGrpcSpanExporter   |
-| Jaeger Exporter  | otel.exporter.jaeger.enabled        | `true`        | JaegerGrpcSpanExporter |
-| Zipkin Exporter  | otel.exporter.zipkin.enabled        | `true`        | ZipkinSpanExporter     |
-| Logging Exporter | otel.exporter.logging.enabled       | `true`        | LoggingSpanExporter    |
+| Feature          | Property                                    | Default Value | ConditionalOnClass     |
+|------------------|---------------------------------------------|---------------|------------------------|
+| spring-web       | otel.instrumentation.spring-webmvc.enabled  | `true`        | RestTemplate           |
+| spring-webmvc    | otel.instrumentation.spring-web.enabled     | `true`        | OncePerRequestFilter   |
+| spring-webflux   | otel.instrumentation.spring-webflux.enabled | `true`        | WebClient              |
+| @WithSpan        | otel.instrumentation.annotations.enabled    | `true`        | WithSpan, Aspect       |
+| Otlp Exporter    | otel.exporter.otlp.enabled                  | `true`        | OtlpGrpcSpanExporter   |
+| Jaeger Exporter  | otel.exporter.jaeger.enabled                | `true`        | JaegerGrpcSpanExporter |
+| Zipkin Exporter  | otel.exporter.zipkin.enabled                | `true`        | ZipkinSpanExporter     |
+| Logging Exporter | otel.exporter.logging.enabled               | `true`        | LoggingSpanExporter    |
 
 <!-- Slf4j Log Correlation  otel.springboot.loggers.slf4j.enabled		true   		org.slf4j.MDC -->
 

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/aspects/TraceAspectProperties.java

@@ -3,44 +3,44 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.spring.autoconfigure.aspects;
+package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.annotations;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.annotations.WithSpan;
 import org.aspectj.lang.annotation.Aspect;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.core.ParameterNameDiscoverer;
 
 /** Configures {@link WithSpanAspect} to trace bean methods annotated with {@link WithSpan}. */
-@Configuration
-@EnableConfigurationProperties(TraceAspectProperties.class)
-@ConditionalOnProperty(prefix = "otel.springboot.aspects", name = "enabled", matchIfMissing = true)
+@ConditionalOnBean(OpenTelemetry.class)
 @ConditionalOnClass(Aspect.class)
-public class TraceAspectAutoConfiguration {
+@ConditionalOnProperty(name = "otel.instrumentation.annotations.enabled", matchIfMissing = true)
+@Configuration
+public class InstrumentationAnnotationsAutoConfiguration {
 
   @Bean
   @ConditionalOnMissingBean
-  public ParameterNameDiscoverer parameterNameDiscoverer() {
+  ParameterNameDiscoverer parameterNameDiscoverer() {
     return new DefaultParameterNameDiscoverer();
   }
 
   @Bean
   @ConditionalOnClass(WithSpan.class)
-  public InstrumentationWithSpanAspect instrumentationWithSpanAspect(
+  InstrumentationWithSpanAspect otelInstrumentationWithSpanAspect(
       OpenTelemetry openTelemetry, ParameterNameDiscoverer parameterNameDiscoverer) {
     return new InstrumentationWithSpanAspect(openTelemetry, parameterNameDiscoverer);
   }
 
   @Bean
   @SuppressWarnings("deprecation") // instrumenting deprecated class for backwards compatibility
   @ConditionalOnClass(io.opentelemetry.extension.annotations.WithSpan.class)
-  public SdkExtensionWithSpanAspect sdkExtensionWithSpanAspect(
+  SdkExtensionWithSpanAspect otelSdkExtensionWithSpanAspect(
       OpenTelemetry openTelemetry, ParameterNameDiscoverer parameterNameDiscoverer) {
     return new SdkExtensionWithSpanAspect(openTelemetry, parameterNameDiscoverer);
   }

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/httpclients/HttpClientsProperties.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.spring.autoconfigure.aspects;
+package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.annotations;
 
 import io.opentelemetry.api.OpenTelemetry;
 import org.aspectj.lang.ProceedingJoinPoint;

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/httpclients/resttemplate/RestTemplateAutoConfiguration.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.spring.autoconfigure.aspects;
+package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.annotations;
 
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.annotations.WithSpan;

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/httpclients/webclient/WebClientAutoConfiguration.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.spring.autoconfigure.aspects;
+package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.annotations;
 
 import io.opentelemetry.instrumentation.api.instrumenter.code.CodeAttributesGetter;