simplify code

open-telemetry · Feb 21, 2024 · af3c2c6 · af3c2c6
1 parent 0e67d9d
commit af3c2c6
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 154 deletions.
diff --git a/...utoconfigure/instrumentation/annotations/InstrumentationAnnotationsAutoConfiguration.java b/...utoconfigure/instrumentation/annotations/InstrumentationAnnotationsAutoConfiguration.java
@@ -7,8 +7,8 @@
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.annotations.WithSpan;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
 import org.aspectj.lang.annotation.Aspect;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -21,22 +21,10 @@
 /** Configures {@link WithSpanAspect} to trace bean methods annotated with {@link WithSpan}. */
 @ConditionalOnBean(OpenTelemetry.class)
 @ConditionalOnClass(Aspect.class)
-@Conditional(InstrumentationAnnotationsAutoConfiguration.Condition.class)
+@ConditionalOnProperty(name = "otel.instrumentation.annotations.enabled", matchIfMissing = true)
+@Conditional(SdkEnabled.class)
 @Configuration
 public class InstrumentationAnnotationsAutoConfiguration {
-
-  static final class Condition extends AllNestedConditions {
-    public Condition() {
-      super(ConfigurationPhase.PARSE_CONFIGURATION);
-    }
-
-    @ConditionalOnProperty(name = "otel.instrumentation.annotations.enabled", matchIfMissing = true)
-    static class Annotation {}
-
-    @ConditionalOnProperty(name = "otel.sdk.disabled", havingValue = "false", matchIfMissing = true)
-    static class SdkEnabled {}
-  }
-
   private final ParameterNameDiscoverer parameterNameDiscoverer =
       new DefaultParameterNameDiscoverer();
 

diff --git a/...n/spring/autoconfigure/instrumentation/jdbc/OpenTelemetryJdbcDriverAutoConfiguration.java b/...n/spring/autoconfigure/instrumentation/jdbc/OpenTelemetryJdbcDriverAutoConfiguration.java
@@ -7,10 +7,10 @@
 
 import io.opentelemetry.instrumentation.jdbc.OpenTelemetryDriver;
 import io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryInjector;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -19,27 +19,15 @@
 import org.springframework.context.annotation.Configuration;
 
 @ConditionalOnClass(OpenTelemetryDriver.class)
-@Conditional(OpenTelemetryJdbcDriverAutoConfiguration.Condition.class)
+@ConditionalOnProperty(
+    name = "spring.datasource.driver-class-name",
+    havingValue = "io.opentelemetry.instrumentation.jdbc.OpenTelemetryDriver")
+@Conditional(SdkEnabled.class)
 @Configuration(proxyBeanMethods = false)
 @AutoConfigureAfter(
     name = "org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration")
 @ConditionalOnBean(name = "org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration")
 public class OpenTelemetryJdbcDriverAutoConfiguration {
-
-  static final class Condition extends AllNestedConditions {
-    public Condition() {
-      super(ConfigurationPhase.PARSE_CONFIGURATION);
-    }
-
-    @ConditionalOnProperty(
-        name = "spring.datasource.driver-class-name",
-        havingValue = "io.opentelemetry.instrumentation.jdbc.OpenTelemetryDriver")
-    static class Driver {}
-
-    @ConditionalOnProperty(name = "otel.sdk.disabled", havingValue = "false", matchIfMissing = true)
-    static class SdkEnabled {}
-  }
-
   @Bean
   OpenTelemetryInjector injectOtelIntoJdbcDriver() {
     return openTelemetry -> OpenTelemetryDriver.install(openTelemetry);

diff --git a/...ion/spring/autoconfigure/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java b/...ion/spring/autoconfigure/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java
@@ -7,8 +7,8 @@
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.kafkaclients.v2_6.KafkaTelemetry;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -21,22 +21,11 @@
 
 @ConditionalOnBean(OpenTelemetry.class)
 @ConditionalOnClass({KafkaTemplate.class, ConcurrentKafkaListenerContainerFactory.class})
-@Conditional(KafkaInstrumentationAutoConfiguration.Condition.class)
+@ConditionalOnProperty(name = "otel.instrumentation.kafka.enabled", matchIfMissing = true)
+@Conditional(SdkEnabled.class)
 @Configuration
 public class KafkaInstrumentationAutoConfiguration {
 
-  static final class Condition extends AllNestedConditions {
-    public Condition() {
-      super(ConfigurationPhase.PARSE_CONFIGURATION);
-    }
-
-    @ConditionalOnProperty(name = "otel.instrumentation.kafka.enabled", matchIfMissing = true)
-    static class Kafka {}
-
-    @ConditionalOnProperty(name = "otel.sdk.disabled", havingValue = "false", matchIfMissing = true)
-    static class SdkEnabled {}
-  }
-
   @Bean
   DefaultKafkaProducerFactoryCustomizer otelKafkaProducerFactoryCustomizer(
       OpenTelemetry openTelemetry) {

diff --git a/.../spring/autoconfigure/instrumentation/logging/OpenTelemetryAppenderAutoConfiguration.java b/.../spring/autoconfigure/instrumentation/logging/OpenTelemetryAppenderAutoConfiguration.java
@@ -6,17 +6,19 @@
 package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.logging;
 
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 
 @ConditionalOnBean(OpenTelemetry.class)
 @Configuration
-@ConditionalOnProperty(name = "otel.sdk.disabled", havingValue = "false", matchIfMissing = true)
+@Conditional(SdkEnabled.class)
 @SuppressWarnings("OtelPrivateConstructorForUtilityClass")
 public class OpenTelemetryAppenderAutoConfiguration {
 

diff --git a/...on/spring/autoconfigure/instrumentation/micrometer/MicrometerBridgeAutoConfiguration.java b/...on/spring/autoconfigure/instrumentation/micrometer/MicrometerBridgeAutoConfiguration.java
@@ -9,11 +9,11 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.micrometer.v1_5.OpenTelemetryMeterRegistry;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
 import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -25,22 +25,11 @@
 @AutoConfigureBefore(CompositeMeterRegistryAutoConfiguration.class)
 @ConditionalOnBean({Clock.class, OpenTelemetry.class})
 @ConditionalOnClass(MeterRegistry.class)
-@Conditional(MicrometerBridgeAutoConfiguration.Condition.class)
+@ConditionalOnProperty(name = "otel.instrumentation.micrometer.enabled")
+@Conditional(SdkEnabled.class)
 @Configuration
 public class MicrometerBridgeAutoConfiguration {
 
-  static final class Condition extends AllNestedConditions {
-    public Condition() {
-      super(ConfigurationPhase.PARSE_CONFIGURATION);
-    }
-
-    @ConditionalOnProperty(name = "otel.instrumentation.micrometer.enabled")
-    static class Micrometer {}
-
-    @ConditionalOnProperty(name = "otel.sdk.disabled", havingValue = "false", matchIfMissing = true)
-    static class SdkEnabled {}
-  }
-
   @Bean
   MeterRegistry otelMeterRegistry(OpenTelemetry openTelemetry, Clock micrometerClock) {
     return OpenTelemetryMeterRegistry.builder(openTelemetry).setClock(micrometerClock).build();

diff --git a/...n/spring/autoconfigure/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java b/...n/spring/autoconfigure/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java
@@ -6,8 +6,8 @@
 package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.web;
 
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -23,22 +23,11 @@
  */
 @ConditionalOnBean(OpenTelemetry.class)
 @ConditionalOnClass(RestTemplate.class)
-@Conditional(SpringWebInstrumentationAutoConfiguration.Condition.class)
+@ConditionalOnProperty(name = "otel.instrumentation.spring-web.enabled", matchIfMissing = true)
+@Conditional(SdkEnabled.class)
 @Configuration
 public class SpringWebInstrumentationAutoConfiguration {
 
-  static final class Condition extends AllNestedConditions {
-    public Condition() {
-      super(ConfigurationPhase.PARSE_CONFIGURATION);
-    }
-
-    @ConditionalOnProperty(name = "otel.instrumentation.spring-web.enabled", matchIfMissing = true)
-    static class Web {}
-
-    @ConditionalOnProperty(name = "otel.sdk.disabled", havingValue = "false", matchIfMissing = true)
-    static class SdkEnabled {}
-  }
-
   public SpringWebInstrumentationAutoConfiguration() {}
 
   @Bean

diff --git a/.../autoconfigure/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java b/.../autoconfigure/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java
@@ -6,8 +6,8 @@
 package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.webflux;
 
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -23,24 +23,11 @@
  */
 @ConditionalOnBean(OpenTelemetry.class)
 @ConditionalOnClass(WebClient.class)
-@Conditional(SpringWebfluxInstrumentationAutoConfiguration.Condition.class)
+@ConditionalOnProperty(name = "otel.instrumentation.spring-webflux.enabled", matchIfMissing = true)
+@Conditional(SdkEnabled.class)
 @Configuration
 public class SpringWebfluxInstrumentationAutoConfiguration {
 
-  static final class Condition extends AllNestedConditions {
-    public Condition() {
-      super(ConfigurationPhase.PARSE_CONFIGURATION);
-    }
-
-    @ConditionalOnProperty(
-        name = "otel.instrumentation.spring-webflux.enabled",
-        matchIfMissing = true)
-    static class WebFlux {}
-
-    @ConditionalOnProperty(name = "otel.sdk.disabled", havingValue = "false", matchIfMissing = true)
-    static class SdkEnabled {}
-  }
-
   public SpringWebfluxInstrumentationAutoConfiguration() {}
 
   @Bean

diff --git a/...g/autoconfigure/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java b/...g/autoconfigure/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java
@@ -6,9 +6,9 @@
 package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.webmvc;
 
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
 import io.opentelemetry.instrumentation.spring.webmvc.v5_3.SpringWebMvcTelemetry;
 import javax.servlet.Filter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -20,25 +20,12 @@
 
 @ConditionalOnBean(OpenTelemetry.class)
 @ConditionalOnClass({Filter.class, OncePerRequestFilter.class, DispatcherServlet.class})
-@Conditional(SpringWebMvc5InstrumentationAutoConfiguration.Condition.class)
+@ConditionalOnProperty(name = "otel.instrumentation.spring-webmvc.enabled", matchIfMissing = true)
+@Conditional(SdkEnabled.class)
 @Configuration
 @SuppressWarnings("OtelPrivateConstructorForUtilityClass")
 public class SpringWebMvc5InstrumentationAutoConfiguration {
 
-  static final class Condition extends AllNestedConditions {
-    public Condition() {
-      super(ConfigurationPhase.PARSE_CONFIGURATION);
-    }
-
-    @ConditionalOnProperty(
-        name = "otel.instrumentation.spring-webmvc.enabled",
-        matchIfMissing = true)
-    static class WebMvc {}
-
-    @ConditionalOnProperty(name = "otel.sdk.disabled", havingValue = "false", matchIfMissing = true)
-    static class SdkEnabled {}
-  }
-
   @Bean
   Filter otelWebMvcFilter(OpenTelemetry openTelemetry) {
     return SpringWebMvcTelemetry.create(openTelemetry).createServletFilter();

diff --git a/...g/autoconfigure/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java b/...g/autoconfigure/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java
@@ -6,9 +6,9 @@
 package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.webmvc;
 
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
 import io.opentelemetry.instrumentation.spring.webmvc.v6_0.SpringWebMvcTelemetry;
 import jakarta.servlet.Filter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -20,25 +20,12 @@
 
 @ConditionalOnBean(OpenTelemetry.class)
 @ConditionalOnClass({Filter.class, OncePerRequestFilter.class, DispatcherServlet.class})
-@Conditional(SpringWebMvc5InstrumentationAutoConfiguration.Condition.class)
+@ConditionalOnProperty(name = "otel.instrumentation.spring-webmvc.enabled", matchIfMissing = true)
+@Conditional(SdkEnabled.class)
 @Configuration
 @SuppressWarnings("OtelPrivateConstructorForUtilityClass")
 public class SpringWebMvc6InstrumentationAutoConfiguration {
 
-  static final class Condition extends AllNestedConditions {
-    public Condition() {
-      super(ConfigurationPhase.PARSE_CONFIGURATION);
-    }
-
-    @ConditionalOnProperty(
-        name = "otel.instrumentation.spring-webmvc.enabled",
-        matchIfMissing = true)
-    static class WebMvc {}
-
-    @ConditionalOnProperty(name = "otel.sdk.disabled", havingValue = "false", matchIfMissing = true)
-    static class SdkEnabled {}
-  }
-
   @Bean
   Filter otelWebMvcFilter(OpenTelemetry openTelemetry) {
     return SpringWebMvcTelemetry.create(openTelemetry).createServletFilter();

diff --git a/.../main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/SdkEnabled.java b/.../main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/SdkEnabled.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.spring.autoconfigure.internal;
+
+import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
+public class SdkEnabled extends AnyNestedCondition {
+  public SdkEnabled() {
+    super(ConfigurationPhase.PARSE_CONFIGURATION);
+  }
+
+  @ConditionalOnProperty(name = "otel.sdk.disabled", havingValue = "false", matchIfMissing = true)
+  static class NotDisabled {}
+}
diff --git a/...emetry/instrumentation/spring/autoconfigure/propagators/PropagationAutoConfiguration.java b/...emetry/instrumentation/spring/autoconfigure/propagators/PropagationAutoConfiguration.java
@@ -8,14 +8,14 @@
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -27,21 +27,10 @@
 @Configuration
 @EnableConfigurationProperties(PropagationProperties.class)
 @AutoConfigureBefore(OpenTelemetryAutoConfiguration.class)
-@Conditional(PropagationAutoConfiguration.Condition.class)
+@ConditionalOnProperty(prefix = "otel.propagation", name = "enabled", matchIfMissing = true)
+@Conditional(SdkEnabled.class)
 public class PropagationAutoConfiguration {
 
-  static final class Condition extends AllNestedConditions {
-    public Condition() {
-      super(ConfigurationPhase.PARSE_CONFIGURATION);
-    }
-
-    @ConditionalOnProperty(prefix = "otel.propagation", name = "enabled", matchIfMissing = true)
-    static class Propagation {}
-
-    @ConditionalOnProperty(name = "otel.sdk.disabled", havingValue = "false", matchIfMissing = true)
-    static class SdkEnabled {}
-  }
-
   private static final List<String> DEFAULT_PROPAGATORS = Arrays.asList("tracecontext", "baggage");
 
   @Bean