Fix build (change param type to builder)
Looks like there were some merge conflicts around test code in the last
couple of PRs.
I think this will fix up the build.
MODIFY
instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.java
instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.java
@@ -90,12 +90,12 @@ abstract class AbstractReactorNettyHttpClientTest
}
@Override
- protected void configure(HttpClientTestOptions options) {
- options.disableTestRedirects();
- options.enableTestReadTimeout();
- options.setUserAgent(USER_AGENT);
+ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
+ optionsBuilder.disableTestRedirects();
+ optionsBuilder.enableTestReadTimeout();
+ optionsBuilder.setUserAgent(USER_AGENT);
- options.setExpectedClientSpanNameMapper(
+ optionsBuilder.setExpectedClientSpanNameMapper(
(uri, method) -> {
switch (uri.toString()) {
case "http://localhost:61/": // unopened port
@@ -107,7 +107,7 @@ abstract class AbstractReactorNettyHttpClientTest
}
});
- options.setClientSpanErrorMapper(
+ optionsBuilder.setClientSpanErrorMapper(
(uri, exception) -> {
if (exception.getClass().getName().endsWith("ReactiveException")) {
// unopened port or non routable address
@@ -119,7 +119,7 @@ abstract class AbstractReactorNettyHttpClientTest
return exception;
});
- options.setHttpAttributes(
+ optionsBuilder.setHttpAttributes(
uri -> {
// unopened port or non routable address
if ("http://localhost:61/".equals(uri.toString())

Fix build (change param type to builder) (#7640)

Looks like there were some merge conflicts around test code in the last
couple of PRs.
I think this will fix up the build.