Skip to content

Commit 9ed4299

Browse files
xiang17xiang17
authored
Merge branch 'main' into dependabot/gradle/otelInstrumentationAlphaVersion-2.21.0-alpha
2 parents dc8e47f + 2918770 commit 9ed4299

File tree

148 files changed

+1174
-329
lines changed

Some content is hidden

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

148 files changed

+1174
-329
lines changed

‎.github/copilot-instructions.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,24 @@ throw new FriendlyException(
134134
- Use `hideFromDependabot()` for test-only dependencies
135135
- Smoke tests validate end-to-end functionality in realistic environments
136136
- Check `gradle.lockfile` when dependency issues arise
137+
138+
## How to bisect an upstream OpenTelemetry Agent regression
139+
140+
To identify which upstream commit introduced a regression:
141+
142+
1. Update `dependencyManagement/build.gradle.kts` to use SNAPSHOT version (e.g., `2.10.0-alpha-SNAPSHOT`)
143+
2. Clone and bisect the upstream repo:
144+
```bash
145+
git clone https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
146+
cd opentelemetry-java-instrumentation
147+
git bisect start v2.10.0 v2.9.0
148+
```
149+
3. For each bisect iteration:
150+
```bash
151+
./gradlew publishToMavenLocal
152+
cd /path/to/ApplicationInsights-Java
153+
./gradlew :smoke-tests:apps:YourApp:smokeTest --tests "*YourFailingTest"
154+
cd /path/to/opentelemetry-java-instrumentation
155+
git bisect good # or bad
156+
```
157+
4. When done: `git bisect reset` and restore `dependencyManagement/build.gradle.kts`

‎.github/dependabot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ updates:
3838
schedule:
3939
interval: "daily"
4040
open-pull-requests-limit: 10
41+
groups:
42+
testcontainers:
43+
patterns:
44+
- "org.testcontainers:*"
4145

4246
- package-ecosystem: "gradle"
4347
directory: "/perf-tests"

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
spotless:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020

2121
- name: Set up JDK for running Gradle
2222
uses: actions/setup-java@v5
2323
with:
2424
distribution: temurin
25-
java-version: 17
25+
java-version: 21
2626

2727
- name: Setup Gradle
2828
uses: gradle/actions/setup-gradle@v5
@@ -33,20 +33,20 @@ jobs:
3333
gradle-wrapper-validation:
3434
runs-on: ubuntu-latest
3535
steps:
36-
- uses: actions/checkout@v5
36+
- uses: actions/checkout@v6
3737

3838
- uses: gradle/actions/wrapper-validation@v5
3939

4040
license-check:
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@v5
43+
- uses: actions/checkout@v6
4444

4545
- name: Set up JDK for running Gradle
4646
uses: actions/setup-java@v5
4747
with:
4848
distribution: temurin
49-
java-version: 17
49+
java-version: 21
5050

5151
- name: Build and install local azure-monitor-opentelemetry-autoconfigure dependency
5252
if: env.AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT != ''
@@ -84,13 +84,13 @@ jobs:
8484
- name: Support long paths
8585
run: git config --system core.longpaths true
8686

87-
- uses: actions/checkout@v5
87+
- uses: actions/checkout@v6
8888

8989
- name: Set up JDK for running Gradle
9090
uses: actions/setup-java@v5
9191
with:
9292
distribution: temurin
93-
java-version: 17
93+
java-version: 21
9494

9595
- name: Build and install local azure-monitor-opentelemetry-autoconfigure dependency
9696
if: env.AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT != ''
@@ -120,7 +120,7 @@ jobs:
120120
${{ inputs.no-build-cache && '--no-build-cache' || '' }}
121121
122122
- name: Upload snapshot
123-
uses: actions/upload-artifact@v4
123+
uses: actions/upload-artifact@v5
124124
with:
125125
path: agent/agent/build/libs/applicationinsights-agent-*-SNAPSHOT.jar
126126

@@ -147,7 +147,7 @@ jobs:
147147
run: git config --system core.longpaths true
148148
if: matrix.os == 'windows-2022'
149149

150-
- uses: actions/checkout@v5
150+
- uses: actions/checkout@v6
151151

152152
- id: setup-test-java
153153
name: Set up JDK ${{ matrix.test-java-version }}-${{ matrix.vm }} for running tests
@@ -160,7 +160,7 @@ jobs:
160160
uses: actions/setup-java@v5
161161
with:
162162
distribution: temurin
163-
java-version: 17
163+
java-version: 21
164164

165165
- name: Build and install local azure-monitor-opentelemetry-autoconfigure dependency
166166
if: env.AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT != ''
@@ -187,7 +187,7 @@ jobs:
187187
outputs:
188188
matrix: ${{ steps.set-matrix.outputs.matrix }}
189189
steps:
190-
- uses: actions/checkout@v5
190+
- uses: actions/checkout@v6
191191

192192
- id: set-matrix
193193
run: |
@@ -226,13 +226,13 @@ jobs:
226226
matrix: ${{fromJson(needs.setup-smoke-test-matrix.outputs.matrix)}}
227227
fail-fast: false
228228
steps:
229-
- uses: actions/checkout@v5
229+
- uses: actions/checkout@v6
230230

231-
- name: Set up Java 17
231+
- name: Set up Java 21
232232
uses: actions/setup-java@v5
233233
with:
234234
distribution: temurin
235-
java-version: 17
235+
java-version: 21
236236

237237
- name: Build and install local azure-monitor-opentelemetry-autoconfigure dependency
238238
if: env.AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT != ''
@@ -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@v4
257+
uses: actions/upload-artifact@v5
258258
if: failure()
259259
with:
260260
name: ${{ env.UPLOAD_ARTIFACT_NAME }}

‎.github/workflows/codeql-daily.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222

23-
- name: Set up Java 17
23+
- name: Set up Java 21
2424
uses: actions/setup-java@v5
2525
with:
2626
distribution: temurin
27-
java-version: 17
27+
java-version: 21
2828

2929
- name: Setup Gradle
3030
uses: gradle/actions/setup-gradle@v5
@@ -52,13 +52,13 @@ jobs:
5252
runs-on: windows-2022
5353

5454
steps:
55-
- uses: actions/checkout@v5
55+
- uses: actions/checkout@v6
5656

57-
- name: Set up Java 17 (required for JNI compilation)
57+
- name: Set up Java 21 (required for JNI compilation)
5858
uses: actions/setup-java@v5
5959
with:
6060
distribution: temurin
61-
java-version: 17
61+
java-version: 21
6262

6363
- name: Setup Visual Studio Build Tools
6464
uses: microsoft/setup-msbuild@v2

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ jobs:
2525

2626
steps:
2727
- name: Checkout code
28-
uses: actions/checkout@v5
28+
uses: actions/checkout@v6
2929

3030
- name: Set up JDK for running Gradle
3131
uses: actions/setup-java@v5
3232
with:
3333
distribution: temurin
34-
java-version: 17
34+
java-version: 21
3535

3636
- name: Setup Gradle
3737
uses: gradle/actions/setup-gradle@v5

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
analyze:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v5
14+
- uses: actions/checkout@v6
1515

16-
- name: Set up Java 17
16+
- name: Set up Java 21
1717
uses: actions/setup-java@v5
1818
with:
1919
distribution: temurin
20-
java-version: 17
20+
java-version: 21
2121

2222
- name: Setup Gradle
2323
uses: gradle/actions/setup-gradle@v5
@@ -28,7 +28,7 @@ jobs:
2828

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

‎.github/workflows/perf-test_daily.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
assemble-application-insights:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414

1515
- name: Set up JDK for running Gradle
1616
uses: actions/setup-java@v5
1717
with:
1818
distribution: temurin
19-
java-version: 17
19+
java-version: 21
2020

2121
- name: Setup Gradle
2222
uses: gradle/actions/setup-gradle@v5

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

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,14 @@
11
name: Pull request helper
22
on:
3-
pull_request_target:
3+
push:
4+
branches:
5+
- 'dependabot/**/*'
46

57
jobs:
68
pull-request-helper:
7-
if: github.event.pull_request.user.login == 'dependabot[bot]'
89
runs-on: ubuntu-latest
910
steps:
10-
- uses: actions/checkout@v5
11-
with:
12-
# this is the personal access token used for "git push" below
13-
# which is needed in order to trigger workflows
14-
token: ${{ secrets.PR_HELPER_GITHUB_TOKEN }}
15-
16-
- name: Check out PR branch
17-
env:
18-
NUMBER: ${{ github.event.pull_request.number }}
19-
GH_TOKEN: ${{ github.token }}
20-
run: |
21-
gh pr checkout $NUMBER
11+
- uses: actions/checkout@v6
2212

2313
- name: Setup Gradle
2414
uses: gradle/actions/setup-gradle@v5
@@ -30,16 +20,6 @@ jobs:
3020
git config user.name github-actions[bot]
3121
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
3222
33-
# - name: Spotless
34-
# env:
35-
# NUMBER: ${{ github.event.issue.number }}
36-
# run: |
37-
# ./gradlew spotlessApply
38-
# if git diff --quiet; then
39-
# exit 0 # success
40-
# fi
41-
# git commit -a -m "./gradlew spotlessApply"
42-
4323
- name: Update license report
4424
env:
4525
NUMBER: ${{ github.event.issue.number }}
@@ -67,7 +47,4 @@ jobs:
6747
git commit -m "./gradlew resolveAndLockAll --write-locks"
6848
6949
- name: Push
70-
env:
71-
GH_TOKEN: ${{ github.token }}
72-
run: |
73-
git push
50+
run: git push

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
outputs:
1010
version: ${{ steps.create-github-release.outputs.version }}
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313

1414
- name: Set environment variables
1515
run: |
@@ -46,7 +46,7 @@ jobs:
4646
else
4747
opt_prerelease="--prerelease"
4848
fi
49-
gh release create --target main \
49+
gh release create --target HEAD \
5050
--title "Application Insights Java $VERSION$opt_ga" \
5151
--notes-file /tmp/release-notes.txt \
5252
$opt_prerelease \

‎.github/workflows/reusable-create-docs-pull-request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
gh repo sync xiang17/azure-monitor-docs-pr \
3333
--source MicrosoftDocs/azure-monitor-docs-pr
3434
35-
- uses: actions/checkout@v5
35+
- uses: actions/checkout@v6
3636
with:
3737
repository: xiang17/azure-monitor-docs-pr
3838
# this is the personal access token used for "git push" below

0 commit comments

Comments
 (0)