diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 4d1a42eaebb7..10009bd394fa 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -493,6 +493,7 @@ io.clientcore:http-stress;1.0.0-beta.1;1.0.0-beta.1 # unreleased_com.azure:azure-monitor-opentelemetry-exporter;1.0.0-beta.31 +unreleased_com.azure:azure-monitor-opentelemetry-autoconfigure;1.0.0-beta.1 # Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current # version and set the version to the released beta. Released beta dependencies are only valid diff --git a/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/CustomValidationPolicy.java b/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/CustomValidationPolicy.java index 320ffee647fd..ed29c45826df 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/CustomValidationPolicy.java +++ b/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/CustomValidationPolicy.java @@ -10,8 +10,8 @@ import com.azure.json.JsonProviders; import com.azure.json.JsonReader; import com.azure.json.JsonToken; -import com.azure.monitor.opentelemetry.exporter.implementation.localstorage.LocalStorageTelemetryPipelineListener; -import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.localstorage.LocalStorageTelemetryPipelineListener; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem; import reactor.core.publisher.Mono; import java.io.IOException; diff --git a/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java b/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java index 38031136e33d..d37513944c9d 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java +++ b/sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/SpringMonitorTest.java @@ -10,8 +10,8 @@ import com.azure.core.http.policy.HttpPipelinePolicy; import com.azure.json.JsonProviders; import com.azure.json.JsonReader; -import com.azure.monitor.opentelemetry.exporter.AzureMonitorExporterOptions; -import com.azure.monitor.opentelemetry.exporter.implementation.models.*; +import com.azure.monitor.opentelemetry.autoconfigure.AzureMonitorAutoConfigureOptions; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.*; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -47,10 +47,10 @@ class SpringMonitorTest { static class TestConfig { @Bean - AzureMonitorExporterOptions azureMonitorExporterBuilder() { + AzureMonitorAutoConfigureOptions azureMonitorExporterBuilder() { countDownLatch = new CountDownLatch(2); customValidationPolicy = new CustomValidationPolicy(countDownLatch); - return new AzureMonitorExporterOptions() + return new AzureMonitorAutoConfigureOptions() .connectionString("InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=https://test.in.applicationinsights.azure.com/;LiveEndpoint=https://test.livediagnostics.monitor.azure.com/") .pipeline(getHttpPipeline(customValidationPolicy)); } diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml b/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml index fa20a1dd9375..2ca923f050b8 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-monitor/pom.xml @@ -88,8 +88,8 @@ com.azure - azure-monitor-opentelemetry-exporter - 1.0.0-beta.31 + azure-monitor-opentelemetry-autoconfigure + 1.0.0-beta.1 diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/AzureSpringMonitorAutoConfiguration.java b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/AzureSpringMonitorAutoConfiguration.java index 428b8e9c2bfb..ec8eb69e82ed 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/AzureSpringMonitorAutoConfiguration.java +++ b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/AzureSpringMonitorAutoConfiguration.java @@ -3,8 +3,8 @@ package com.azure.spring.cloud.autoconfigure.monitor.implementation; -import com.azure.monitor.opentelemetry.exporter.AzureMonitorExporter; -import com.azure.monitor.opentelemetry.exporter.AzureMonitorExporterOptions; +import com.azure.monitor.opentelemetry.autoconfigure.AzureMonitorAutoConfigure; +import com.azure.monitor.opentelemetry.autoconfigure.AzureMonitorAutoConfigureOptions; import io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration; import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider; import org.slf4j.Logger; @@ -56,7 +56,7 @@ private static boolean applicationInsightsAgentIsAttached() { } @Bean - AutoConfigurationCustomizerProvider autoConfigurationCustomizerProvider(@Value("${applicationinsights.connection.string:#{null}}") String connectionString, ObjectProvider azureMonitorExporterOptions) { + AutoConfigurationCustomizerProvider autoConfigurationCustomizerProvider(@Value("${applicationinsights.connection.string:#{null}}") String connectionString, ObjectProvider azureMonitorAutoConfigureOptions) { if (!isNativeRuntimeExecution() && applicationInsightsAgentIsAttached()) { LOG.warn("The spring-cloud-azure-starter-monitor Spring starter is disabled because the Application Insights Java agent is enabled." @@ -64,14 +64,14 @@ AutoConfigurationCustomizerProvider autoConfigurationCustomizerProvider(@Value(" return DISABLE_OTEL_CUSTOMER_PROVIDER; } - AzureMonitorExporterOptions providedAzureMonitorExporterOptions = azureMonitorExporterOptions.getIfAvailable(); - if (providedAzureMonitorExporterOptions != null) { + AzureMonitorAutoConfigureOptions providedAzureMonitorAutoConfigureOptions = azureMonitorAutoConfigureOptions.getIfAvailable(); + if (providedAzureMonitorAutoConfigureOptions != null) { if (System.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING") == null && System.getProperty("applicationinsights.connection.string") == null && (connectionString != null && !connectionString.isEmpty())) { LOG.warn("You have created an AzureMonitorExporterBuilder bean and set the applicationinsights.connection.string property in a .properties or .yml file." + " This property is ignored."); } // The AzureMonitor class (OpenTelemetry exporter library) is able to use the APPLICATIONINSIGHTS_CONNECTION_STRING environment variable or the applicationinsights.connection.string JVM property - return autoConfigurationCustomizer -> AzureMonitorExporter.customize(autoConfigurationCustomizer, providedAzureMonitorExporterOptions); + return autoConfigurationCustomizer -> AzureMonitorAutoConfigure.customize(autoConfigurationCustomizer, providedAzureMonitorAutoConfigureOptions); } if (connectionString == null || connectionString.isEmpty()) { @@ -83,10 +83,10 @@ AutoConfigurationCustomizerProvider autoConfigurationCustomizerProvider(@Value(" } if (!connectionString.contains("InstrumentationKey=")) { - throw new WrongConnectionStringException(); // To fail fast, before the OpenTelemetry exporter + throw new WrongConnectionStringException(); // To fail fast, before Azure Monitor AutoConfigure } - return autoConfigurationCustomizer -> AzureMonitorExporter.customize(autoConfigurationCustomizer, connectionString); + return autoConfigurationCustomizer -> AzureMonitorAutoConfigure.customize(autoConfigurationCustomizer, connectionString); } @Bean