Skip to content

Commit 8d428ec

Browse files
xiang17xiang17
authored
Merge branch 'main' into copilot/upgrade-otel-versions
2 parents 132979d + 5ac2b9e commit 8d428ec

36 files changed

Lines changed: 208 additions & 189 deletions

File tree

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
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-sdk-bom:1.3.3=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath
66
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
11-
org.junit:junit-bom:5.14.1=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
1212
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
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-sdk-bom:1.3.3=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath
66
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
11-
org.junit:junit-bom:5.14.1=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
1212
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

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

Lines changed: 6 additions & 6 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-sdk-bom:1.3.3=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.46.0=runtimeClasspath
77
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
12-
org.junit:junit-bom:5.14.1=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
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1515
empty=

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

Lines changed: 6 additions & 6 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-sdk-bom:1.3.3=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.46.0=runtimeClasspath
77
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
12-
org.junit:junit-bom:5.14.1=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
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1515
empty=

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
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-sdk-bom:1.3.3=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath
66
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
11-
org.junit:junit-bom:5.14.1=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
1212
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
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-sdk-bom:1.3.3=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath
66
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
11-
org.junit:junit-bom:5.14.1=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
1212
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

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

Lines changed: 6 additions & 6 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-json:1.5.0=runtimeClasspath
55
com.azure:azure-sdk-bom:1.3.3=runtimeClasspath
6-
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
6+
com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath
77
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath
9-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
11-
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
12-
org.junit:junit-bom:5.14.1=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
1313
org.slf4j:slf4j-api:2.0.17=runtimeClasspath
1414
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1515
empty=

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
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-sdk-bom:1.3.3=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath
66
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
11-
org.junit:junit-bom:5.14.1=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
1212
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
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-sdk-bom:1.3.3=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath
66
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
11-
org.junit:junit-bom:5.14.1=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
1212
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
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-sdk-bom:1.3.3=runtimeClasspath
5-
com.fasterxml.jackson:jackson-bom:2.20.1=runtimeClasspath
5+
com.fasterxml.jackson:jackson-bom:2.21.1=runtimeClasspath
66
io.netty:netty-bom:4.2.9.Final=runtimeClasspath
7-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath
8-
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath
9-
io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath
10-
io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath
11-
org.junit:junit-bom:5.14.1=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
1212
org.testcontainers:testcontainers-bom:2.0.3=runtimeClasspath
1313
empty=

0 commit comments

Comments
 (0)