Skip to content

Commit 3484ebf

Browse files
Duncan-tree-zhouDuncan-tree-zhou
committed
Merge branch 'otel_main' into add_metric_annotation_instrument
2 parents 372418a + 715a172 commit 3484ebf

File tree

72 files changed

+1540
-355
lines changed

Some content is hidden

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

72 files changed

+1540
-355
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ jobs:
1414

1515
- uses: lycheeverse/lychee-action@v2
1616
with:
17-
# remove version after next release of lychee-action
18-
lycheeVersion: latest
1917
# excluding links to pull requests and issues is done for performance
2018
args: >
2119
--include-fragments

‎CHANGELOG.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44

55
### Migration notes
66

7+
- `io.opentelemetry.instrumentation.api.incubator.semconv.util.SpanNames` has been deprecated,
8+
replaced by the stable `io.opentelemetry.instrumentation.api.semconv.util.SpanNames`
9+
10+
## Version 2.12.0 (2025-01-17)
11+
12+
### Migration notes
13+
714
- Some Java agent instrumentation suppression keys have been renamed to match their module names:
815
- `elasticsearch-rest-6.0` --> `elasticsearch-rest-6.4`
916
- `internal-application-logging` --> `internal-application-logger`
@@ -17,6 +24,32 @@
1724
`setKnownMethods(Collection)`
1825
([#12902](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/12902))
1926

27+
### 📈 Enhancements
28+
29+
- Support `ExtendedTextMapGetter` in gRPC instrumentation
30+
([#13011](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13011))
31+
- Add database client metrics in DynamoDB instrumentation
32+
([#13033](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13033))
33+
- Propagate context into async http client CompletableFuture callbacks
34+
([#13041](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13041))
35+
- Exclude spring routing data source from Spring Starter instrumentation
36+
([#13054](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13054))
37+
- Instrument jdbc batch queries
38+
([#12797](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/12797))
39+
40+
### 🛠️ Bug fixes
41+
42+
- Fix incorrect dubbo trace caused by using rpcContext.isProviderSide()
43+
([#12930](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/12930))
44+
- Fix ClickHouse query failing with syntax error
45+
([#13020](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13020))
46+
- Fix instrumentation module not loading silently when duplicate helper classnames are detected
47+
([#13005](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13005))
48+
- Fix compatibility problem due to DubboHeadersGetter#keys in Dubbo 2.7.6 and 2.7.7
49+
([#12982](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/12982))
50+
- Fix appender install for async Logback appenders
51+
([#13047](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13047))
52+
2053
## Version 2.11.0 (2024-12-23)
2154

2255
### Migration notes

‎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.27.2")
77+
testImplementation("org.assertj:assertj-core:3.27.3")
7878
}

‎dependencyManagement/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ rootProject.extra["versions"] = dependencyVersions
99

1010
// this line is managed by .github/scripts/update-sdk-version.sh
1111
val otelSdkVersion = "1.46.0"
12-
val otelContribVersion = "1.42.0-alpha"
12+
val otelContribVersion = "1.43.0-alpha"
1313
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
1414

1515
// Need both BOM and groovy jars
@@ -105,7 +105,7 @@ val DEPENDENCIES = listOf(
105105
"io.opentelemetry.contrib:opentelemetry-baggage-processor:${otelContribVersion}",
106106
"io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha",
107107
"io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
108-
"org.assertj:assertj-core:3.27.2",
108+
"org.assertj:assertj-core:3.27.3",
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/apidiffs/2.12.0_vs_2.11.0/opentelemetry-instrumentation-annotations.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Comparing source compatibility of opentelemetry-instrumentation-annotations-2.12.0.jar against opentelemetry-instrumentation-annotations-2.11.0.jar
2+
No changes.

‎docs/apidiffs/2.12.0_vs_2.11.0/opentelemetry-instrumentation-api.txt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Comparing source compatibility of opentelemetry-instrumentation-api-2.12.0.jar against opentelemetry-instrumentation-api-2.11.0.jar
2+
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder (not serializable)
3+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4+
GENERIC TEMPLATES: === REQUEST:java.lang.Object, === RESPONSE:java.lang.Object
5+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder<REQUEST,RESPONSE> setCapturedRequestHeaders(java.util.Collection<java.lang.String>)
6+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder<REQUEST,RESPONSE> setCapturedResponseHeaders(java.util.Collection<java.lang.String>)
7+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder<REQUEST,RESPONSE> setKnownMethods(java.util.Collection<java.lang.String>)
8+
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder (not serializable)
9+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
10+
GENERIC TEMPLATES: === REQUEST:java.lang.Object, === RESPONSE:java.lang.Object
11+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder<REQUEST,RESPONSE> setCapturedRequestHeaders(java.util.Collection<java.lang.String>)
12+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder<REQUEST,RESPONSE> setCapturedResponseHeaders(java.util.Collection<java.lang.String>)
13+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder<REQUEST,RESPONSE> setKnownMethods(java.util.Collection<java.lang.String>)
14+
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteBuilder (not serializable)
15+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
16+
GENERIC TEMPLATES: === REQUEST:java.lang.Object
17+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteBuilder<REQUEST> setKnownMethods(java.util.Collection<java.lang.String>)
18+
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder (not serializable)
19+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
20+
GENERIC TEMPLATES: === REQUEST:java.lang.Object
21+
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder<REQUEST> setKnownMethods(java.util.Collection<java.lang.String>)

‎docs/apidiffs/2.12.0_vs_2.11.0/opentelemetry-spring-boot-autoconfigure.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.12.0.jar against opentelemetry-spring-boot-autoconfigure-2.11.0.jar
2+
No changes.

‎docs/apidiffs/2.12.0_vs_2.11.0/opentelemetry-spring-boot-starter.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Comparing source compatibility of opentelemetry-spring-boot-starter-2.12.0.jar against opentelemetry-spring-boot-starter-2.11.0.jar
2+
No changes.

‎docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-instrumentation-annotations-2.12.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.11.0.jar
1+
Comparing source compatibility of opentelemetry-instrumentation-annotations-2.13.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.12.0.jar
22
No changes.

‎docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
1-
Comparing source compatibility of opentelemetry-instrumentation-api-2.12.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.11.0.jar
2-
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder (not serializable)
3-
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4-
GENERIC TEMPLATES: === REQUEST:java.lang.Object, === RESPONSE:java.lang.Object
5-
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder<REQUEST,RESPONSE> setCapturedRequestHeaders(java.util.Collection<java.lang.String>)
6-
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder<REQUEST,RESPONSE> setCapturedResponseHeaders(java.util.Collection<java.lang.String>)
7-
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder<REQUEST,RESPONSE> setKnownMethods(java.util.Collection<java.lang.String>)
8-
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder (not serializable)
9-
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
10-
GENERIC TEMPLATES: === REQUEST:java.lang.Object, === RESPONSE:java.lang.Object
11-
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder<REQUEST,RESPONSE> setCapturedRequestHeaders(java.util.Collection<java.lang.String>)
12-
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder<REQUEST,RESPONSE> setCapturedResponseHeaders(java.util.Collection<java.lang.String>)
13-
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesExtractorBuilder<REQUEST,RESPONSE> setKnownMethods(java.util.Collection<java.lang.String>)
14-
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteBuilder (not serializable)
15-
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
16-
GENERIC TEMPLATES: === REQUEST:java.lang.Object
17-
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteBuilder<REQUEST> setKnownMethods(java.util.Collection<java.lang.String>)
18-
*** MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder (not serializable)
19-
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
20-
GENERIC TEMPLATES: === REQUEST:java.lang.Object
21-
+++ NEW METHOD: PUBLIC(+) io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder<REQUEST> setKnownMethods(java.util.Collection<java.lang.String>)
1+
Comparing source compatibility of opentelemetry-instrumentation-api-2.13.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.12.0.jar
2+
+++ NEW CLASS: PUBLIC(+) FINAL(+) io.opentelemetry.instrumentation.api.semconv.util.SpanNames (not serializable)
3+
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
4+
+++ NEW SUPERCLASS: java.lang.Object
5+
+++ NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String fromMethod(java.lang.reflect.Method)
6+
+++ NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String fromMethod(java.lang.Class<?>, java.lang.String)

0 commit comments

Comments
 (0)