Skip to content

Commit 6337d09

Browse files
authored
Merge branch 'microsoft:main' into main
2 parents 5f5d8c0 + c4fc661 commit 6337d09

68 files changed

Lines changed: 456 additions & 402 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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
java-version: 21
2626

2727
- name: Setup Gradle
28-
uses: gradle/actions/setup-gradle@v5
28+
uses: gradle/actions/setup-gradle@v6
2929

3030
- name: Spotless
3131
run: ./gradlew spotlessCheck ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
@@ -35,7 +35,7 @@ jobs:
3535
steps:
3636
- uses: actions/checkout@v6
3737

38-
- uses: gradle/actions/wrapper-validation@v5
38+
- uses: gradle/actions/wrapper-validation@v6
3939

4040
license-check:
4141
runs-on: ubuntu-latest
@@ -53,7 +53,7 @@ jobs:
5353
run: ./.github/scripts/build-azure-monitor-dependency.sh
5454

5555
- name: Setup Gradle
56-
uses: gradle/actions/setup-gradle@v5
56+
uses: gradle/actions/setup-gradle@v6
5757

5858
- name: Generate license report
5959
run: |
@@ -98,10 +98,10 @@ jobs:
9898
run: ./.github/scripts/build-azure-monitor-dependency.sh
9999

100100
- name: Setup Gradle
101-
uses: gradle/actions/setup-gradle@v5
101+
uses: gradle/actions/setup-gradle@v6
102102

103103
- name: Add MSBuild to PATH
104-
uses: microsoft/setup-msbuild@v2
104+
uses: microsoft/setup-msbuild@v3
105105

106106
- name: Setup Visual Studio and Windows SDK environment
107107
shell: cmd
@@ -168,7 +168,7 @@ jobs:
168168
run: ./.github/scripts/build-azure-monitor-dependency.sh
169169

170170
- name: Setup Gradle
171-
uses: gradle/actions/setup-gradle@v5
171+
uses: gradle/actions/setup-gradle@v6
172172

173173
- name: Test
174174
# spotless is checked separately since it's a common source of failure
@@ -239,7 +239,7 @@ jobs:
239239
run: ./.github/scripts/build-azure-monitor-dependency.sh
240240

241241
- name: Setup Gradle
242-
uses: gradle/actions/setup-gradle@v5
242+
uses: gradle/actions/setup-gradle@v6
243243

244244
- name: Test
245245
run: ./gradlew ${{ matrix.module }}:smokeTest --tests "${{ matrix.test_class }}*"

.github/workflows/codeql-daily.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
java-version: 21
2828

2929
- name: Setup Gradle
30-
uses: gradle/actions/setup-gradle@v5
30+
uses: gradle/actions/setup-gradle@v6
3131

3232
- name: Initialize CodeQL
3333
uses: github/codeql-action/init@v4
@@ -61,7 +61,7 @@ jobs:
6161
java-version: 21
6262

6363
- name: Setup Visual Studio Build Tools
64-
uses: microsoft/setup-msbuild@v2
64+
uses: microsoft/setup-msbuild@v3
6565

6666
# This step uses Microsoft's vswhere tool to verify that the official Windows 10 SDK (version 19041) is installed.
6767
# vswhere is a Microsoft-provided command-line utility that locates Visual Studio installations and their components.
@@ -71,7 +71,7 @@ jobs:
7171
shell: pwsh
7272

7373
- name: Setup Gradle
74-
uses: gradle/actions/setup-gradle@v5
74+
uses: gradle/actions/setup-gradle@v6
7575

7676
- name: Initialize CodeQL
7777
uses: github/codeql-action/init@v4

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
java-version: 21
3535

3636
- name: Setup Gradle
37-
uses: gradle/actions/setup-gradle@v5
37+
uses: gradle/actions/setup-gradle@v6
3838

3939
- name: Populate Gradle caches
4040
run: ./gradlew classes testClasses assemble spotlessApply

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
java-version: 21
2121

2222
- name: Setup Gradle
23-
uses: gradle/actions/setup-gradle@v5
23+
uses: gradle/actions/setup-gradle@v6
2424

2525
- run: ./gradlew :agent:agent:dependencyCheckAnalyze
2626
env:

.github/workflows/perf-test_daily.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
java-version: 21
2020

2121
- name: Setup Gradle
22-
uses: gradle/actions/setup-gradle@v5
22+
uses: gradle/actions/setup-gradle@v6
2323

2424
- name: Build Application Insights Java agent
2525
run: ./gradlew assemble

.github/workflows/pull-request-helper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
gh pr checkout $NUMBER
2525
2626
- name: Setup Gradle
27-
uses: gradle/actions/setup-gradle@v5
27+
uses: gradle/actions/setup-gradle@v6
2828
with:
2929
cache-read-only: true
3030

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.8 GA (03/24/2026)
4+
5+
* Update to OpenTelemetry Java Instrumentation 2.26.1
6+
([#4648](https://github.com/microsoft/ApplicationInsights-Java/pull/4648),
7+
[#4632](https://github.com/microsoft/ApplicationInsights-Java/pull/4632),
8+
[#4631](https://github.com/microsoft/ApplicationInsights-Java/pull/4631))
9+
* Add cgroupv2 support and fix profile upload response body reading
10+
([#4592](https://github.com/microsoft/ApplicationInsights-Java/pull/4592))
11+
* Fix connection string env var precedence over ${file:...} config lookup
12+
([#4608](https://github.com/microsoft/ApplicationInsights-Java/pull/4608))
13+
314
## Version 3.7.7 GA (01/23/2026)
415

516
### Enhancements
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.3.3=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath
6-
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath
11-
org.junit:junit-bom:5.14.2=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.5=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
6+
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath
11+
org.junit:junit-bom:5.14.3=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath
1313
empty=
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.3.3=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath
6-
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath
11-
org.junit:junit-bom:5.14.2=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.5=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
6+
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath
11+
org.junit:junit-bom:5.14.3=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath
1313
empty=
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.azure:azure-sdk-bom:1.3.3=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.5=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.46.0=runtimeClasspath
7-
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.23.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.23.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.57.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.57.0=runtimeClasspath
12-
org.junit:junit-bom:5.14.2=runtimeClasspath
7+
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath
12+
org.junit:junit-bom:5.14.3=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath
1515
empty=

0 commit comments

Comments
 (0)