Skip to content

Commit c1a0bcd

Browse files
authored
Merge branch 'main' into dependabot/gradle/com.github.oshi-oshi-core-6.9.1
2 parents 1382d70 + 0a9543e commit c1a0bcd

File tree

24 files changed

+94
-73
lines changed

24 files changed

+94
-73
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`

agent/agent-bootstrap/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.3.0=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath
6-
io.netty:netty-bom:4.2.6.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath

agent/agent-for-testing/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.3.0=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath
6-
io.netty:netty-bom:4.2.6.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
com.azure:azure-sdk-bom:1.3.0=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.42.0=runtimeClasspath
7-
io.netty:netty-bom:4.2.6.Final=runtimeClasspath
7+
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
99
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
com.azure:azure-sdk-bom:1.3.0=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath
66
com.google.errorprone:error_prone_annotations:2.42.0=runtimeClasspath
7-
io.netty:netty-bom:4.2.6.Final=runtimeClasspath
7+
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
99
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.3.0=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath
6-
io.netty:netty-bom:4.2.6.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.3.0=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath
6-
io.netty:netty-bom:4.2.6.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
com.azure:azure-json:1.5.0=runtimeClasspath
55
com.azure:azure-sdk-bom:1.3.0=runtimeClasspath
66
com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath
7-
io.netty:netty-bom:4.2.6.Final=runtimeClasspath
7+
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
99
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
1010
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.3.0=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath
6-
io.netty:netty-bom:4.2.6.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file is expected to be part of source control.
44
com.azure:azure-sdk-bom:1.3.0=runtimeClasspath
55
com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath
6-
io.netty:netty-bom:4.2.6.Final=runtimeClasspath
6+
io.netty:netty-bom:4.2.7.Final=runtimeClasspath
77
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath
88
io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath
99
io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath

0 commit comments

Comments
 (0)