Skip to content

Commit 58e0d94

Browse files
trasktrask
committed
Merge remote-tracking branch 'origin/main' into java-agent-class-path-warning
2 parents a3e3d04 + 77b32ad commit 58e0d94

File tree

49 files changed

+354
-342
lines changed

Some content is hidden

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

49 files changed

+354
-342
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Please provide the following information:
2525
### Logs
2626
[Turn on SDK logs](https://learn.microsoft.com/en-us/azure/azure-monitor/app/java-standalone-config#self-diagnostics) and attach/paste them to the issue. If using an application server, also attach any relevant server logs.
2727

28-
_Be sure to remove any private information from the logs before posting!_
28+
⚠ BE SURE TO REMOVE ANY PRIVATE INFORMATION FROM THE LOGS BEFORE POSTING ⚠
2929

3030
### Screenshots
3131
If applicable, add screenshots to help explain your problem.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ jobs:
2020
java-version: 17
2121

2222
- uses: gradle/gradle-build-action@v3
23+
env:
24+
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
2325
with:
2426
arguments: ":agent:agent:dependencyCheckAnalyze"
2527

‎agent/agent-bootstrap/gradle.lockfile‎

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.2.29=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
6-
io.netty:netty-bom:4.1.115.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
11-
org.junit:junit-bom:5.11.3=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:1.20.3=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
6+
io.netty:netty-bom:4.1.116.Final=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.10.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.10.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.44.1-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.44.1=runtimeClasspath
11+
org.junit:junit-bom:5.11.4=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
1313
empty=

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

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.2.29=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
6-
io.netty:netty-bom:4.1.115.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
11-
org.junit:junit-bom:5.11.3=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:1.20.3=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
6+
io.netty:netty-bom:4.1.116.Final=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.10.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.10.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.44.1-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.44.1=runtimeClasspath
11+
org.junit:junit-bom:5.11.4=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
1313
empty=

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

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.2.29=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.34.0=runtimeClasspath
7-
io.netty:netty-bom:4.1.115.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
12-
org.junit:junit-bom:5.11.3=runtimeClasspath
7+
io.netty:netty-bom:4.1.116.Final=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.10.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.10.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.44.1-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.44.1=runtimeClasspath
12+
org.junit:junit-bom:5.11.4=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.16=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:1.20.3=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
1515
empty=

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

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.2.29=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.34.0=runtimeClasspath
7-
io.netty:netty-bom:4.1.115.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
12-
org.junit:junit-bom:5.11.3=runtimeClasspath
7+
io.netty:netty-bom:4.1.116.Final=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.10.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.10.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.44.1-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.44.1=runtimeClasspath
12+
org.junit:junit-bom:5.11.4=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.16=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:1.20.3=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
1515
empty=

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

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.2.29=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
6-
io.netty:netty-bom:4.1.115.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
11-
org.junit:junit-bom:5.11.3=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:1.20.3=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
6+
io.netty:netty-bom:4.1.116.Final=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.10.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.10.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.44.1-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.44.1=runtimeClasspath
11+
org.junit:junit-bom:5.11.4=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
1313
empty=

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

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.2.29=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
6-
io.netty:netty-bom:4.1.115.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
11-
org.junit:junit-bom:5.11.3=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:1.20.3=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
6+
io.netty:netty-bom:4.1.116.Final=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.10.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.10.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.44.1-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.44.1=runtimeClasspath
11+
org.junit:junit-bom:5.11.4=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
1313
empty=

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

Lines changed: 9 additions & 9 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.3.0=runtimeClasspath
5-
com.azure:azure-sdk-bom:1.2.29=runtimeClasspath
6-
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
7-
io.netty:netty-bom:4.1.115.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
12-
org.junit:junit-bom:5.11.3=runtimeClasspath
5+
com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
6+
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
7+
io.netty:netty-bom:4.1.116.Final=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.10.0-alpha=runtimeClasspath
9+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.10.0=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom-alpha:1.44.1-alpha=runtimeClasspath
11+
io.opentelemetry:opentelemetry-bom:1.44.1=runtimeClasspath
12+
org.junit:junit-bom:5.11.4=runtimeClasspath
1313
org.slf4j:slf4j-api:2.0.16=runtimeClasspath
14-
org.testcontainers:testcontainers-bom:1.20.3=runtimeClasspath
14+
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
1515
empty=

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

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.2.29=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.18.1=runtimeClasspath
6-
io.netty:netty-bom:4.1.115.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.9.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.43.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.43.0=runtimeClasspath
11-
org.junit:junit-bom:5.11.3=runtimeClasspath
12-
org.testcontainers:testcontainers-bom:1.20.3=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.30=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath
6+
io.netty:netty-bom:4.1.116.Final=runtimeClasspath
7+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.10.0-alpha=runtimeClasspath
8+
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.10.0=runtimeClasspath
9+
io.opentelemetry:opentelemetry-bom-alpha:1.44.1-alpha=runtimeClasspath
10+
io.opentelemetry:opentelemetry-bom:1.44.1=runtimeClasspath
11+
org.junit:junit-bom:5.11.4=runtimeClasspath
12+
org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath
1313
empty=

0 commit comments

Comments
 (0)