Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
5 changes: 3 additions & 2 deletions testing/wiremock-shaded-for-testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand All @@ -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()
Expand Down
Loading