From ecbfe54c449447f11c03796d2f7a237d3c10b441 Mon Sep 17 00:00:00 2001 From: Jean Bisutti Date: Mon, 2 Dec 2024 18:47:21 +0100 Subject: [PATCH] Ability to display exported data --- .../monitor/SpringMonitorTest.java | 9 ---- .../selfdiagnostics}/DefaultLogConfig.java | 14 ++---- .../ExecutionEnvSelfDiag.java | 2 +- .../LogbackSelfDiagConfig.java | 46 +++++++++++++++++++ .../selfdiagnostics}/OtelSelfDiag.java | 2 +- .../selfdiagnostics}/SelfDiagAutoConfig.java | 8 ++-- .../selfdiagnostics}/SelfDiagnostics.java | 2 +- .../selfdiagnostics/SelfDiagnosticsLevel.java | 14 ++++++ .../selfdiagnostics/SelfDiagnosticsLevel.java | 33 ------------- .../implementation/LogbackSelfDiagConfig.java | 46 ------------------- .../monitor/selfdiagnostics/package-info.java | 7 --- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../implementation/SpringContextTest.java | 2 +- 13 files changed, 73 insertions(+), 114 deletions(-) rename sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/{selfdiagnostics/implementation => implementation/selfdiagnostics}/DefaultLogConfig.java (80%) rename sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/{selfdiagnostics/implementation => implementation/selfdiagnostics}/ExecutionEnvSelfDiag.java (94%) create mode 100644 sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/LogbackSelfDiagConfig.java rename sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/{selfdiagnostics/implementation => implementation/selfdiagnostics}/OtelSelfDiag.java (96%) rename sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/{selfdiagnostics/implementation => implementation/selfdiagnostics}/SelfDiagAutoConfig.java (92%) rename sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/{selfdiagnostics/implementation => implementation/selfdiagnostics}/SelfDiagnostics.java (69%) create mode 100644 sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/SelfDiagnosticsLevel.java delete mode 100644 sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/SelfDiagnosticsLevel.java delete mode 100644 sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/LogbackSelfDiagConfig.java delete mode 100644 sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/package-info.java 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 d11508beaadb6..38031136e33d5 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 @@ -11,9 +11,7 @@ import com.azure.json.JsonProviders; import com.azure.json.JsonReader; import com.azure.monitor.opentelemetry.exporter.AzureMonitorExporterOptions; -import com.azure.spring.cloud.autoconfigure.monitor.selfdiagnostics.SelfDiagnosticsLevel; import com.azure.monitor.opentelemetry.exporter.implementation.models.*; -import io.opentelemetry.sdk.common.internal.OtelVersion; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -21,7 +19,6 @@ import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Primary; import reactor.util.annotation.Nullable; import java.io.IOException; @@ -64,12 +61,6 @@ HttpPipeline getHttpPipeline(@Nullable HttpPipelinePolicy policy) { .policies(policy) .build(); } - - @Bean - @Primary - SelfDiagnosticsLevel testSelfDiagnosticsLevel() { - return SelfDiagnosticsLevel.DEBUG; - } } @Test diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/DefaultLogConfig.java b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/DefaultLogConfig.java similarity index 80% rename from sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/DefaultLogConfig.java rename to sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/DefaultLogConfig.java index 2a485704e0f65..ecd199d7355ea 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/DefaultLogConfig.java +++ b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/DefaultLogConfig.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.spring.cloud.autoconfigure.monitor.selfdiagnostics.implementation; +package com.azure.spring.cloud.autoconfigure.monitor.implementation.selfdiagnostics; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,20 +9,12 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -/** - * Default self-diagnostics features for logging when Logback is not found. - */ @Configuration(proxyBeanMethods = false) @ConditionalOnMissingClass({"ch.qos.logback.classic.LoggerContext"}) -public class DefaultLogConfig { +class DefaultLogConfig { - /** - * To define a logger for self-diagnostics. - * - * @return A logger for self-diagnostics - */ @Bean - public Logger selfDiagnosticsLogger() { + Logger selfDiagnosticsLogger() { Logger logger = LoggerFactory.getLogger(SelfDiagnostics.class); String selfDiagLevelDefinedByUser = System.getenv(SelfDiagAutoConfig.SELF_DIAGNOSTICS_LEVEL_ENV_VAR); if (selfDiagLevelDefinedByUser != null) { diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/ExecutionEnvSelfDiag.java b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/ExecutionEnvSelfDiag.java similarity index 94% rename from sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/ExecutionEnvSelfDiag.java rename to sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/ExecutionEnvSelfDiag.java index 6cbdfd1481c08..87c5fea8c95d5 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/ExecutionEnvSelfDiag.java +++ b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/ExecutionEnvSelfDiag.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.spring.cloud.autoconfigure.monitor.selfdiagnostics.implementation; +package com.azure.spring.cloud.autoconfigure.monitor.implementation.selfdiagnostics; import org.slf4j.Logger; import org.springframework.boot.CommandLineRunner; diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/LogbackSelfDiagConfig.java b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/LogbackSelfDiagConfig.java new file mode 100644 index 0000000000000..ca19c8cc4eb98 --- /dev/null +++ b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/LogbackSelfDiagConfig.java @@ -0,0 +1,46 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.spring.cloud.autoconfigure.monitor.implementation.selfdiagnostics; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.LoggerContext; +import org.slf4j.ILoggerFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration(proxyBeanMethods = false) +@ConditionalOnClass(ch.qos.logback.classic.LoggerContext.class) +class LogbackSelfDiagConfig { + + @Bean + Logger selfDiagnosticsLogger(SelfDiagnosticsLevel selfDiagnosticsLevel) { + Logger slf4jLog = LoggerFactory.getLogger(SelfDiagnostics.class); + ch.qos.logback.classic.Logger logbackLogger = (ch.qos.logback.classic.Logger) slf4jLog; + Level logbackLevel = Level.toLevel(selfDiagnosticsLevel.name()); + logbackLogger.setLevel(logbackLevel); + return logbackLogger; + } + + @Bean + CommandLineRunner autoConfigureDistroCommandLine(SelfDiagnosticsLevel selfDiagnosticsLevel) { + return args -> { + ILoggerFactory loggerFactorySpi = LoggerFactory.getILoggerFactory(); + if (!(loggerFactorySpi instanceof LoggerContext)) { + return; + } + + LoggerContext loggerContext = (LoggerContext) loggerFactorySpi; + + Level selfDiagLogbackLevel = Level.toLevel(selfDiagnosticsLevel.name()); + + ch.qos.logback.classic.Logger azureMonitorOTelLogger = loggerContext.getLogger("com.azure.monitor.opentelemetry"); + azureMonitorOTelLogger.setLevel(selfDiagLogbackLevel); + }; + } + +} diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/OtelSelfDiag.java b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/OtelSelfDiag.java similarity index 96% rename from sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/OtelSelfDiag.java rename to sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/OtelSelfDiag.java index e9dd1ae9aaa9c..c43526d4897c4 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/OtelSelfDiag.java +++ b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/OtelSelfDiag.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.spring.cloud.autoconfigure.monitor.selfdiagnostics.implementation; +package com.azure.spring.cloud.autoconfigure.monitor.implementation.selfdiagnostics; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration; diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/SelfDiagAutoConfig.java b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/SelfDiagAutoConfig.java similarity index 92% rename from sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/SelfDiagAutoConfig.java rename to sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/SelfDiagAutoConfig.java index e49f145eeed18..68d757b48c011 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/SelfDiagAutoConfig.java +++ b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/SelfDiagAutoConfig.java @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.spring.cloud.autoconfigure.monitor.selfdiagnostics.implementation; +package com.azure.spring.cloud.autoconfigure.monitor.implementation.selfdiagnostics; -import com.azure.spring.cloud.autoconfigure.monitor.selfdiagnostics.SelfDiagnosticsLevel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -21,12 +20,16 @@ @ConditionalOnProperty(name = "otel.sdk.disabled", havingValue = "false", matchIfMissing = true) @Import({DefaultLogConfig.class, LogbackSelfDiagConfig.class}) public class SelfDiagAutoConfig { + private static final Logger LOG = LoggerFactory.getLogger(SelfDiagAutoConfig.class); + static final String SELF_DIAGNOSTICS_LEVEL_ENV_VAR = "APPLICATIONINSIGHTS_SELF_DIAGNOSTICS_LEVEL"; + // Bean to remove @Bean SelfDiagnosticsLevel selfDiagnosticsLevel() { String selfDiagLevelEnvVar = System.getenv(SELF_DIAGNOSTICS_LEVEL_ENV_VAR); + if (selfDiagLevelEnvVar == null) { return SelfDiagnosticsLevel.INFO; } @@ -48,5 +51,4 @@ OtelSelfDiag otelSelfDiag(ApplicationContext applicationContext, Logger selfDiag ExecutionEnvSelfDiag executionEnvSelfDiag(Logger selfDiagnosticsLogger) { return new ExecutionEnvSelfDiag(selfDiagnosticsLogger); } - } diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/SelfDiagnostics.java b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/SelfDiagnostics.java similarity index 69% rename from sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/SelfDiagnostics.java rename to sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/SelfDiagnostics.java index 438682ce429a0..18ba97aa1a474 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/SelfDiagnostics.java +++ b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/SelfDiagnostics.java @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -package com.azure.spring.cloud.autoconfigure.monitor.selfdiagnostics.implementation; +package com.azure.spring.cloud.autoconfigure.monitor.implementation.selfdiagnostics; // Class used for logging final class SelfDiagnostics { diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/SelfDiagnosticsLevel.java b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/SelfDiagnosticsLevel.java new file mode 100644 index 0000000000000..626917bc225d8 --- /dev/null +++ b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/selfdiagnostics/SelfDiagnosticsLevel.java @@ -0,0 +1,14 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.spring.cloud.autoconfigure.monitor.implementation.selfdiagnostics; + +enum SelfDiagnosticsLevel { + + ERROR, + WARN, + INFO, + DEBUG, + TRACE, + OFF +} diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/SelfDiagnosticsLevel.java b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/SelfDiagnosticsLevel.java deleted file mode 100644 index 7c81815e772fd..0000000000000 --- a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/SelfDiagnosticsLevel.java +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.monitor.selfdiagnostics; - -/** - * This enum allows you to define a self-diagnostics level. - */ -public enum SelfDiagnosticsLevel { - - /** - * Error self-diagnostics level - */ - ERROR, - /** - * Warn self-diagnostics level - */ - WARN, - /** - * Info self-diagnostics level - */ - INFO, - - /** - * Debug self-diagnostics level - */ - DEBUG, - - /** - * Trace self-diagnostics level - */ - TRACE -} diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/LogbackSelfDiagConfig.java b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/LogbackSelfDiagConfig.java deleted file mode 100644 index 819768d20e2f7..0000000000000 --- a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/implementation/LogbackSelfDiagConfig.java +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.spring.cloud.autoconfigure.monitor.selfdiagnostics.implementation; - -import ch.qos.logback.classic.Level; -import com.azure.spring.cloud.autoconfigure.monitor.selfdiagnostics.SelfDiagnosticsLevel; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * Logback self-diagnostics features. - */ -@Configuration(proxyBeanMethods = false) -@ConditionalOnClass(ch.qos.logback.classic.LoggerContext.class) -public class LogbackSelfDiagConfig { - - - /** - * To define a logger for self-diagnostics. - * - * @param selfDiagnosticsLevel The self-diagnostics level - * @return A logger for self-diagnostics - */ - @Bean - public Logger selfDiagnosticsLogger(SelfDiagnosticsLevel selfDiagnosticsLevel) { - Logger slf4jLog = LoggerFactory.getLogger(SelfDiagnostics.class); - ch.qos.logback.classic.Logger logbackLogger = (ch.qos.logback.classic.Logger) slf4jLog; - Level logbackLevel = findLogbackLevelFrom(selfDiagnosticsLevel, slf4jLog); - logbackLogger.setLevel(logbackLevel); - return logbackLogger; - } - - private static Level findLogbackLevelFrom(SelfDiagnosticsLevel selfDiagnosticsLevel, Logger slf4jLog) { - try { - return Level.valueOf(selfDiagnosticsLevel.name()); - } catch (IllegalArgumentException e) { - slf4jLog.warn("Unable to find Logback " + selfDiagnosticsLevel.name() + " level.", e); - return Level.INFO; - } - } - -} diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/package-info.java b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/package-info.java deleted file mode 100644 index 5f70619f2381a..0000000000000 --- a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/spring/cloud/autoconfigure/monitor/selfdiagnostics/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -/** - * Package containing the self-diagnostics for Azure Monitor OpenTelemetry Distro / Application Insights in Spring Boot native image Java application. - */ -package com.azure.spring.cloud.autoconfigure.monitor.selfdiagnostics; diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 5e5375d1a6173..c1bef5b5ae447 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/sdk/spring/spring-cloud-azure-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ com.azure.spring.cloud.autoconfigure.monitor.implementation.AzureSpringMonitorAutoConfiguration -com.azure.spring.cloud.autoconfigure.monitor.selfdiagnostics.implementation.SelfDiagAutoConfig +com.azure.spring.cloud.autoconfigure.monitor.implementation.selfdiagnostics.SelfDiagAutoConfig diff --git a/sdk/spring/spring-cloud-azure-starter-monitor/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/SpringContextTest.java b/sdk/spring/spring-cloud-azure-starter-monitor/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/SpringContextTest.java index d0cf2cd17f287..5cfcdea97e93b 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/SpringContextTest.java +++ b/sdk/spring/spring-cloud-azure-starter-monitor/src/test/java/com/azure/spring/cloud/autoconfigure/monitor/implementation/SpringContextTest.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.cloud.autoconfigure.monitor.implementation; -import com.azure.spring.cloud.autoconfigure.monitor.selfdiagnostics.implementation.SelfDiagAutoConfig; +import com.azure.spring.cloud.autoconfigure.monitor.implementation.selfdiagnostics.SelfDiagAutoConfig; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner;