Skip to content

Commit e7a7065

Browse files
xiang17xiang17
committed
Merge branch 'main' into dependabot/gradle/otelInstrumentationAlphaVersion-2.22.0-alpha
# Conflicts: # agent/agent-bootstrap/gradle.lockfile # agent/agent-for-testing/gradle.lockfile # agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile # agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile # agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile # agent/agent-profiler/agent-alerting-api/gradle.lockfile # agent/agent-profiler/agent-alerting/gradle.lockfile # agent/agent-profiler/agent-diagnostics-api/gradle.lockfile # agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile # agent/agent-profiler/agent-diagnostics/gradle.lockfile # agent/agent-tooling/gradle.lockfile # agent/agent/gradle.lockfile # agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile # agent/instrumentation/azure-functions-worker-stub/gradle.lockfile # agent/instrumentation/azure-functions/gradle.lockfile # agent/instrumentation/methods/gradle.lockfile # agent/instrumentation/micrometer-1.0/gradle.lockfile # agent/runtime-attach/gradle.lockfile # classic-sdk/core/gradle.lockfile # classic-sdk/web/gradle.lockfile # dependencyManagement/build.gradle.kts # etw/java/gradle.lockfile # licenses/more-licenses.md
2 parents d2fec02 + ec4fba8 commit e7a7065

93 files changed

Lines changed: 2061 additions & 255 deletions

File tree

Some content is hidden

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
${{ inputs.no-build-cache && '--no-build-cache' || '' }}
121121
122122
- name: Upload snapshot
123-
uses: actions/upload-artifact@v6
123+
uses: actions/upload-artifact@v7
124124
with:
125125
path: agent/agent/build/libs/applicationinsights-agent-*-SNAPSHOT.jar
126126

@@ -254,7 +254,7 @@ jobs:
254254
echo "UPLOAD_ARTIFACT_NAME=$artifact_name" >> $GITHUB_ENV
255255
256256
- name: Upload smoke test reports
257-
uses: actions/upload-artifact@v6
257+
uses: actions/upload-artifact@v7
258258
if: failure()
259259
with:
260260
name: ${{ env.UPLOAD_ARTIFACT_NAME }}

‎.github/workflows/owasp-dependency-check-daily.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
- name: Upload report
3030
if: always()
31-
uses: actions/upload-artifact@v6
31+
uses: actions/upload-artifact@v7
3232
with:
3333
path: agent/agent/build/reports
3434

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
else
4747
opt_prerelease="--prerelease"
4848
fi
49-
gh release create --target HEAD \
49+
gh release create --target main \
5050
--title "Application Insights Java $VERSION$opt_ga" \
5151
--notes-file /tmp/release-notes.txt \
5252
$opt_prerelease \

‎CHANGELOG.md‎

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

3+
## Version 3.7.7 GA (01/23/2026)
4+
5+
### Enhancements
6+
7+
* Update to OpenTelemetry Java Instrumentation 2.21.0
8+
([#4511](https://github.com/microsoft/ApplicationInsights-Java/pull/4511))
9+
* Enable Spring Cloud Gateway instrumentation
10+
([#4559](https://github.com/microsoft/ApplicationInsights-Java/pull/4559))
11+
* Add azure_monitor to metrics exporter for AKS
12+
([#4575](https://github.com/microsoft/ApplicationInsights-Java/pull/4575))
13+
314
## Version 3.7.6 GA (10/28/2025)
415

516
### Enhancements

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.3.3=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
6-
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.22.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.22.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.56.0-alpha=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom:1.56.0=runtimeClasspath
1111
org.junit:junit-bom:5.14.1=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.3.3=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
6-
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.22.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.22.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.56.0-alpha=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom:1.56.0=runtimeClasspath
1111
org.junit:junit-bom:5.14.1=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.3.3=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
6-
com.google.errorprone:error_prone_annotations:2.44.0=runtimeClasspath
7-
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
6+
com.google.errorprone:error_prone_annotations:2.46.0=runtimeClasspath
7+
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.22.0-alpha=runtimeClasspath
99
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.22.0=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom-alpha:1.56.0-alpha=runtimeClasspath
1111
io.opentelemetry:opentelemetry-bom:1.56.0=runtimeClasspath
1212
org.junit:junit-bom:5.14.1=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1515
empty=

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.3.3=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
6-
com.google.errorprone:error_prone_annotations:2.44.0=runtimeClasspath
7-
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
6+
com.google.errorprone:error_prone_annotations:2.46.0=runtimeClasspath
7+
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.22.0-alpha=runtimeClasspath
99
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.22.0=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom-alpha:1.56.0-alpha=runtimeClasspath
1111
io.opentelemetry:opentelemetry-bom:1.56.0=runtimeClasspath
1212
org.junit:junit-bom:5.14.1=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1515
empty=

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.3.3=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
6-
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.22.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.22.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.56.0-alpha=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom:1.56.0=runtimeClasspath
1111
org.junit:junit-bom:5.14.1=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.3.3=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
6-
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.22.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.22.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.56.0-alpha=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom:1.56.0=runtimeClasspath
1111
org.junit:junit-bom:5.14.1=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.2=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

0 commit comments

Comments
 (0)