Skip to content

Commit eab1903

Browse files
cboscbos
authored
Merge branch 'open-telemetry:main' into messaging_semconv_update
2 parents b2dd7c5 + f49bf3c commit eab1903

File tree

79 files changed

+938
-89
lines changed

Some content is hidden

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

79 files changed

+938
-89
lines changed

‎.fossa.yml

+3
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ targets:
4949
- type: gradle
5050
path: ./
5151
target: ':testing:agent-for-testing'
52+
- type: gradle
53+
path: ./
54+
target: ':instrumentation:activej-http-6.0:javaagent'
5255
- type: gradle
5356
path: ./
5457
target: ':instrumentation:alibaba-druid-1.0:javaagent'

‎.github/renovate.json5

+6
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@
7878
'com.gradleup.shadow{/,}**',
7979
],
8080
},
81+
{
82+
groupName: 'jackson packages',
83+
matchPackageNames: [
84+
'com.fasterxml.jackson{/,}**',
85+
],
86+
},
8187
{
8288
// prevent update to 2.4-groovy-4.0-SNAPSHOT
8389
allowedVersions: '!/\\-SNAPSHOT$/',

‎.github/workflows/auto-update-otel-sdk.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
- name: Use CLA approved bot
8585
run: .github/scripts/use-cla-approved-bot.sh
8686

87-
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
87+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
8888
id: otelbot-token
8989
with:
9090
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/backport.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Use CLA approved bot
3030
run: .github/scripts/use-cla-approved-bot.sh
3131

32-
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
32+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
3333
id: otelbot-token
3434
with:
3535
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/build-common.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ jobs:
272272

273273
# vaadin tests use pnpm
274274
- name: Cache pnpm modules
275-
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
275+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
276276
with:
277277
path: ~/.pnpm-store
278278
key: ${{ runner.os }}-test-cache-pnpm-modules
@@ -415,7 +415,7 @@ jobs:
415415
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=none --no-daemon ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
416416

417417
- name: Test
418-
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }}${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
418+
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }} ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
419419

420420
- name: Upload jvm crash dump files if any
421421
if: failure()
@@ -489,13 +489,17 @@ jobs:
489489
working-directory: gradle-plugins
490490

491491
- name: Build distro
492-
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
492+
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
493493
working-directory: examples/distro
494494

495495
- name: Build extension
496-
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
496+
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
497497
working-directory: examples/extension
498498

499+
- name: Build benchmark-overhead
500+
run: ./gradlew assemble ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
501+
working-directory: benchmark-overhead
502+
499503
- name: Run muzzle check against extension
500504
run: ./gradlew muzzle --init-script ../../.github/scripts/local.init.gradle.kts
501505
working-directory: examples/extension

‎.github/workflows/prepare-patch-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Use CLA approved bot
5252
run: .github/scripts/use-cla-approved-bot.sh
5353

54-
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
54+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
5555
id: otelbot-token
5656
with:
5757
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/prepare-release-branch.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- name: Use CLA approved bot
6464
run: .github/scripts/use-cla-approved-bot.sh
6565

66-
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
66+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
6767
id: otelbot-token
6868
with:
6969
app-id: ${{ vars.OTELBOT_APP_ID }}
@@ -120,7 +120,7 @@ jobs:
120120
- name: Use CLA approved bot
121121
run: .github/scripts/use-cla-approved-bot.sh
122122

123-
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
123+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
124124
id: otelbot-token
125125
with:
126126
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/publish-petclinic-benchmark-image.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2121

22-
- uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
22+
- uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
2323

2424
- name: Login to GitHub container registry
2525
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
@@ -32,7 +32,7 @@ jobs:
3232
run: echo "TS=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_ENV
3333

3434
- name: Push to GitHub packages
35-
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
35+
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
3636
with:
3737
push: true
3838
file: benchmark-overhead/Dockerfile.petclinic

‎.github/workflows/release-update-cloudfoundry-index.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: display changes
4545
run: git diff
4646

47-
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
47+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
4848
id: otelbot-token
4949
with:
5050
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ jobs:
219219
- name: Use CLA approved bot
220220
run: .github/scripts/use-cla-approved-bot.sh
221221

222-
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
222+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
223223
id: otelbot-token
224224
with:
225225
app-id: ${{ vars.OTELBOT_APP_ID }}
@@ -288,7 +288,7 @@ jobs:
288288
- name: Use CLA approved bot
289289
run: .github/scripts/use-cla-approved-bot.sh
290290

