Skip to content

Commit 3810623

Browse files
cuichenlicuichenli
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into capture-code-attributes-spring-webflux
2 parents d8d3837 + fa32671 commit 3810623

File tree

45 files changed

+629
-114
lines changed

Some content is hidden

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

45 files changed

+629
-114
lines changed

‎.github/scripts/markdown-link-check-config.json‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎.github/scripts/markdown-link-check-with-retry.sh‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.github/workflows/reusable-markdown-link-check.yml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1414

15-
- name: Install markdown-link-check
16-
# https://github.com/tcort/markdown-link-check/issues/297
17-
run: npm install -g [email protected]
18-
19-
- name: Run markdown-link-check
20-
run: |
21-
find . -type f \
22-
-name '*.md' \
23-
-not -path './CHANGELOG.md' \
24-
-not -path './licenses/*' \
25-
-not -path '*/build/*' \
26-
| xargs .github/scripts/markdown-link-check-with-retry.sh
15+
- uses: lycheeverse/lychee-action@v2
16+
with:
17+
# remove version after next release of lychee-action
18+
lycheeVersion: latest
19+
# excluding links to pull requests and issues is done for performance
20+
args: >
21+
--include-fragments
22+
--exclude "^https://github.com/open-telemetry/opentelemetry-java-instrumentation/(issue|pull)/\\d+$"
23+
--exclude "^http://code.google.com/p/concurrentlinkedhashmap$"
24+
--max-retries 6
25+
.

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ too disruptive to adopt right away.
761761
or `-Dotel.instrumentation.common.experimental.view-telemetry.enabled=true`.
762762
- ⚠️⚠️ Stable HTTP semantic conventions are now emitted ⚠️⚠️
763763
- TOO MANY CHANGES TO LIST HERE, be sure to review the full
764-
[list of changes](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/migration-guide.md#summary-of-changes).
764+
[list of changes](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/non-normative/http-migration.md#summary-of-changes).
765765
- Stable JVM semantic conventions are now emitted.
766766
- Memory metrics
767767
- `process.runtime.jvm.memory.usage` renamed to `jvm.memory.used`

‎benchmark-overhead-jmh/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ otelJava {
1313
}
1414

1515
dependencies {
16-
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.0")
16+
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.1")
1717
}
1818

1919
tasks {

‎conventions/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ dependencies {
7474
testImplementation(enforcedPlatform("org.junit:junit-bom:5.11.4"))
7575
testImplementation("org.junit.jupiter:junit-jupiter-api")
7676
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
77-
testImplementation("org.assertj:assertj-core:3.26.3")
77+
testImplementation("org.assertj:assertj-core:3.27.0")
7878
}

‎dependencyManagement/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ val asmVersion = "9.7.1"
4646
val jmhVersion = "1.37"
4747
val mockitoVersion = "4.11.0"
4848
val slf4jVersion = "2.0.16"
49-
val semConvVersion = "1.28.0-alpha"
49+
val semConvVersion = "1.29.0-alpha"
5050

5151
val CORE_DEPENDENCIES = listOf(
5252
"io.opentelemetry.semconv:opentelemetry-semconv:${semConvVersion}",
@@ -105,7 +105,7 @@ val DEPENDENCIES = listOf(
105105
"io.opentelemetry.contrib:opentelemetry-baggage-processor:${otelContribVersion}",
106106
"io.opentelemetry.proto:opentelemetry-proto:1.4.0-alpha",
107107
"io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
108-
"org.assertj:assertj-core:3.26.3",
108+
"org.assertj:assertj-core:3.27.0",
109109
"org.awaitility:awaitility:4.2.2",
110110
"com.google.code.findbugs:annotations:3.0.1u2",
111111
"com.google.code.findbugs:jsr305:3.0.2",

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ These are the supported libraries and frameworks:
3939
| [Apache Pulsar](https://pulsar.apache.org/) | 2.8+ | N/A | [Messaging Spans] |
4040
| [Apache RocketMQ gRPC/Protobuf-based Client](https://rocketmq.apache.org/) | 5.0+ | N/A | [Messaging Spans] |
4141
| [Apache RocketMQ Remoting-based Client](https://rocketmq.apache.org/) | 4.8+ | [opentelemetry-rocketmq-client-4.8](../instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library) | [Messaging Spans] |
42-
| [Apache Struts 2](https://github.com/apache/struts) | 2.3+ | N/A | Provides `http.route` [2], Controller Spans [3] |
42+
| [Apache Struts](https://github.com/apache/struts) | 2.3+ | N/A | Provides `http.route` [2], Controller Spans [3] |
4343
| [Apache Tapestry](https://tapestry.apache.org/) | 5.4+ | N/A | Provides `http.route` [2], Controller Spans [3] |
4444
| [Apache Wicket](https://wicket.apache.org/) | 8.0+ | N/A | Provides `http.route` [2] |
4545
| [Armeria](https://armeria.dev) | 1.3+ | [opentelemetry-armeria-1.3](../instrumentation/armeria/armeria-1.3/library) | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics] |

‎examples/distro/gradle/instrumentation.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
// test dependencies
2626
testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
2727
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
28-
testImplementation("org.assertj:assertj-core:3.26.3")
28+
testImplementation("org.assertj:assertj-core:3.27.0")
2929

3030
add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions.opentelemetryJavaagentAlpha}")
3131
add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:${versions.opentelemetryJavaagentAlpha}")

‎examples/distro/smoke-tests/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.4.0-alpha")
1111
testImplementation("io.opentelemetry:opentelemetry-api")
1212

13-
testImplementation("ch.qos.logback:logback-classic:1.5.13")
13+
testImplementation("ch.qos.logback:logback-classic:1.5.14")
1414
}
1515

1616
tasks.test {

0 commit comments

Comments
 (0)