Skip to content

Commit a99e37b

Browse files
traskharsimar
trask
and
harsimar
authored
Update to autoconfigure module (#4037)
Co-authored-by: harsimar <[email protected]>
1 parent 4b8c4fb commit a99e37b

File tree

57 files changed

+189
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+189
-189
lines changed

‎.github/workflows/build-common.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
required: false
99

1010
env:
11-
EXPORTER_VERSION: 1.0.0-beta.28 # to be updated with the latest version
11+
EXPORTER_VERSION: 1.0.0-beta.1 # to be updated with the latest version
1212

1313
jobs:
1414
spotless:
@@ -47,11 +47,11 @@ jobs:
4747
java-version: 17
4848

4949
- name: Using a local standalone exporter dependency?
50-
if: ${{ hashFiles('azure-monitor-opentelemetry-exporter-1.0.0-beta.*.jar') != '' }}
50+
if: ${{ hashFiles('azure-monitor-opentelemetry-autoconfigure-1.0.0-beta.*.jar') != '' }}
5151
run: |
5252
echo "exporter_version: ${{ env.EXPORTER_VERSION }}"
5353
mvn -version
54-
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 }}"
54+
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 }}"
5555
5656
- name: Setup Gradle
5757
uses: gradle/actions/setup-gradle@v4
@@ -92,11 +92,11 @@ jobs:
9292
java-version: 17
9393

9494
- name: Using a local standalone exporter dependency?
95-
if: ${{ hashFiles('azure-monitor-opentelemetry-exporter-1.0.0-beta.*.jar') != '' }}
95+
if: ${{ hashFiles('azure-monitor-opentelemetry-autoconfigure-1.0.0-beta.*.jar') != '' }}
9696
run: |
9797
echo "exporter_version: ${{ env.EXPORTER_VERSION }}"
9898
mvn -version
99-
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 }}"
99+
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 }}"
100100
101101
- name: Setup Gradle
102102
uses: gradle/actions/setup-gradle@v4
@@ -153,11 +153,11 @@ jobs:
153153
java-version: 17
154154

155155
- name: Using a local standalone exporter dependency?
156-
if: ${{ hashFiles('azure-monitor-opentelemetry-exporter-1.0.0-beta.*.jar') != '' }}
156+
if: ${{ hashFiles('azure-monitor-opentelemetry-autoconfigure-1.0.0-beta.*.jar') != '' }}
157157
run: |
158158
echo "exporter_version: ${{ env.EXPORTER_VERSION }}"
159159
mvn -version
160-
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 }}"
160+
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 }}"
161161
162162
- name: Setup Gradle
163163
uses: gradle/actions/setup-gradle@v4
@@ -203,11 +203,11 @@ jobs:
203203
java-version: 17
204204

205205
- name: Using a local standalone exporter dependency?
206-
if: ${{ hashFiles('azure-monitor-opentelemetry-exporter-1.0.0-beta.*.jar') != '' }}
206+
if: ${{ hashFiles('azure-monitor-opentelemetry-autoconfigure-1.0.0-beta.*.jar') != '' }}
207207
run: |
208208
echo "exporter_version: ${{ env.EXPORTER_VERSION }}"
209209
mvn -version
210-
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 }}"
210+
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 }}"
211211
212212
- name: Setup Gradle
213213
uses: gradle/actions/setup-gradle@v4

‎agent/agent-tooling/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
implementation(project(":agent:agent-profiler:agent-diagnostics"))
2222
implementation(project(":etw:java"))
2323

24-
implementation("com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.31")
24+
implementation("com.azure:azure-monitor-opentelemetry-autoconfigure:1.0.0-beta.1")
2525
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")
2626
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
2727
compileOnly("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-common-bootstrap")

‎agent/agent-tooling/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ com.azure:azure-core-http-netty:1.15.7=runtimeClasspath
99
com.azure:azure-core:1.54.1=runtimeClasspath
1010
com.azure:azure-identity:1.14.2=runtimeClasspath
1111
com.azure:azure-json:1.3.0=runtimeClasspath
12-
com.azure:azure-monitor-opentelemetry-exporter:1.0.0-beta.31=runtimeClasspath
12+
com.azure:azure-monitor-opentelemetry-autoconfigure:1.0.0-beta.1=runtimeClasspath
1313
com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
1414
com.azure:azure-storage-blob:12.29.0=runtimeClasspath
1515
com.azure:azure-storage-common:12.28.0=runtimeClasspath

‎agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/BytecodeUtilImpl.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
import static java.util.concurrent.TimeUnit.MILLISECONDS;
88
import static java.util.concurrent.TimeUnit.SECONDS;
99