291-
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
291+
- uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
292292
id: otelbot-token
293293
with:
294294
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/reusable-test-indy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
# vaadin tests use pnpm
5454
- name: Cache pnpm modules
55-
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
55+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
5656
with:
5757
path: ~/.pnpm-store
5858
key: ${{ runner.os }}-test-latest-cache-pnpm-modules

‎.github/workflows/reusable-test-latest-deps.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
4747
# vaadin tests use pnpm
4848
- name: Cache pnpm modules
49-
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
49+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
5050
with:
5151
path: ~/.pnpm-store
5252
key: ${{ runner.os }}-test-latest-cache-pnpm-modules

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88
`io.opentelemetry.instrumentation.httpclient` was deprecated in favor of the new package name
99
`io.opentelemetry.instrumentation.javahttpclient`
1010

11+
## Version 2.13.3 (2025-02-28)
12+
13+
### 🛠️ Bug fixes
14+
15+
- Backport: Fix failure to start when AWS Resource Provider is enabled
16+
([#13420](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13420))
17+
1118
## Version 2.13.2 (2025-02-27)
1219

1320
### 🛠️ Bug fixes

‎benchmark-overhead/Dockerfile.petclinic

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:11.0.26_4-jdk@sha256:0fce1ebca683486d57432c42b8a9764c3fe0b18ae092746248fac258ad05ee00 as app-build
1+
FROM eclipse-temurin:11.0.26_4-jdk@sha256:be923b4c9abb99b97b8aa18169bf4598ab570e9b6dc3ca0ecaef433bd2011dcc as app-build
22

33
# This is the base image that will contain a built version of the spring-petclinic-rest
44
# application. Installing the dependencies and maven compiling the application is time

‎benchmark-overhead/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ dependencies {
2828
testImplementation("org.slf4j:slf4j-simple:2.0.17")
2929

3030
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
31+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
3132
}
3233

3334
tasks {

‎conventions/src/main/kotlin/otel.java-conventions.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ dependencies {
161161
compileOnly("com.google.errorprone:error_prone_annotations")
162162

163163
codenarc("org.codenarc:CodeNarc:3.6.0")
164-
codenarc(platform("org.codehaus.groovy:groovy-bom:3.0.23"))
164+
codenarc(platform("org.codehaus.groovy:groovy-bom:3.0.24"))
165165

166166
modules {
167167
// checkstyle uses the very old google-collections which causes Java 9 module conflict with

‎dependencyManagement/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ val otelContribVersion = "1.44.0-alpha"
1010
val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
1111

1212
// Need both BOM and groovy jars
13-
val groovyVersion = "4.0.25"
13+
val groovyVersion = "4.0.26"
1414

1515
// We don't force libraries we instrument to new versions since we compile and test against specific
1616
// old baseline versions but we do try to force those libraries' transitive dependencies to new
@@ -27,7 +27,7 @@ val DEPENDENCY_BOMS = listOf(
2727
// for some reason boms show up as runtime dependencies in license and vulnerability scans
2828
// even if they are only used by test dependencies, so not using junit bom since it is LGPL
2929

30-
"com.fasterxml.jackson:jackson-bom:2.18.2",
30+
"com.fasterxml.jackson:jackson-bom:2.18.3",
3131
"com.squareup.okio:okio-bom:3.10.2", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
3232
"com.google.guava:guava-bom:33.4.0-jre",
3333
"org.apache.groovy:groovy-bom:${groovyVersion}",
@@ -90,7 +90,7 @@ val DEPENDENCIES = listOf(
9090
"com.github.stefanbirkner:system-lambda:1.2.1",
9191
"com.github.stefanbirkner:system-rules:1.19.0",
9292
"uk.org.webcompere:system-stubs-jupiter:2.0.3",
93-
"com.uber.nullaway:nullaway:0.12.3",
93+
"com.uber.nullaway:nullaway:0.12.4",
9494
"commons-beanutils:commons-beanutils:1.10.1",
9595
"commons-cli:commons-cli:1.9.0",
9696
"commons-codec:commons-codec:1.18.0",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-instrumentation-annotations-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.13.2.jar
1+
Comparing source compatibility of opentelemetry-instrumentation-annotations-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.13.3.jar
22
No changes.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-instrumentation-api-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.13.2.jar
1+
Comparing source compatibility of opentelemetry-instrumentation-api-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.13.3.jar
22
No changes.

‎docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.13.2.jar
1+
Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.13.3.jar
22
No changes.

‎docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-spring-boot-starter-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.13.2.jar
1+
Comparing source compatibility of opentelemetry-spring-boot-starter-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.13.3.jar
22
No changes.

‎docs/supported-libraries.md

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ These are the supported libraries and frameworks:
1919

2020
| Library/Framework | Auto-instrumented versions | Standalone Library Instrumentation [1] | Semantic Conventions |
2121
|---------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|
22+
| [ActiveJ](https://activej.io/) | 6.0+ | N/A | [HTTP Server Spans], [HTTP Server Metrics] |
2223
| [Akka Actors](https://doc.akka.io/docs/akka/current/typed/index.html) | 2.3+ | N/A | Context propagation |
2324
| [Akka HTTP](https://doc.akka.io/docs/akka-http/current/index.html) | 10.0+ | N/A | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics], Provides `http.route` [2] |
2425
| [Alibaba Druid](https://github.com/alibaba/druid) | 1.0+ | [opentelemetry-alibaba-druid-1.0](../instrumentation/alibaba-druid-1.0/library) | [Database Pool Metrics] |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
dependencies {
66
testImplementation("org.testcontainers:testcontainers:1.20.5")
7-
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
7+
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.3")
88
testImplementation("com.google.protobuf:protobuf-java-util:4.29.3")
99
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
1010
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha")

‎examples/extension/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ dependencies {
9898

9999
//All dependencies below are only for tests
100100
testImplementation("org.testcontainers:testcontainers:1.20.5")
101-
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
101+
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.18.3")
102102
testImplementation("com.google.protobuf:protobuf-java-util:4.29.3")
103103
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
104104
testImplementation("io.opentelemetry:opentelemetry-api")

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java

+15
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
2121
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
2222
import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor;
23+
import io.opentelemetry.instrumentation.api.internal.Experimental;
2324
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractor;
2425
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
2526
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter;
@@ -177,6 +178,18 @@ public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setKnownMethods(
177178
return this;
178179
}
179180

181+
/**
182+
* Configures the instrumentation to redact sensitive URL parameters.
183+
*
184+
* @param redactQueryParameters {@code true} if the sensitive URL parameters have to be redacted.
185+
*/
186+
@CanIgnoreReturnValue
187+
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setRedactQueryParameters(
188+
boolean redactQueryParameters) {
189+
Experimental.setRedactQueryParameters(httpAttributesExtractorBuilder, redactQueryParameters);
190+
return this;
191+
}
192+
180193
/** Sets custom {@link SpanNameExtractor} via transform function. */
181194
@CanIgnoreReturnValue
182195
public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> setSpanNameExtractor(
@@ -225,6 +238,7 @@ public Instrumenter<REQUEST, RESPONSE> build() {
225238
.addAttributesExtractor(HttpExperimentalAttributesExtractor.create(attributesGetter))
226239
.addOperationMetrics(HttpClientExperimentalMetrics.get());
227240
}
241+
228242
builderCustomizer.accept(builder);
229243

230244
if (headerSetter != null) {
@@ -248,6 +262,7 @@ public DefaultHttpClientInstrumenterBuilder<REQUEST, RESPONSE> configure(CommonC
248262
set(
249263
config::shouldEmitExperimentalHttpClientTelemetry,
250264
this::setEmitExperimentalHttpClientMetrics);
265+
set(config::redactQueryParameters, this::setRedactQueryParameters);
251266
return this;
252267
}
253268

‎instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/CommonConfig.java

+8
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public final class CommonConfig {
3131
private final boolean statementSanitizationEnabled;
3232
private final boolean emitExperimentalHttpClientTelemetry;
3333
private final boolean emitExperimentalHttpServerTelemetry;
34+
private final boolean redactQueryParameters;
3435
private final String loggingTraceIdKey;
3536
private final String loggingSpanIdKey;
3637
private final String loggingTraceFlagsKey;
@@ -57,6 +58,9 @@ public CommonConfig(InstrumentationConfig config) {
5758
config.getBoolean("otel.instrumentation.common.db-statement-sanitizer.enabled", true);
5859
emitExperimentalHttpClientTelemetry =
5960
config.getBoolean("otel.instrumentation.http.client.emit-experimental-telemetry", false);
61+
redactQueryParameters =
62+
config.getBoolean(
63+
"otel.instrumentation.http.client.experimental.redact-query-parameters", true);
6064
emitExperimentalHttpServerTelemetry =
6165
config.getBoolean("otel.instrumentation.http.server.emit-experimental-telemetry", false);
6266
enduserConfig = new EnduserConfig(config);
@@ -111,6 +115,10 @@ public boolean shouldEmitExperimentalHttpServerTelemetry() {
111115
return emitExperimentalHttpServerTelemetry;
112116
}
113117

118+
public boolean redactQueryParameters() {
119+
return redactQueryParameters;
120+
}
121+
114122
public String getTraceIdKey() {
115123
return loggingTraceIdKey;
116124
}

0 commit comments

Comments
 (0)