Skip to content

Commit ef4c106

Browse files
harsimarharsimar
committed
merge from main
2 parents 630238a + c2b43d1 commit ef4c106

File tree

42 files changed

+593
-351
lines changed

Some content is hidden

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

42 files changed

+593
-351
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,3 +216,15 @@ jobs:
216216

217217
- name: Test
218218
run: ./gradlew ${{ matrix.module }}:smokeTest
219+
220+
- name: Create unique artifact name
221+
if: failure()
222+
run: |
223+
echo "UPLOAD_ARTIFACT_NAME=${{ matrix.module }}" | sed 's/:/-/g' >> $GITHUB_ENV
224+
225+
- name: Upload smoke test reports
226+
uses: actions/upload-artifact@v4
227+
if: failure()
228+
with:
229+
name: ${{ env.UPLOAD_ARTIFACT_NAME }}
230+
path: '**/build/reports/tests/smokeTest/**/*'

‎agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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.32=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.33=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
6-
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.0.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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.32=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.33=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
6-
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.0.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
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.32=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.33=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath
7-
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
7+
io.netty:netty-bom:4.2.0.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
99
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
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.32=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.33=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath
7-
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
7+
io.netty:netty-bom:4.2.0.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
99
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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.32=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.33=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
6-
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.0.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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.32=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.33=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
6-
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.0.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
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-json:1.4.0=runtimeClasspath
5-
com.azure:azure-sdk-bom:1.2.32=runtimeClasspath
4+
com.azure:azure-json:1.5.0=runtimeClasspath
5+
com.azure:azure-sdk-bom:1.2.33=runtimeClasspath
66
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
7-
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
7+
io.netty:netty-bom:4.2.0.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
99
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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.32=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.33=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
6-
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.0.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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.32=runtimeClasspath
4+
com.azure:azure-sdk-bom:1.2.33=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.18.3=runtimeClasspath
6-
io.netty:netty-bom:4.1.119.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.0.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.14.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.14.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.48.0-alpha=runtimeClasspath

0 commit comments

Comments
 (0)