10-
import com.azure.monitor.opentelemetry.exporter.implementation.AiSemanticAttributes;
11-
import com.azure.monitor.opentelemetry.exporter.implementation.OperationNames;
12-
import com.azure.monitor.opentelemetry.exporter.implementation.SamplingScoreGeneratorV2;
13-
import com.azure.monitor.opentelemetry.exporter.implementation.builders.AbstractTelemetryBuilder;
14-
import com.azure.monitor.opentelemetry.exporter.implementation.builders.AvailabilityTelemetryBuilder;
15-
import com.azure.monitor.opentelemetry.exporter.implementation.builders.EventTelemetryBuilder;
16-
import com.azure.monitor.opentelemetry.exporter.implementation.builders.ExceptionTelemetryBuilder;
17-
import com.azure.monitor.opentelemetry.exporter.implementation.builders.MessageTelemetryBuilder;
18-
import com.azure.monitor.opentelemetry.exporter.implementation.builders.MetricPointBuilder;
19-
import com.azure.monitor.opentelemetry.exporter.implementation.builders.MetricTelemetryBuilder;
20-
import com.azure.monitor.opentelemetry.exporter.implementation.builders.PageViewTelemetryBuilder;
21-
import com.azure.monitor.opentelemetry.exporter.implementation.builders.RemoteDependencyTelemetryBuilder;
22-
import com.azure.monitor.opentelemetry.exporter.implementation.builders.RequestTelemetryBuilder;
23-
import com.azure.monitor.opentelemetry.exporter.implementation.models.ContextTagKeys;
24-
import com.azure.monitor.opentelemetry.exporter.implementation.models.SeverityLevel;
25-
import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.Feature;
26-
import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.FeatureStatsbeat;
27-
import com.azure.monitor.opentelemetry.exporter.implementation.utils.FormattedDuration;
28-
import com.azure.monitor.opentelemetry.exporter.implementation.utils.FormattedTime;
29-
import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings;
10+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.AiSemanticAttributes;
11+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.OperationNames;
12+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.SamplingScoreGeneratorV2;
13+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.AbstractTelemetryBuilder;
14+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.AvailabilityTelemetryBuilder;
15+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.EventTelemetryBuilder;
16+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.ExceptionTelemetryBuilder;
17+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.MessageTelemetryBuilder;
18+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.MetricPointBuilder;
19+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.MetricTelemetryBuilder;
20+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.PageViewTelemetryBuilder;
21+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.RemoteDependencyTelemetryBuilder;
22+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.RequestTelemetryBuilder;
23+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.ContextTagKeys;
24+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.SeverityLevel;
25+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.Feature;
26+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.FeatureStatsbeat;
27+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.FormattedDuration;
28+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.FormattedTime;
29+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings;
3030
import com.microsoft.applicationinsights.agent.bootstrap.BytecodeUtil.BytecodeUtilDelegate;
3131
import com.microsoft.applicationinsights.agent.internal.init.RuntimeConfiguration;
3232
import com.microsoft.applicationinsights.agent.internal.init.RuntimeConfigurator;

‎agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/classicsdk/TelemetryUtil.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
package com.microsoft.applicationinsights.agent.internal.classicsdk;
55

6-
import com.azure.monitor.opentelemetry.exporter.implementation.builders.ExceptionDetailBuilder;
7-
import com.azure.monitor.opentelemetry.exporter.implementation.builders.StackFrameBuilder;
8-
import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings;
6+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.ExceptionDetailBuilder;
7+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.builders.StackFrameBuilder;
8+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings;
99
import java.util.ArrayList;
1010
import java.util.List;
1111
import javax.annotation.Nullable;

‎agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/common/FriendlyException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
package com.microsoft.applicationinsights.agent.internal.common;
55

6-
import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings;
6+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings;
77
import javax.annotation.Nullable;
88

99
public class FriendlyException extends RuntimeException {

‎agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import static java.util.concurrent.TimeUnit.DAYS;
88
import static java.util.concurrent.TimeUnit.MINUTES;
99

10-
import com.azure.monitor.opentelemetry.exporter.implementation.utils.PropertyHelper;
10+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.PropertyHelper;
1111
import com.fasterxml.jackson.annotation.JsonCreator;
1212
import com.fasterxml.jackson.annotation.JsonProperty;
1313
import com.microsoft.applicationinsights.agent.internal.common.FriendlyException;

‎agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
package com.microsoft.applicationinsights.agent.internal.configuration;
55

6-
import com.azure.monitor.opentelemetry.exporter.implementation.SemanticAttributes;
7-
import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.RpAttachType;
8-
import com.azure.monitor.opentelemetry.exporter.implementation.utils.HostName;
9-
import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings;
6+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.SemanticAttributes;
7+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.RpAttachType;
8+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.HostName;
9+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings;
1010
import com.fasterxml.jackson.core.JsonParseException;
1111
import com.fasterxml.jackson.core.JsonProcessingException;
1212
import com.fasterxml.jackson.core.type.TypeReference;

‎agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/diagnostics/DiagnosticsHelper.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
package com.microsoft.applicationinsights.agent.internal.diagnostics;
55

6-
import com.azure.monitor.opentelemetry.exporter.implementation.statsbeat.RpAttachType;
7-
import com.azure.monitor.opentelemetry.exporter.implementation.utils.PropertyHelper;
8-
import com.azure.monitor.opentelemetry.exporter.implementation.utils.Strings;
6+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.statsbeat.RpAttachType;
7+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.PropertyHelper;
8+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.Strings;
99
import java.nio.file.Files;
1010
import java.nio.file.Path;
1111

‎agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentLogExporter.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
package com.microsoft.applicationinsights.agent.internal.exporter;
55

6-
import static com.azure.monitor.opentelemetry.exporter.implementation.utils.AzureMonitorMsgId.EXPORTER_MAPPING_ERROR;
6+
import static com.azure.monitor.opentelemetry.autoconfigure.implementation.utils.AzureMonitorMsgId.EXPORTER_MAPPING_ERROR;
77
import static com.microsoft.applicationinsights.agent.internal.exporter.ExporterUtils.shouldSample;
88

9-
import com.azure.monitor.opentelemetry.exporter.implementation.LogDataMapper;
10-
import com.azure.monitor.opentelemetry.exporter.implementation.logging.OperationLogger;
11-
import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem;
12-
import com.azure.monitor.opentelemetry.exporter.implementation.quickpulse.QuickPulse;
9+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.LogDataMapper;
10+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.logging.OperationLogger;
11+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem;
12+
import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.QuickPulse;
1313
import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.SamplingOverride;
1414
import com.microsoft.applicationinsights.agent.internal.sampling.SamplingOverrides;
1515
import com.microsoft.applicationinsights.agent.internal.telemetry.BatchItemProcessor;

0 commit comments

Comments
 (0)