Skip to content

Commit ef3bb24

Browse files
Copilotxiang17
Copilot
and
xiang17
authored
Merge remote-tracking branch 'origin/main' into dependabot/gradle/otelInstrumentationAlphaVersion-2.27.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/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 # etw/java/gradle.lockfile # licenses/more-licenses.md Co-authored-by: xiang17 <9310587+xiang17@users.noreply.github.com>
2 parents d18492d + 72119d5 commit ef3bb24

39 files changed

Lines changed: 390 additions & 187 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
3131

3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
33+
uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4
3434
with:
3535
languages: java
3636

@@ -39,7 +39,7 @@ jobs:
3939
run: ./gradlew assemble --no-build-cache
4040

4141
- name: Perform CodeQL analysis
42-
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
42+
uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4
4343
with:
4444
category: java
4545

@@ -74,7 +74,7 @@ jobs:
7474
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
7575

7676
- name: Initialize CodeQL
77-
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
77+
uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4
7878
with:
7979
languages: cpp
8080
debug: true
@@ -118,7 +118,7 @@ jobs:
118118
)
119119
120120
- name: Perform CodeQL analysis
121-
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
121+
uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4
122122
with:
123123
category: cpp
124124

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 7 additions & 7 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.5=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
66
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath
11-
org.junit:junit-bom:5.14.3=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.4=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.4=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1313
empty=

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

Lines changed: 7 additions & 7 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.5=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
66
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath
11-
org.junit:junit-bom:5.14.3=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.4=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.4=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1313
empty=

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

Lines changed: 8 additions & 8 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.5=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
6-
com.google.errorprone:error_prone_annotations:2.46.0=runtimeClasspath
6+
com.google.errorprone:error_prone_annotations:2.49.0=runtimeClasspath
77
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath
12-
org.junit:junit-bom:5.14.3=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.4=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1515
empty=

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

Lines changed: 8 additions & 8 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.5=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
6-
com.google.errorprone:error_prone_annotations:2.46.0=runtimeClasspath
6+
com.google.errorprone:error_prone_annotations:2.49.0=runtimeClasspath
77
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath
12-
org.junit:junit-bom:5.14.3=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.4=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1515
empty=

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

Lines changed: 7 additions & 7 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.5=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
66
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath
11-
org.junit:junit-bom:5.14.3=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.4=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.4=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1313
empty=

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

Lines changed: 7 additions & 7 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.5=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
66
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath
11-
org.junit:junit-bom:5.14.3=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.4=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.4=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1313
empty=

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.azure:azure-json:1.5.1=runtimeClasspath
5-
com.azure:azure-sdk-bom:1.3.5=runtimeClasspath
5+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
66
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
77
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath
12-
org.junit:junit-bom:5.14.3=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.4=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1515
empty=

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

Lines changed: 7 additions & 7 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.5=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
66
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath
11-
org.junit:junit-bom:5.14.3=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.4=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.4=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1313
empty=

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

Lines changed: 7 additions & 7 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.5=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.3.6=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath
66
io.netty:netty-bom:4.2.12.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath
11-
org.junit:junit-bom:5.14.3=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:2.0.4=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.4=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath
1313
empty=

0 commit comments

Comments
 (0)