extract condition

Author: zeitlinger

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

@@ -12,6 +12,8 @@
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
 import io.opentelemetry.instrumentation.api.internal.EmbeddedInstrumentationProperties;
 import io.opentelemetry.instrumentation.sdk.DeclarativeConfigPropertiesBridge;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.DeclarativeConfigDisabled;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.DeclarativeConfigEnabled;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.OtelMapConverter;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.ConfigPropertiesBridge;
@@ -88,7 +90,7 @@ public ResourceProvider otelDistroVersionResourceProvider() {
       OtelResourceProperties.class,
       OtelSpringProperties.class
     })
-    @ConditionalOnProperty(name = "otel.file_format", matchIfMissing = true, havingValue = "never")
+    @Conditional(DeclarativeConfigDisabled.class)
     static class PropertiesConfig {
 
       @Bean
@@ -147,7 +149,7 @@ public ConfigProperties otelProperties(
     }
 
     @Configuration
-    @ConditionalOnProperty(name = "otel.file_format")
+    @Conditional(DeclarativeConfigEnabled.class)
     static class EmbeddedConfigFileConfig {
 
       @Bean
@@ -226,7 +228,7 @@ public InstrumentationConfig instrumentationConfig(ConfigProperties properties)
     }
 
     @Configuration
-    @ConditionalOnProperty(name = "otel.file_format", matchIfMissing = true, havingValue = "never")
+    @Conditional(DeclarativeConfigDisabled.class)
     static class PropertiesConfig {
       /**
        * Is only added so that we have the same converters as with active OpenTelemetry SDK

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/DeclarativeConfigDisabled.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 DeclarativeConfigDisabled extends AnyNestedCondition {
+  public DeclarativeConfigDisabled() {
+    super(ConfigurationPhase.PARSE_CONFIGURATION);
+  }
+
+  @ConditionalOnProperty(name = "otel.file_format", matchIfMissing = true, havingValue = "never")
+  static class Disabled {}
+}

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/DeclarativeConfigEnabled.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 DeclarativeConfigEnabled extends AnyNestedCondition {
+  public DeclarativeConfigEnabled() {
+    super(ConfigurationPhase.PARSE_CONFIGURATION);
+  }
+
+  @ConditionalOnProperty(name = "otel.file_format")
+  static class Enabled {}
+}