From bef6cd6dd3ab121c20a6191f305d19e81e9ace07 Mon Sep 17 00:00:00 2001 From: harsimar Date: Mon, 2 Dec 2024 16:09:52 -0800 Subject: [PATCH 1/2] test autoconfigure with private build --- .github/workflows/build-common.yml | 18 +++--- agent/agent-tooling/build.gradle.kts | 2 +- agent/agent-tooling/gradle.lockfile | 2 +- .../internal/classicsdk/BytecodeUtilImpl.java | 40 ++++++------- .../internal/classicsdk/TelemetryUtil.java | 6 +- .../internal/common/FriendlyException.java | 2 +- .../internal/configuration/Configuration.java | 2 +- .../configuration/ConfigurationBuilder.java | 8 +-- .../diagnostics/DiagnosticsHelper.java | 6 +- .../internal/exporter/AgentLogExporter.java | 10 ++-- .../exporter/AgentMetricExporter.java | 10 ++-- .../internal/exporter/AgentSpanExporter.java | 12 ++-- .../internal/init/AiContextCustomizer.java | 2 +- .../init/AzureFunctionsInitializer.java | 2 +- .../init/AzureFunctionsLogProcessor.java | 2 +- .../init/AzureMonitorLogProcessor.java | 6 +- .../init/AzureMonitorSpanProcessor.java | 4 +- .../agent/internal/init/FirstEntryPoint.java | 2 +- ...InheritedConnectionStringLogProcessor.java | 2 +- ...nheritedConnectionStringSpanProcessor.java | 2 +- .../init/InheritedRoleNameLogProcessor.java | 2 +- .../init/InheritedRoleNameSpanProcessor.java | 2 +- .../internal/init/LoggingConfigurator.java | 2 +- .../init/PerformanceCounterInitializer.java | 4 +- .../internal/init/RpConfigurationPolling.java | 2 +- .../internal/init/RuntimeConfigurator.java | 6 +- .../agent/internal/init/SecondEntryPoint.java | 34 +++++------ .../internal/init/StatsbeatSpanExporter.java | 4 +- .../AiLegacyHeaderSpanProcessor.java | 2 +- .../DeadLockDetectorPerformanceCounter.java | 4 +- .../PerformanceCounterContainer.java | 2 +- .../ProcessCpuPerformanceCounter.java | 2 +- .../processors/AttributeProcessor.java | 2 +- .../PerformanceMonitoringService.java | 2 +- .../profiler/ProfilingInitializer.java | 4 +- .../triggers/AlertTriggerSpanProcessor.java | 2 +- .../triggers/AlertingSubsystemInit.java | 12 ++-- .../profiler/triggers/GcEventInit.java | 4 +- .../internal/sampling/AiOverrideSampler.java | 2 +- .../agent/internal/sampling/AiSampler.java | 6 +- .../internal/sampling/SamplingOverrides.java | 2 +- .../internal/telemetry/AppIdSupplier.java | 10 ++-- .../telemetry/BatchItemProcessor.java | 8 +-- .../telemetry/BatchItemProcessorBuilder.java | 2 +- .../internal/telemetry/TelemetryClient.java | 56 +++++++++---------- .../telemetry/TelemetryObservers.java | 2 +- .../view/MetricViewAttributesProcessor.java | 2 +- ...logs.ConfigurableLogRecordExporterProvider | 2 +- ...metrics.ConfigurableMetricExporterProvider | 2 +- ...pi.traces.ConfigurableSpanExporterProvider | 2 +- .../internal/PreAggregatedMetricsTest.java | 34 +++++------ .../agent/internal/SamplingTestUtil.java | 2 +- .../agent/internal/common/StringsTest.java | 2 +- .../common/SystemInformationTest.java | 2 +- .../profiler/ProfilingInitializerTest.java | 4 +- .../internal/telemetry/AppIdSupplierTest.java | 2 +- 56 files changed, 187 insertions(+), 187 deletions(-) diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml index 29a988b79be..ba445dc208e 100644 --- a/.github/workflows/build-common.yml +++ b/.github/workflows/build-common.yml @@ -8,7 +8,7 @@ on: required: false env: - EXPORTER_VERSION: 1.0.0-beta.28 # to be updated with the latest version + EXPORTER_VERSION: 1.0.0-beta.1 # to be updated with the latest version jobs: spotless: @@ -47,11 +47,11 @@ jobs: java-version: 17 - name: Using a local standalone exporter dependency? - if: ${{ hashFiles('azure-monitor-opentelemetry-exporter-1.0.0-beta.*.jar') != '' }} + if: ${{ hashFiles('azure-monitor-opentelemetry-autoconfigure-1.0.0-beta.*.jar') != '' }} run: | echo "exporter_version: ${{ env.EXPORTER_VERSION }}" mvn -version - mvn install:install-file -Dfile="azure-monitor-opentelemetry-exporter-${{ env.EXPORTER_VERSION }}.jar" -DpomFile="azure-monitor-opentelemetry-exporter-${{ env.EXPORTER_VERSION }}.pom" -DgroupId="com.azure" -DartifactId="azure-monitor-opentelemetry-exporter" -Dversion="${{ env.EXPORTER_VERSION }}" + mvn install:install-file -Dfile="azure-monitor-opentelemetry-autoconfigure-${{ env.EXPORTER_VERSION }}.jar" -DpomFile="azure-monitor-opentelemetry-autoconfigure-${{ env.EXPORTER_VERSION }}.pom" -DgroupId="com.azure" -DartifactId="azure-monitor-opentelemetry-autoconfigure" -Dversion="${{ env.EXPORTER_VERSION }}" - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -92,11 +92,11 @@ jobs: java-version: 17 - name: Using a local standalone exporter dependency? - if: ${{ hashFiles('azure-monitor-opentelemetry-exporter-1.0.0-beta.*.jar') != '' }} + if: ${{ hashFiles('azure-monitor-opentelemetry-autoconfigure-1.0.0-beta.*.jar') != '' }} run: | echo "exporter_version: ${{ env.EXPORTER_VERSION }}" mvn -version - mvn install:install-file -Dfile="azure-monitor-opentelemetry-exporter-${{ env.EXPORTER_VERSION }}.jar" -DpomFile="azure-monitor-opentelemetry-exporter-${{ env.EXPORTER_VERSION }}.pom" -DgroupId="com.azure" -DartifactId="azure-monitor-opentelemetry-exporter" -Dversion="${{ env.EXPORTER_VERSION }}" + mvn install:install-file -Dfile="azure-monitor-opentelemetry-autoconfigure-${{ env.EXPORTER_VERSION }}.jar" -DpomFile="azure-monitor-opentelemetry-autoconfigure-${{ env.EXPORTER_VERSION }}.pom" -DgroupId="com.azure" -DartifactId="azure-monitor-opentelemetry-autoconfigure" -Dversion="${{ env.EXPORTER_VERSION }}" - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -153,11 +153,11 @@ jobs: java-version: 17 - name: Using a local standalone exporter dependency? - if: ${{ hashFiles('azure-monitor-opentelemetry-exporter-1.0.0-beta.*.jar') != '' }} + if: ${{ hashFiles('azure-monitor-opentelemetry-autoconfigure-1.0.0-beta.*.jar') != '' }} run: | echo "exporter_version: ${{ env.EXPORTER_VERSION }}" mvn -version - mvn install:install-file -Dfile="azure-monitor-opentelemetry-exporter-${{ env.EXPORTER_VERSION }}.jar" -DpomFile="azure-monitor-opentelemetry-exporter-${{ env.EXPORTER_VERSION }}.pom" -DgroupId="com.azure" -DartifactId="azure-monitor-opentelemetry-exporter" -Dversion="${{ env.EXPORTER_VERSION }}" + mvn install:install-file -Dfile="azure-monitor-opentelemetry-autoconfigure-${{ env.EXPORTER_VERSION }}.jar" -DpomFile="azure-monitor-opentelemetry-autoconfigure-${{ env.EXPORTER_VERSION }}.pom" -DgroupId="com.azure" -DartifactId="azure-monitor-opentelemetry-autoconfigure" -Dversion="${{ env.EXPORTER_VERSION }}" - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -203,11 +203,11 @@ jobs: java-version: 17 - name: Using a local standalone exporter dependency? - if: ${{ hashFiles('azure-monitor-opentelemetry-exporter-1.0.0-beta.*.jar') != '' }} + if: ${{ hashFiles('azure-monitor-opentelemetry-autoconfigure-1.0.0-beta.*.jar') != '' }} run: | echo "exporter_version: ${{ env.EXPORTER_VERSION }}" mvn -version - mvn install:install-file -Dfile="azure-monitor-opentelemetry-exporter-${{ env.EXPORTER_VERSION }}.jar" -DpomFile="azure-monitor-opentelemetry-exporter-${{ env.EXPORTER_VERSION }}.pom" -DgroupId="com.azure" -DartifactId="azure-monitor-opentelemetry-exporter" -Dversion="${{ env.EXPORTER_VERSION }}" + mvn install:install-file -Dfile="azure-monitor-opentelemetry-autoconfigure-${{ env.EXPORTER_VERSION }}.jar" -DpomFile="azure-monitor-opentelemetry-autoconfigure-${{ env.EXPORTER_VERSION }}.pom" -DgroupId="com.azure" -DartifactId="azure-monitor-opentelemetry-autoconfigure" -Dversion="${{ env.EXPORTER_VERSION }}" - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/agent/agent-tooling/build.gradle.kts b/agent/agent-tooling/build.gradle.kts index 9f1181c1d15..61640e7c797 100644 --- a/agent/agent-tooling/build.gradle.kts +++ b/agent/agent-tooling/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { implementation(project(":agent:agent-profiler:agent-diagnostics")) implementation(project(":etw:java")) - implementation("com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.31") + implementation("com.azure:azure-monitor-opentelemetry-autoconfigure:1.0.0-beta.1") compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap") compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling") compileOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap") diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index 114ba00ea77..008c5547a90 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -9,7 +9,7 @@ com.azure:azure-core-http-netty:1.15.7=runtimeClasspath com.azure:azure-core:1.54.1=runtimeClasspath com.azure:azure-identity:1.14.2=runtimeClasspath com.azure:azure-json:1.3.0=runtimeClasspath -com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.31=runtimeClasspath +com.azure:azure-monitor-opentelemetry-autoconfigure:1.0.0-beta.1=runtimeClasspath com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.azure:azure-storage-blob:12.29.0=runtimeClasspath com.azure:azure-storage-common:12.28.0=runtimeClasspath diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/BytecodeUtilImpl.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/BytecodeUtilImpl.java index 25097ea9cbe..3c1f3f62ee0 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/BytecodeUtilImpl.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/BytecodeUtilImpl.java @@ -7,26 +7,26 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import com.azure.monitor.opentelemetry.exporter.implementation.AiSemanticAttributes; -import com.azure.monitor.opentelemetry.exporter.implementation.OperationNames; -import com.azure.monitor.opentelemetry.exporter.implementation.SamplingScoreGeneratorV2; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.AbstractTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.AvailabilityTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.EventTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.ExceptionTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.MessageTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.MetricPointBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.MetricTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.PageViewTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.RemoteDependencyTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.RequestTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.models.ContextTagKeys; -import com.azure.monitor.opentelemetry.exporter.implementation.models.SeverityLevel; -import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.Feature; -import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.FeatureStatsbeat; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.FormattedDuration; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.FormattedTime; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.OperationNames; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.SamplingScoreGeneratorV2; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.AbstractTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.AvailabilityTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.EventTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.ExceptionTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.MessageTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.MetricPointBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.MetricTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.PageViewTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.RemoteDependencyTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.RequestTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.ContextTagKeys; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.SeverityLevel; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.Feature; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.FeatureStatsbeat; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.FormattedDuration; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.FormattedTime; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings; import com.microsoft.applicationinsights.agent.bootstrap.BytecodeUtil.BytecodeUtilDelegate; import com.microsoft.applicationinsights.agent.internal.init.RuntimeConfiguration; import com.microsoft.applicationinsights.agent.internal.init.RuntimeConfigurator; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtil.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtil.java index f4273d4143b..5fc3b323a84 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtil.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtil.java @@ -3,9 +3,9 @@ package com.microsoft.applicationinsights.agent.internal.classicsdk; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.ExceptionDetailBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.StackFrameBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.ExceptionDetailBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.StackFrameBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings; import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/common/FriendlyException.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/common/FriendlyException.java index 2889ccf0472..3d1b50c203c 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/common/FriendlyException.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/common/FriendlyException.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.common; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings; import javax.annotation.Nullable; public class FriendlyException extends RuntimeException { diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java index 8376939a68a..a39a66b454c 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java @@ -7,7 +7,7 @@ import static java.util.concurrent.TimeUnit.DAYS; import static java.util.concurrent.TimeUnit.MINUTES; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.PropertyHelper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.PropertyHelper; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.applicationinsights.agent.internal.common.FriendlyException; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java index d5c4b4549e5..c141e52a8b2 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java @@ -3,10 +3,10 @@ package com.microsoft.applicationinsights.agent.internal.configuration; -import com.azure.monitor.opentelemetry.exporter.implementation.SemanticAttributes; -import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.RpAttachType; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.HostName; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.SemanticAttributes; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.RpAttachType; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.HostName; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java index 0864f55008d..2646025ac7d 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java @@ -3,9 +3,9 @@ package com.microsoft.applicationinsights.agent.internal.diagnostics; -import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.RpAttachType; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.PropertyHelper; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.RpAttachType; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.PropertyHelper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings; import java.nio.file.Files; import java.nio.file.Path; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentLogExporter.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentLogExporter.java index 054f7f15605..cfff5e5cc77 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentLogExporter.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentLogExporter.java @@ -3,13 +3,13 @@ package com.microsoft.applicationinsights.agent.internal.exporter; -import static com.azure.monitor.opentelemetry.exporter.implementation.utils.AzureMonitorMsgId.EXPORTER_MAPPING_ERROR; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.AzureMonitorMsgId.EXPORTER_MAPPING_ERROR; import static com.microsoft.applicationinsights.agent.internal.exporter.ExporterUtils.shouldSample; -import com.azure.monitor.opentelemetry.exporter.implementation.LogDataMapper; -import com.azure.monitor.opentelemetry.exporter.implementation.logging.OperationLogger; -import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem; -import com.azure.monitor.opentelemetry.exporter.implementation.quickpulse.QuickPulse; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.LogDataMapper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.logging.OperationLogger; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.QuickPulse; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.SamplingOverride; import com.microsoft.applicationinsights.agent.internal.sampling.SamplingOverrides; import com.microsoft.applicationinsights.agent.internal.telemetry.BatchItemProcessor; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentMetricExporter.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentMetricExporter.java index 5c496c1e384..b52be024dd1 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentMetricExporter.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentMetricExporter.java @@ -3,12 +3,12 @@ package com.microsoft.applicationinsights.agent.internal.exporter; -import static com.azure.monitor.opentelemetry.exporter.implementation.utils.AzureMonitorMsgId.EXPORTER_MAPPING_ERROR; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.AzureMonitorMsgId.EXPORTER_MAPPING_ERROR; -import com.azure.monitor.opentelemetry.exporter.implementation.MetricDataMapper; -import com.azure.monitor.opentelemetry.exporter.implementation.logging.OperationLogger; -import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.MetricDataMapper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.logging.OperationLogger; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings; import com.microsoft.applicationinsights.agent.internal.telemetry.BatchItemProcessor; import com.microsoft.applicationinsights.agent.internal.telemetry.MetricFilter; import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentSpanExporter.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentSpanExporter.java index 7cde90cc7d0..8afa59ed925 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentSpanExporter.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentSpanExporter.java @@ -3,13 +3,13 @@ package com.microsoft.applicationinsights.agent.internal.exporter; -import static com.azure.monitor.opentelemetry.exporter.implementation.utils.AzureMonitorMsgId.EXPORTER_MAPPING_ERROR; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.AzureMonitorMsgId.EXPORTER_MAPPING_ERROR; -import com.azure.monitor.opentelemetry.exporter.implementation.SpanDataMapper; -import com.azure.monitor.opentelemetry.exporter.implementation.logging.OperationLogger; -import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem; -import com.azure.monitor.opentelemetry.exporter.implementation.quickpulse.QuickPulse; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.SpanDataMapper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.logging.OperationLogger; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.QuickPulse; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings; import com.microsoft.applicationinsights.agent.internal.telemetry.BatchItemProcessor; import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient; import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryObservers; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiContextCustomizer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiContextCustomizer.java index 5bf6ba32859..c32034ec2bf 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiContextCustomizer.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiContextCustomizer.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.init; -import com.azure.monitor.opentelemetry.exporter.implementation.AiSemanticAttributes; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureFunctionsInitializer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureFunctionsInitializer.java index 33b4262d9d9..a22857eea9e 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureFunctionsInitializer.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureFunctionsInitializer.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.init; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings; import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; import io.opentelemetry.javaagent.bootstrap.ClassFileTransformerHolder; import io.opentelemetry.javaagent.bootstrap.InstrumentationHolder; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureFunctionsLogProcessor.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureFunctionsLogProcessor.java index 4bcf0120434..d558fada428 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureFunctionsLogProcessor.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureFunctionsLogProcessor.java @@ -4,7 +4,7 @@ package com.microsoft.applicationinsights.agent.internal.init; import com.azure.core.util.logging.ClientLogger; -import com.azure.monitor.opentelemetry.exporter.implementation.AiSemanticAttributes; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes; import com.microsoft.applicationinsights.agent.bootstrap.AzureFunctionsCustomDimensions; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.logs.LogRecordProcessor; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureMonitorLogProcessor.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureMonitorLogProcessor.java index e19504f257b..41b77fc3d88 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureMonitorLogProcessor.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureMonitorLogProcessor.java @@ -4,9 +4,9 @@ package com.microsoft.applicationinsights.agent.internal.init; import com.azure.core.util.logging.ClientLogger; -import com.azure.monitor.opentelemetry.exporter.implementation.AiSemanticAttributes; -import com.azure.monitor.opentelemetry.exporter.implementation.OperationNames; -import com.azure.monitor.opentelemetry.exporter.implementation.SemanticAttributes; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.OperationNames; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.SemanticAttributes; import io.opentelemetry.api.trace.Span; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.instrumenter.LocalRootSpan; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureMonitorSpanProcessor.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureMonitorSpanProcessor.java index 8c2e0904d0b..b71d4d68337 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureMonitorSpanProcessor.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AzureMonitorSpanProcessor.java @@ -3,8 +3,8 @@ package com.microsoft.applicationinsights.agent.internal.init; -import com.azure.monitor.opentelemetry.exporter.implementation.AiSemanticAttributes; -import com.azure.monitor.opentelemetry.exporter.implementation.OperationNames; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.OperationNames; import com.microsoft.applicationinsights.agent.bootstrap.AzureFunctionsCustomDimensions; import com.microsoft.applicationinsights.agent.internal.configuration.ConfigurationBuilder; import io.opentelemetry.api.trace.Span; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java index 2902fc269cf..45c69a3fff8 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java @@ -6,7 +6,7 @@ import static com.microsoft.applicationinsights.agent.internal.diagnostics.MsgId.INITIALIZATION_SUCCESS; import static com.microsoft.applicationinsights.agent.internal.diagnostics.MsgId.STARTUP_FAILURE_ERROR; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.PropertyHelper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.PropertyHelper; import com.google.auto.service.AutoService; import com.microsoft.applicationinsights.agent.internal.common.FriendlyException; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedConnectionStringLogProcessor.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedConnectionStringLogProcessor.java index 8d22def17fc..08d9127b150 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedConnectionStringLogProcessor.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedConnectionStringLogProcessor.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.init; -import com.azure.monitor.opentelemetry.exporter.implementation.AiSemanticAttributes; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.logs.LogRecordProcessor; import io.opentelemetry.sdk.logs.ReadWriteLogRecord; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedConnectionStringSpanProcessor.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedConnectionStringSpanProcessor.java index 4276245bd5a..c76c8615ab3 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedConnectionStringSpanProcessor.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedConnectionStringSpanProcessor.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.init; -import com.azure.monitor.opentelemetry.exporter.implementation.AiSemanticAttributes; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.trace.ReadWriteSpan; import io.opentelemetry.sdk.trace.ReadableSpan; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedRoleNameLogProcessor.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedRoleNameLogProcessor.java index da1701f5cd6..26266f6a0c0 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedRoleNameLogProcessor.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedRoleNameLogProcessor.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.init; -import com.azure.monitor.opentelemetry.exporter.implementation.AiSemanticAttributes; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.logs.LogRecordProcessor; import io.opentelemetry.sdk.logs.ReadWriteLogRecord; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedRoleNameSpanProcessor.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedRoleNameSpanProcessor.java index d1e4d93c047..f612557bbb3 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedRoleNameSpanProcessor.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/InheritedRoleNameSpanProcessor.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.init; -import com.azure.monitor.opentelemetry.exporter.implementation.AiSemanticAttributes; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes; import io.opentelemetry.context.Context; import io.opentelemetry.sdk.trace.ReadWriteSpan; import io.opentelemetry.sdk.trace.ReadableSpan; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/LoggingConfigurator.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/LoggingConfigurator.java index 627c1797093..819b49d2c8b 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/LoggingConfigurator.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/LoggingConfigurator.java @@ -19,7 +19,7 @@ import ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy; import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy; import ch.qos.logback.core.util.FileSize; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.PropertyHelper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.PropertyHelper; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration; import com.microsoft.applicationinsights.agent.internal.diagnostics.DiagnosticsHelper; import com.microsoft.applicationinsights.agent.internal.diagnostics.etw.EtwAppender; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/PerformanceCounterInitializer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/PerformanceCounterInitializer.java index a17fb4485cd..3a4510000e0 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/PerformanceCounterInitializer.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/PerformanceCounterInitializer.java @@ -5,8 +5,8 @@ import static com.microsoft.applicationinsights.agent.internal.diagnostics.MsgId.CUSTOM_JMX_METRIC_ERROR; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.PropertyHelper; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.PropertyHelper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration; import com.microsoft.applicationinsights.agent.internal.perfcounter.DeadLockDetectorPerformanceCounter; import com.microsoft.applicationinsights.agent.internal.perfcounter.FreeMemoryPerformanceCounter; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/RpConfigurationPolling.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/RpConfigurationPolling.java index c27d69a4de5..d1e15d7ab59 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/RpConfigurationPolling.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/RpConfigurationPolling.java @@ -5,7 +5,7 @@ import static java.util.concurrent.TimeUnit.SECONDS; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.ThreadPoolUtils; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.ThreadPoolUtils; import com.microsoft.applicationinsights.agent.internal.configuration.ConfigurationBuilder; import com.microsoft.applicationinsights.agent.internal.configuration.RpConfiguration; import com.microsoft.applicationinsights.agent.internal.configuration.RpConfigurationBuilder; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/RuntimeConfigurator.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/RuntimeConfigurator.java index c5a569a62c3..5f41773edf0 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/RuntimeConfigurator.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/RuntimeConfigurator.java @@ -6,9 +6,9 @@ import static java.util.concurrent.TimeUnit.MINUTES; import ch.qos.logback.classic.LoggerContext; -import com.azure.monitor.opentelemetry.exporter.implementation.heartbeat.HeartbeatExporter; -import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.heartbeat.HeartbeatExporter; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings; import com.microsoft.applicationinsights.agent.internal.classicsdk.BytecodeUtilImpl; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration; import com.microsoft.applicationinsights.agent.internal.configuration.SnippetConfiguration; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java index 9350382b17b..ac36f2a80f2 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java @@ -6,23 +6,23 @@ import static java.util.concurrent.TimeUnit.MINUTES; import com.azure.core.util.logging.ClientLogger; -import com.azure.monitor.opentelemetry.exporter.implementation.AzureMonitorExporterProviderKeys; -import com.azure.monitor.opentelemetry.exporter.implementation.AzureMonitorLogRecordExporterProvider; -import com.azure.monitor.opentelemetry.exporter.implementation.AzureMonitorMetricExporterProvider; -import com.azure.monitor.opentelemetry.exporter.implementation.AzureMonitorSpanExporterProvider; -import com.azure.monitor.opentelemetry.exporter.implementation.LogDataMapper; -import com.azure.monitor.opentelemetry.exporter.implementation.MetricDataMapper; -import com.azure.monitor.opentelemetry.exporter.implementation.SpanDataMapper; -import com.azure.monitor.opentelemetry.exporter.implementation.configuration.ConnectionString; -import com.azure.monitor.opentelemetry.exporter.implementation.heartbeat.HeartbeatExporter; -import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem; -import com.azure.monitor.opentelemetry.exporter.implementation.quickpulse.QuickPulse; -import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.Feature; -import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.StatsbeatModule; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.AzureMonitorHelper; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.PropertyHelper; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.TempDirs; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AzureMonitorExporterProviderKeys; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AzureMonitorLogRecordExporterProvider; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AzureMonitorMetricExporterProvider; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AzureMonitorSpanExporterProvider; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.LogDataMapper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.MetricDataMapper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.SpanDataMapper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.configuration.ConnectionString; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.heartbeat.HeartbeatExporter; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.QuickPulse; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.Feature; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.StatsbeatModule; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.AzureMonitorHelper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.PropertyHelper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.TempDirs; import com.google.auto.service.AutoService; import com.microsoft.applicationinsights.agent.bootstrap.AzureFunctions; import com.microsoft.applicationinsights.agent.bootstrap.preagg.AiContextCustomizerHolder; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/StatsbeatSpanExporter.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/StatsbeatSpanExporter.java index 35964769733..4d8eb34d534 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/StatsbeatSpanExporter.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/StatsbeatSpanExporter.java @@ -3,9 +3,9 @@ package com.microsoft.applicationinsights.agent.internal.init; -import static com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.Instrumentations.AZURE_OPENTELEMETRY; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.Instrumentations.AZURE_OPENTELEMETRY; -import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.StatsbeatModule; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.StatsbeatModule; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.export.SpanExporter; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/legacyheaders/AiLegacyHeaderSpanProcessor.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/legacyheaders/AiLegacyHeaderSpanProcessor.java index d67f692b9a6..55b57fda70e 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/legacyheaders/AiLegacyHeaderSpanProcessor.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/legacyheaders/AiLegacyHeaderSpanProcessor.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.legacyheaders; -import com.azure.monitor.opentelemetry.exporter.implementation.AiSemanticAttributes; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.context.Context; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/DeadLockDetectorPerformanceCounter.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/DeadLockDetectorPerformanceCounter.java index 804568c3617..fd815057859 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/DeadLockDetectorPerformanceCounter.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/DeadLockDetectorPerformanceCounter.java @@ -3,8 +3,8 @@ package com.microsoft.applicationinsights.agent.internal.perfcounter; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.MessageTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.FormattedTime; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.MessageTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.FormattedTime; import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient; import java.lang.management.ManagementFactory; import java.lang.management.MonitorInfo; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/PerformanceCounterContainer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/PerformanceCounterContainer.java index 892506527dd..0670d82a4ac 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/PerformanceCounterContainer.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/PerformanceCounterContainer.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.perfcounter; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.ThreadPoolUtils; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.ThreadPoolUtils; import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient; import java.util.List; import java.util.Locale; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/ProcessCpuPerformanceCounter.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/ProcessCpuPerformanceCounter.java index 99588ca6516..375624581ce 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/ProcessCpuPerformanceCounter.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/perfcounter/ProcessCpuPerformanceCounter.java @@ -6,7 +6,7 @@ import static com.microsoft.applicationinsights.agent.internal.perfcounter.MetricNames.PROCESS_CPU_PERCENTAGE; import static com.microsoft.applicationinsights.agent.internal.perfcounter.MetricNames.PROCESS_CPU_PERCENTAGE_NORMALIZED; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.CpuPerformanceCounterCalculator; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.CpuPerformanceCounterCalculator; import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient; import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/processors/AttributeProcessor.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/processors/AttributeProcessor.java index 42962568233..0edab8dfabe 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/processors/AttributeProcessor.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/processors/AttributeProcessor.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.processors; -import com.azure.monitor.opentelemetry.exporter.implementation.SpanDataMapper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.SpanDataMapper; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.ProcessorAction; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.ProcessorConfig; import io.opentelemetry.api.common.AttributeKey; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/PerformanceMonitoringService.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/PerformanceMonitoringService.java index 3aca4d542da..a49d2f24d5f 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/PerformanceMonitoringService.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/PerformanceMonitoringService.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.profiler; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.ThreadPoolUtils; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.ThreadPoolUtils; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration; import com.microsoft.applicationinsights.agent.internal.configuration.GcReportingLevel; import com.microsoft.applicationinsights.agent.internal.diagnostics.PidFinder; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializer.java index 46e14920d54..cda34a13d9a 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializer.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializer.java @@ -7,8 +7,8 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.http.policy.DefaultRedirectStrategy; import com.azure.core.http.policy.RedirectPolicy; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.SystemInformation; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.ThreadPoolUtils; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.SystemInformation; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.ThreadPoolUtils; import com.microsoft.applicationinsights.agent.internal.common.FriendlyException; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration; import com.microsoft.applicationinsights.agent.internal.configuration.GcReportingLevel; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/AlertTriggerSpanProcessor.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/AlertTriggerSpanProcessor.java index cab67ea5900..0c019f32821 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/AlertTriggerSpanProcessor.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/AlertTriggerSpanProcessor.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.profiler.triggers; -import com.azure.monitor.opentelemetry.exporter.implementation.RequestChecker; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.RequestChecker; import com.microsoft.applicationinsights.alerting.AlertingSubsystem; import com.microsoft.applicationinsights.alerting.analysis.TimeSource; import com.microsoft.applicationinsights.alerting.analysis.data.TelemetryDataPoint; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/AlertingSubsystemInit.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/AlertingSubsystemInit.java index 0b8f5e19461..23b887db2db 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/AlertingSubsystemInit.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/AlertingSubsystemInit.java @@ -5,12 +5,12 @@ import static com.microsoft.applicationinsights.agent.internal.perfcounter.MetricNames.TOTAL_CPU_PERCENTAGE; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.EventTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.MessageTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.models.MetricDataPoint; -import com.azure.monitor.opentelemetry.exporter.implementation.models.MetricsData; -import com.azure.monitor.opentelemetry.exporter.implementation.models.MonitorDomain; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.FormattedTime; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.EventTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.MessageTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.MetricDataPoint; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.MetricsData; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.MonitorDomain; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.FormattedTime; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration; import com.microsoft.applicationinsights.agent.internal.configuration.GcReportingLevel; import com.microsoft.applicationinsights.agent.internal.profiler.Profiler; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/GcEventInit.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/GcEventInit.java index 81592d06c8a..8f58ccfa30d 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/GcEventInit.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/triggers/GcEventInit.java @@ -3,8 +3,8 @@ package com.microsoft.applicationinsights.agent.internal.profiler.triggers; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.EventTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.FormattedTime; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.EventTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.FormattedTime; import com.microsoft.applicationinsights.agent.internal.configuration.GcReportingLevel; import com.microsoft.applicationinsights.agent.internal.profiler.util.ServiceLoaderUtil; import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiOverrideSampler.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiOverrideSampler.java index 977f489490a..5946be670af 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiOverrideSampler.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiOverrideSampler.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.sampling; -import com.azure.monitor.opentelemetry.exporter.implementation.RequestChecker; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.RequestChecker; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.SamplingOverride; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.Span; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiSampler.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiSampler.java index 91c56b30397..f9d0b4575c6 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiSampler.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiSampler.java @@ -3,9 +3,9 @@ package com.microsoft.applicationinsights.agent.internal.sampling; -import com.azure.monitor.opentelemetry.exporter.implementation.AiSemanticAttributes; -import com.azure.monitor.opentelemetry.exporter.implementation.RequestChecker; -import com.azure.monitor.opentelemetry.exporter.implementation.SamplingScoreGeneratorV2; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.RequestChecker; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.SamplingScoreGeneratorV2; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/SamplingOverrides.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/SamplingOverrides.java index 0dacee56a5a..436aaeb3431 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/SamplingOverrides.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/SamplingOverrides.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.sampling; -import com.azure.monitor.opentelemetry.exporter.implementation.SpanDataMapper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.SpanDataMapper; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.MatchType; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.SamplingOverride; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.SamplingOverrideAttribute; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/AppIdSupplier.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/AppIdSupplier.java index 1b02427dd4a..39bd2ad38c3 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/AppIdSupplier.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/AppIdSupplier.java @@ -3,17 +3,17 @@ package com.microsoft.applicationinsights.agent.internal.telemetry; -import static com.azure.monitor.opentelemetry.exporter.implementation.utils.AzureMonitorMsgId.APP_ID_ERROR; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.AzureMonitorMsgId.APP_ID_ERROR; import static java.util.concurrent.TimeUnit.SECONDS; import com.azure.core.http.HttpMethod; import com.azure.core.http.HttpRequest; import com.azure.core.http.HttpResponse; import com.azure.core.util.logging.ClientLogger; -import com.azure.monitor.opentelemetry.exporter.implementation.configuration.ConnectionString; -import com.azure.monitor.opentelemetry.exporter.implementation.logging.NetworkFriendlyExceptions; -import com.azure.monitor.opentelemetry.exporter.implementation.logging.OperationLogger; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.ThreadPoolUtils; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.configuration.ConnectionString; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.logging.NetworkFriendlyExceptions; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.logging.OperationLogger; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.ThreadPoolUtils; import com.microsoft.applicationinsights.agent.internal.httpclient.LazyHttpClient; import java.net.MalformedURLException; import java.net.URL; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java index 73054ff8e43..3de2f6b6f06 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java @@ -3,12 +3,12 @@ package com.microsoft.applicationinsights.agent.internal.telemetry; -import static com.azure.monitor.opentelemetry.exporter.implementation.utils.AzureMonitorMsgId.BATCH_ITEM_PROCESSOR_ERROR; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.AzureMonitorMsgId.BATCH_ITEM_PROCESSOR_ERROR; import com.azure.core.util.logging.ClientLogger; -import com.azure.monitor.opentelemetry.exporter.implementation.logging.OperationLogger; -import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem; -import com.azure.monitor.opentelemetry.exporter.implementation.pipeline.TelemetryItemExporter; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.logging.OperationLogger; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryItemExporter; import io.opentelemetry.api.logs.LoggerProvider; import io.opentelemetry.internal.shaded.jctools.queues.MpscArrayQueue; import io.opentelemetry.javaagent.bootstrap.CallDepth; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessorBuilder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessorBuilder.java index 91d2445a230..599ad018f39 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessorBuilder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessorBuilder.java @@ -6,7 +6,7 @@ import static io.opentelemetry.api.internal.Utils.checkArgument; import static java.util.Objects.requireNonNull; -import com.azure.monitor.opentelemetry.exporter.implementation.pipeline.TelemetryItemExporter; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryItemExporter; import java.util.concurrent.TimeUnit; // copied from io.opentelemetry.sdk.trace.export.BatchSpanProcessorBuilder diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryClient.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryClient.java index f719e8ee12f..b31f24107c3 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryClient.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryClient.java @@ -4,34 +4,34 @@ package com.microsoft.applicationinsights.agent.internal.telemetry; import com.azure.core.http.HttpPipeline; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.AbstractTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.AvailabilityTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.EventTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.ExceptionTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.MessageTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.MetricTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.PageViewTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.RemoteDependencyTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.RequestTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.configuration.ConnectionString; -import com.azure.monitor.opentelemetry.exporter.implementation.configuration.StatsbeatConnectionString; -import com.azure.monitor.opentelemetry.exporter.implementation.localstorage.LocalStorageTelemetryPipelineListener; -import com.azure.monitor.opentelemetry.exporter.implementation.logging.DiagnosticTelemetryPipelineListener; -import com.azure.monitor.opentelemetry.exporter.implementation.models.ContextTagKeys; -import com.azure.monitor.opentelemetry.exporter.implementation.models.MetricDataPoint; -import com.azure.monitor.opentelemetry.exporter.implementation.models.MetricsData; -import com.azure.monitor.opentelemetry.exporter.implementation.models.MonitorDomain; -import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem; -import com.azure.monitor.opentelemetry.exporter.implementation.pipeline.TelemetryItemExporter; -import com.azure.monitor.opentelemetry.exporter.implementation.pipeline.TelemetryPipeline; -import com.azure.monitor.opentelemetry.exporter.implementation.pipeline.TelemetryPipelineListener; -import com.azure.monitor.opentelemetry.exporter.implementation.quickpulse.QuickPulse; -import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.NetworkStatsbeatHttpPipelinePolicy; -import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.StatsbeatModule; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.PropertyHelper; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.ResourceParser; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.TempDirs; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.AbstractTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.AvailabilityTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.EventTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.ExceptionTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.MessageTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.MetricTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.PageViewTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.RemoteDependencyTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.RequestTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.configuration.ConnectionString; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.configuration.StatsbeatConnectionString; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.localstorage.LocalStorageTelemetryPipelineListener; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.logging.DiagnosticTelemetryPipelineListener; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.ContextTagKeys; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.MetricDataPoint; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.MetricsData; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.MonitorDomain; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryItemExporter; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryPipeline; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryPipelineListener; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.QuickPulse; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.NetworkStatsbeatHttpPipelinePolicy; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.StatsbeatModule; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.PropertyHelper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.ResourceParser; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.TempDirs; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration; import com.microsoft.applicationinsights.agent.internal.httpclient.LazyHttpClient; import io.opentelemetry.sdk.common.CompletableResultCode; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryObservers.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryObservers.java index dec82479db4..f993a9c6f76 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryObservers.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryObservers.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal.telemetry; -import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Consumer; diff --git a/agent/agent-tooling/src/main/java/io/opentelemetry/sdk/metrics/internal/view/MetricViewAttributesProcessor.java b/agent/agent-tooling/src/main/java/io/opentelemetry/sdk/metrics/internal/view/MetricViewAttributesProcessor.java index fa6317f49f8..e77d26036cb 100644 --- a/agent/agent-tooling/src/main/java/io/opentelemetry/sdk/metrics/internal/view/MetricViewAttributesProcessor.java +++ b/agent/agent-tooling/src/main/java/io/opentelemetry/sdk/metrics/internal/view/MetricViewAttributesProcessor.java @@ -3,7 +3,7 @@ package io.opentelemetry.sdk.metrics.internal.view; -import com.azure.monitor.opentelemetry.exporter.implementation.AiSemanticAttributes; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes; import com.microsoft.applicationinsights.agent.internal.init.AiContextKeys; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; diff --git a/agent/agent-tooling/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.logs.ConfigurableLogRecordExporterProvider b/agent/agent-tooling/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.logs.ConfigurableLogRecordExporterProvider index 75184514bea..a8049abc20c 100644 --- a/agent/agent-tooling/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.logs.ConfigurableLogRecordExporterProvider +++ b/agent/agent-tooling/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.logs.ConfigurableLogRecordExporterProvider @@ -1 +1 @@ -com.azure.monitor.opentelemetry.exporter.implementation.AzureMonitorLogRecordExporterProvider +com.azure.monitor.opentelemetry.autoconfigure.implementation.AzureMonitorLogRecordExporterProvider diff --git a/agent/agent-tooling/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.metrics.ConfigurableMetricExporterProvider b/agent/agent-tooling/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.metrics.ConfigurableMetricExporterProvider index d1cb3d49ac3..892caf738cc 100644 --- a/agent/agent-tooling/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.metrics.ConfigurableMetricExporterProvider +++ b/agent/agent-tooling/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.metrics.ConfigurableMetricExporterProvider @@ -1 +1 @@ -com.azure.monitor.opentelemetry.exporter.implementation.AzureMonitorMetricExporterProvider +com.azure.monitor.opentelemetry.autoconfigure.implementation.AzureMonitorMetricExporterProvider diff --git a/agent/agent-tooling/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider b/agent/agent-tooling/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider index 2389b4312c7..5ec5c5caa16 100644 --- a/agent/agent-tooling/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider +++ b/agent/agent-tooling/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider @@ -1 +1 @@ -com.azure.monitor.opentelemetry.exporter.implementation.AzureMonitorSpanExporterProvider +com.azure.monitor.opentelemetry.autoconfigure.implementation.AzureMonitorSpanExporterProvider diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/PreAggregatedMetricsTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/PreAggregatedMetricsTest.java index 95860ebaa03..89c4bb39852 100644 --- a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/PreAggregatedMetricsTest.java +++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/PreAggregatedMetricsTest.java @@ -3,26 +3,26 @@ package com.microsoft.applicationinsights.agent.internal; -import static com.azure.monitor.opentelemetry.exporter.implementation.preaggregatedmetrics.DependencyExtractor.DEPENDENCIES_DURATION; -import static com.azure.monitor.opentelemetry.exporter.implementation.preaggregatedmetrics.DependencyExtractor.DEPENDENCY_RESULT_CODE; -import static com.azure.monitor.opentelemetry.exporter.implementation.preaggregatedmetrics.DependencyExtractor.DEPENDENCY_SUCCESS; -import static com.azure.monitor.opentelemetry.exporter.implementation.preaggregatedmetrics.DependencyExtractor.DEPENDENCY_TARGET; -import static com.azure.monitor.opentelemetry.exporter.implementation.preaggregatedmetrics.DependencyExtractor.DEPENDENCY_TYPE; -import static com.azure.monitor.opentelemetry.exporter.implementation.preaggregatedmetrics.ExtractorHelper.FALSE; -import static com.azure.monitor.opentelemetry.exporter.implementation.preaggregatedmetrics.ExtractorHelper.MS_IS_AUTOCOLLECTED; -import static com.azure.monitor.opentelemetry.exporter.implementation.preaggregatedmetrics.ExtractorHelper.MS_METRIC_ID; -import static com.azure.monitor.opentelemetry.exporter.implementation.preaggregatedmetrics.ExtractorHelper.OPERATION_SYNTHETIC; -import static com.azure.monitor.opentelemetry.exporter.implementation.preaggregatedmetrics.ExtractorHelper.TRUE; -import static com.azure.monitor.opentelemetry.exporter.implementation.preaggregatedmetrics.RequestExtractor.REQUESTS_DURATION; -import static com.azure.monitor.opentelemetry.exporter.implementation.preaggregatedmetrics.RequestExtractor.REQUEST_RESULT_CODE; -import static com.azure.monitor.opentelemetry.exporter.implementation.preaggregatedmetrics.RequestExtractor.REQUEST_SUCCESS; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.DependencyExtractor.DEPENDENCIES_DURATION; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.DependencyExtractor.DEPENDENCY_RESULT_CODE; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.DependencyExtractor.DEPENDENCY_SUCCESS; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.DependencyExtractor.DEPENDENCY_TARGET; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.DependencyExtractor.DEPENDENCY_TYPE; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.ExtractorHelper.FALSE; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.ExtractorHelper.MS_IS_AUTOCOLLECTED; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.ExtractorHelper.MS_METRIC_ID; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.ExtractorHelper.OPERATION_SYNTHETIC; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.ExtractorHelper.TRUE; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.RequestExtractor.REQUESTS_DURATION; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.RequestExtractor.REQUEST_RESULT_CODE; +import static com.azure.monitor.opentelemetry.autoconfigure.implementation.preaggregatedmetrics.RequestExtractor.REQUEST_SUCCESS; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; -import com.azure.monitor.opentelemetry.exporter.implementation.MetricDataMapper; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.MetricTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.models.MetricsData; -import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.MetricDataMapper; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.MetricTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.MetricsData; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.Span; diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/SamplingTestUtil.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/SamplingTestUtil.java index cff10fc64b0..f16c7dad132 100644 --- a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/SamplingTestUtil.java +++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/SamplingTestUtil.java @@ -3,7 +3,7 @@ package com.microsoft.applicationinsights.agent.internal; -import com.azure.monitor.opentelemetry.exporter.implementation.AiSemanticAttributes; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/common/StringsTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/common/StringsTest.java index c043c77dd59..3bafe71351f 100644 --- a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/common/StringsTest.java +++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/common/StringsTest.java @@ -5,7 +5,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings; import org.junit.jupiter.api.Test; public class StringsTest { diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/common/SystemInformationTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/common/SystemInformationTest.java index edb5459b0e2..997525b6aa6 100644 --- a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/common/SystemInformationTest.java +++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/common/SystemInformationTest.java @@ -5,7 +5,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.azure.monitor.opentelemetry.exporter.implementation.utils.SystemInformation; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.SystemInformation; import org.apache.commons.lang3.SystemUtils; import org.junit.jupiter.api.Test; diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializerTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializerTest.java index 6acc8cf0a19..21d5069deab 100644 --- a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializerTest.java +++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializerTest.java @@ -3,8 +3,8 @@ package com.microsoft.applicationinsights.agent.internal.profiler; -import com.azure.monitor.opentelemetry.exporter.implementation.builders.MessageTelemetryBuilder; -import com.azure.monitor.opentelemetry.exporter.implementation.configuration.ConnectionString; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.MessageTelemetryBuilder; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.configuration.ConnectionString; import com.microsoft.applicationinsights.agent.internal.configuration.Configuration; import com.microsoft.applicationinsights.agent.internal.configuration.GcReportingLevel; import com.microsoft.applicationinsights.agent.internal.profiler.config.ProfilerConfiguration; diff --git a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/telemetry/AppIdSupplierTest.java b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/telemetry/AppIdSupplierTest.java index db8987a33b3..99a975a4265 100644 --- a/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/telemetry/AppIdSupplierTest.java +++ b/agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/telemetry/AppIdSupplierTest.java @@ -5,7 +5,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.azure.monitor.opentelemetry.exporter.implementation.configuration.ConnectionString; +import com.azure.monitor.opentelemetry.autoconfigure.implementation.configuration.ConnectionString; import java.net.MalformedURLException; import java.net.URL; import org.junit.jupiter.api.Test; From 08e7ad0233c29493e4696bc916eac5e06d123368 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 21 Jan 2025 14:01:40 -0800 Subject: [PATCH 2/2] Update license report --- licenses/more-licenses.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 7acb56ff3de..0da60009593 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -1,7 +1,7 @@ # agent ## Dependency License Report -_2025-01-17 13:36:30 PST_ +_2025-01-21 14:01:27 PST_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.18.2` @@ -362,7 +362,7 @@ _2025-01-17 13:36:30 PST_ > - **POM Project URL**: [https://github.com/Azure/azure-sdk-for-java](https://github.com/Azure/azure-sdk-for-java) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -**70** **Group:** `com.azure` **Name:** `azure-monitor-opentelemetry-exporter` **Version:** `1.0.0-beta.31` +**70** **Group:** `com.azure` **Name:** `azure-monitor-opentelemetry-autoconfigure` **Version:** `1.0.0-beta.1` > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) **71** **Group:** `com.azure` **Name:** `azure-storage-blob` **Version:** `12.29.0`