Skip to content

Commit 99994ac

Browse files
harsimarharsimar
committed
Merge branch 'main' into harskaur/tests
2 parents 0b4861a + 7a207f2 commit 99994ac

File tree

82 files changed

+339
-309
lines changed

Some content is hidden

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

82 files changed

+339
-309
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

‎CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# CHANGELOG
22

3+
## Version 3.7.0 GA (01/22/2025)
4+
5+
### Enhancements
6+
7+
* Support for Live Metrics Filtering ([#43040](https://github.com/Azure/azure-sdk-for-java/pull/43040), [#43184](https://github.com/Azure/azure-sdk-for-java/pull/43184), [#43289](https://github.com/Azure/azure-sdk-for-java/pull/43289), [#43323](https://github.com/Azure/azure-sdk-for-java/pull/43323), [#43506](https://github.com/Azure/azure-sdk-for-java/pull/43506), [#43744](https://github.com/Azure/azure-sdk-for-java/pull/43744))
8+
* Update to OpenTelemetry Java Instrumentation 2.12.0 ([#4034](https://github.com/microsoft/ApplicationInsights-Java/pull/4034))
9+
* Remove user sensitive data from self-diagnostics ([#3976](https://github.com/microsoft/ApplicationInsights-Java/pull/3976))
10+
* Exclude `META-INF/maven/**` from agent jar to avoid CVE false positives ([#4040](https://github.com/microsoft/ApplicationInsights-Java/pull/4040))
11+
* Don't log Log Records (when debug logging enabled) if they are sampled out
12+
([#3936](https://github.com/microsoft/ApplicationInsights-Java/pull/3936))
13+
* Include NICE, IRQ, SOFTIRQ, and STEAL in `\\Processor(_Total)\\% Processor Time` metric
14+
([#3987](https://github.com/microsoft/ApplicationInsights-Java/pull/3987))
15+
* Add note to applicationinsights.log to make sure that private information is removed from the log
16+
([#4011](https://github.com/microsoft/ApplicationInsights-Java/pull/4011))
17+
* Support finding applicationinsights.json in current dir when using runtime attach
18+
([#3990](https://github.com/microsoft/ApplicationInsights-Java/pull/3990))
19+
* Add a warning message if the applicationinsights-agent jar is in the classpath in Java 11+ ([#4039](https://github.com/microsoft/ApplicationInsights-Java/pull/4039))
20+
21+
322
## Version 3.6.2 GA (10/23/2024)
423

524
### Enhancements

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
66
io.netty:netty-bom:4.1.117.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
1111
org.junit:junit-bom:5.11.4=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
1313
empty=

‎agent/agent-for-testing/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
66
io.netty:netty-bom:4.1.117.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
1111
org.junit:junit-bom:5.11.4=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
1313
empty=

‎agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath
77
io.netty:netty-bom:4.1.117.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
1212
org.junit:junit-bom:5.11.4=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.16=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath

‎agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath
77
io.netty:netty-bom:4.1.117.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
1212
org.junit:junit-bom:5.11.4=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.16=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath

‎agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
66
io.netty:netty-bom:4.1.117.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
1111
org.junit:junit-bom:5.11.4=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
1313
empty=

‎agent/agent-profiler/agent-alerting-api/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
66
io.netty:netty-bom:4.1.117.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
1111
org.junit:junit-bom:5.11.4=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
1313
empty=

‎agent/agent-profiler/agent-alerting/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ com.azure:azure-json:1.3.0=runtimeClasspath
55
com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
66
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
77
io.netty:netty-bom:4.1.117.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
1212
org.junit:junit-bom:5.11.4=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.16=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath

‎agent/agent-profiler/agent-diagnostics-api/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
66
io.netty:netty-bom:4.1.117.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath
1111
org.junit:junit-bom:5.11.4=runtimeClasspath
1212
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
1313
empty=

0 commit comments

Comments
 (0)