open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
jason plumb 2023-01-23 16:06:57 -08:00 committed by GitHub
parent db6b764421
commit bb092bf0e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.java
View File

@ -90,12 +90,12 @@ abstract class AbstractReactorNettyHttpClientTest
} }
@Override @Override
protected void configure(HttpClientTestOptions options) { protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
options.disableTestRedirects(); optionsBuilder.disableTestRedirects();
options.enableTestReadTimeout(); optionsBuilder.enableTestReadTimeout();
options.setUserAgent(USER_AGENT); optionsBuilder.setUserAgent(USER_AGENT);
options.setExpectedClientSpanNameMapper( optionsBuilder.setExpectedClientSpanNameMapper(
(uri, method) -> { (uri, method) -> {
switch (uri.toString()) { switch (uri.toString()) {
case "http://localhost:61/": // unopened port case "http://localhost:61/": // unopened port
@ -107,7 +107,7 @@ abstract class AbstractReactorNettyHttpClientTest
} }
}); });
options.setClientSpanErrorMapper( optionsBuilder.setClientSpanErrorMapper(
(uri, exception) -> { (uri, exception) -> {
if (exception.getClass().getName().endsWith("ReactiveException")) { if (exception.getClass().getName().endsWith("ReactiveException")) {
// unopened port or non routable address // unopened port or non routable address
@ -119,7 +119,7 @@ abstract class AbstractReactorNettyHttpClientTest
return exception; return exception;
}); });
options.setHttpAttributes( optionsBuilder.setHttpAttributes(
uri -> { uri -> {
// unopened port or non routable address // unopened port or non routable address
if ("http://localhost:61/".equals(uri.toString()) if ("http://localhost:61/".equals(uri.toString())