Renaming in Azure Spring Monitor (Azure#36583)

Author: jeanbisutti

eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml

@@ -108,9 +108,9 @@
   <suppress checks="IllegalImport" files="com.azure.messaging.eventhubs.TracingIntegrationTests.java"/>
   <suppress checks="IllegalImport" files="com.azure.messaging.eventhubs.PublishEventsTracingWithCustomContextSample.java"/>
 
-  <!-- AzureTelemetryConfig defines Spring bean used in https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java-->
+  <!-- AzureSpringMonitorConfig defines Spring bean used in https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java-->
   <suppress checks="com.azure.tools.checkstyle.checks.ExternalDependencyExposedCheck"
-            files="com.azure.monitor.applicationinsights.spring.AzureTelemetryConfig.java"/>
+            files="com.azure.monitor.applicationinsights.spring.AzureSpringMonitorConfig.java"/>
 
   <!-- For the Application Insights Spring Boot starter for Spring native, users have only to declare the starter dependency. Users won't manipulate the Java classes of this Spring Boot starter. -->
   <suppress checks="Javadoc" files=".*[/\\]com[/\\]azure[/\\]monitor[/\\]applicationinsights[/\\]spring[/\\]*"/>

sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/monitor/applicationinsights/spring/AzureTelemetryActivation.java renamed to sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/monitor/applicationinsights/spring/AzureSpringMonitorActivation.java

@@ -4,17 +4,17 @@
 package com.azure.monitor.applicationinsights.spring;
 
 /**
- * Azure telemetry activation
+ * Azure Azure Spring Monitor activation
  */
-public final class AzureTelemetryActivation {
+public final class AzureSpringMonitorActivation {
 
-    /** a flag to indicate if AzureTelemetry is activated or not. */
+    /** a flag to indicate if Azure Spring Monitor is activated or not. */
     private final boolean activated;
 
     /**
-     * Creates an instance of {@link AzureTelemetryActivation}.
+     * Creates an instance of {@link AzureSpringMonitorActivation}.
      */
-    public AzureTelemetryActivation() {
+    public AzureSpringMonitorActivation() {
         this.activated = true; // We leave the AzureTelemetryActivation class because it could be used to provide the ability
         // to disable the starter features
     }

sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/monitor/applicationinsights/spring/AzureTelemetryActivationConfig.java renamed to sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/monitor/applicationinsights/spring/AzureSpringMonitorActivationConfig.java

@@ -7,18 +7,18 @@
 import org.springframework.context.annotation.Configuration;
 
 /**
- * Config for AzureTelemetryActivation
+ * Config for AzureSpringMonitorActivation
  */
 @Configuration(proxyBeanMethods = false)
-public class AzureTelemetryActivationConfig {
+public class AzureSpringMonitorActivationConfig {
 
     /**
-     * Declare an AzureTelemetryActivation bean
-     * @return AzureTelemetryActivation
+     * Declare an AzureSpringMonitorActivation bean
+     * @return AzureSpringMonitorActivation
      */
     @Bean
-    public AzureTelemetryActivation azureTelemetryActivation() {
-        return new AzureTelemetryActivation();
+    public AzureSpringMonitorActivation azureSpringMonitorActivation() {
+        return new AzureSpringMonitorActivation();
     }
 
 

sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/monitor/applicationinsights/spring/AzureTelemetryAutoConfig.java renamed to sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/monitor/applicationinsights/spring/AzureSpringMonitorAutoConfig.java

@@ -9,10 +9,10 @@
 import org.springframework.context.annotation.Import;
 
 /**
- * Auto config for Azure Telemetry
+ * Auto config for Azure Spring Monitor
  */
 @Configuration(proxyBeanMethods = false)
 @AutoConfigureBefore(OpenTelemetryAutoConfiguration.class)
-@Import({AzureTelemetryConfig.class, AzureTelemetryActivationConfig.class})
-public class AzureTelemetryAutoConfig {
+@Import({AzureSpringMonitorConfig.class, AzureSpringMonitorActivationConfig.class})
+public class AzureSpringMonitorAutoConfig {
 }

sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/monitor/applicationinsights/spring/AzureTelemetryConfig.java renamed to sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/monitor/applicationinsights/spring/AzureSpringMonitorConfig.java

@@ -19,22 +19,22 @@
  * Config for Azure Telemetry
  */
 @Configuration(proxyBeanMethods = false)
-public class AzureTelemetryConfig {
+public class AzureSpringMonitorConfig {
 
-    private static final ClientLogger LOGGER = new ClientLogger(AzureTelemetryConfig.class);
+    private static final ClientLogger LOGGER = new ClientLogger(AzureSpringMonitorConfig.class);
 
     private static final String CONNECTION_STRING_ERROR_MESSAGE = "Unable to find the Application Insights connection string.";
 
     private final Optional<AzureMonitorExporterBuilder> azureMonitorExporterBuilderOpt;
 
     /**
-     * Create an instance of AzureTelemetryConfig
+     * Create an instance of AzureSpringMonitorConfig
      * @param connectionStringSysProp connection string system property
-     * @param azureTelemetryActivation a instance of AzureTelemetryActivation
+     * @param azureSpringMonitorActivation a instance of AzureTelemetryActivation
      * @param httpPipeline an instance of HttpPipeline
      */
-    public AzureTelemetryConfig(@Value("${applicationinsights.connection.string:}") String connectionStringSysProp, AzureTelemetryActivation azureTelemetryActivation, ObjectProvider<HttpPipeline> httpPipeline) {
-        if (azureTelemetryActivation.isTrue()) {
+    public AzureSpringMonitorConfig(@Value("${applicationinsights.connection.string:}") String connectionStringSysProp, AzureSpringMonitorActivation azureSpringMonitorActivation, ObjectProvider<HttpPipeline> httpPipeline) {
+        if (azureSpringMonitorActivation.isTrue()) {
             this.azureMonitorExporterBuilderOpt = createAzureMonitorExporterBuilder(connectionStringSysProp, httpPipeline);
             if (!isNativeRuntimeExecution()) {
                 LOGGER.warning("You are using Application Insights for Spring in a non-native GraalVM runtime environment. We recommend using the Application Insights Java agent.");
@@ -77,7 +77,7 @@ private Optional<AzureMonitorExporterBuilder> createAzureMonitorExporterBuilder(
      * @return MetricExporter
      */
     @Bean
-    public MetricExporter metricExporter() {
+    public MetricExporter azureSpringMonitorMetricExporter() {
         if (!azureMonitorExporterBuilderOpt.isPresent()) {
             return null;
         }
@@ -89,7 +89,7 @@ public MetricExporter metricExporter() {
      * @return SpanExporter
      */
     @Bean
-    public SpanExporter spanExporter() {
+    public SpanExporter azureSpringMonitorSpanExporter() {
         if (!azureMonitorExporterBuilderOpt.isPresent()) {
             return null;
         }
@@ -101,7 +101,7 @@ public SpanExporter spanExporter() {
      * @return LogRecordExporter
      */
     @Bean
-    public LogRecordExporter logRecordExporter() {
+    public LogRecordExporter azureSpringMonitorLogRecordExporter() {
         if (!azureMonitorExporterBuilderOpt.isPresent()) {
             return null;
         }

sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/monitor/applicationinsights/spring/JvmMetricsPostProcessor.java

@@ -20,14 +20,14 @@
 // See https://github.com/Azure/azure-sdk-for-java/issues/35725
 public class JvmMetricsPostProcessor implements BeanPostProcessor, Ordered {
 
-    private final AzureTelemetryActivation azureTelemetryActivation;
+    private final AzureSpringMonitorActivation azureSpringMonitorActivation;
 
     /**
      * Create an instance of JvmMetricsPostProcessor
-     * @param azureTelemetryActivation the azure telemetry activation
+     * @param azureSpringMonitorActivation the azure telemetry activation
      */
-    public JvmMetricsPostProcessor(AzureTelemetryActivation azureTelemetryActivation) {
-        this.azureTelemetryActivation = azureTelemetryActivation;
+    public JvmMetricsPostProcessor(AzureSpringMonitorActivation azureSpringMonitorActivation) {
+        this.azureSpringMonitorActivation = azureSpringMonitorActivation;
     }
 
     /**
@@ -39,7 +39,7 @@ public JvmMetricsPostProcessor(AzureTelemetryActivation azureTelemetryActivation
      */
     @Override
     public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-        if (azureTelemetryActivation.isTrue() && bean instanceof OpenTelemetry) {
+        if (azureSpringMonitorActivation.isTrue() && bean instanceof OpenTelemetry) {
             OpenTelemetry openTelemetry = (OpenTelemetry) bean;
             BufferPools.registerObservers(openTelemetry);
             Classes.registerObservers(openTelemetry);

sdk/spring/spring-cloud-azure-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1 @@
-com.azure.monitor.applicationinsights.spring.AzureTelemetryAutoConfig
+com.azure.monitor.applicationinsights.spring.AzureSpringMonitorAutoConfig