From 1e0a688a4679813125aa65be9d373b40485da5c9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jul 2025 16:01:47 +0000 Subject: [PATCH 1/3] fix(deps): update dependency com.github.tomakehurst:wiremock-jre8 to v3 --- testing/wiremock-shaded-for-testing/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/wiremock-shaded-for-testing/build.gradle.kts b/testing/wiremock-shaded-for-testing/build.gradle.kts index 573122a7b848..742660df9574 100644 --- a/testing/wiremock-shaded-for-testing/build.gradle.kts +++ b/testing/wiremock-shaded-for-testing/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { // If tests fail when updating this, update the list of relocate based on any // class conflict reported in the failure. - implementation("com.github.tomakehurst:wiremock-jre8:2.35.2") + implementation("com.github.tomakehurst:wiremock-jre8:3.0.1") implementation("com.google.errorprone:error_prone_annotations") implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2") } From 0660e07bdc7ae4339e07d74d73a53ec282063146 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 17 Jul 2025 11:46:51 -0700 Subject: [PATCH 2/3] Fix --- .../testing/recording/ResponseHeaderScrubber.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/recording/ResponseHeaderScrubber.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/recording/ResponseHeaderScrubber.java index 0fb8fdedb86f..7399709aedc2 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/recording/ResponseHeaderScrubber.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/recording/ResponseHeaderScrubber.java @@ -5,23 +5,20 @@ package io.opentelemetry.instrumentation.testing.recording; -import com.github.tomakehurst.wiremock.common.FileSource; -import com.github.tomakehurst.wiremock.extension.Parameters; -import com.github.tomakehurst.wiremock.extension.ResponseTransformer; +import com.github.tomakehurst.wiremock.extension.ResponseTransformerV2; import com.github.tomakehurst.wiremock.http.HttpHeader; import com.github.tomakehurst.wiremock.http.HttpHeaders; -import com.github.tomakehurst.wiremock.http.Request; import com.github.tomakehurst.wiremock.http.Response; +import com.github.tomakehurst.wiremock.stubbing.ServeEvent; -public final class ResponseHeaderScrubber extends ResponseTransformer { +public final class ResponseHeaderScrubber implements ResponseTransformerV2 { @Override public String getName() { return "scrub-response-header"; } @Override - public Response transform( - Request request, Response response, FileSource fileSource, Parameters parameters) { + public Response transform(Response response, ServeEvent serveEvent) { HttpHeaders scrubbed = HttpHeaders.noHeaders(); for (HttpHeader header : response.getHeaders().all()) { switch (header.key()) { From dcbbcc6c3bc616407a1dffd15b8eb5cd92b664d7 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Mon, 21 Jul 2025 19:06:52 +0300 Subject: [PATCH 3/3] fix shading --- testing/wiremock-shaded-for-testing/build.gradle.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/wiremock-shaded-for-testing/build.gradle.kts b/testing/wiremock-shaded-for-testing/build.gradle.kts index 742660df9574..f03c2cb7f218 100644 --- a/testing/wiremock-shaded-for-testing/build.gradle.kts +++ b/testing/wiremock-shaded-for-testing/build.gradle.kts @@ -32,7 +32,8 @@ tasks { relocate("org.eclipse.jetty", "io.opentelemetry.testing.internal.jetty") relocate("com.fasterxml.jackson", "io.opentelemetry.testing.internal.jackson") relocate("com.jayway.jsonpath", "io.opentelemetry.testing.internal.jsonpath") - relocate("javax.servlet", "io.opentelemetry.testing.internal.servlet") + relocate("javax.servlet", "io.opentelemetry.testing.internal.javax.servlet") + relocate("jakarta.servlet", "io.opentelemetry.testing.internal.jakarta.servlet") relocate("org.yaml", "io.opentelemetry.testing.internal.yaml") mergeServiceFiles()