Skip to content

Commit 81f4c7e

Browse files
Copilottrask
andcommitted
Fix test files and add missing Function imports for method lookups
Co-authored-by: trask <[email protected]>
1 parent a5ce50c commit 81f4c7e

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/ContextPropagationOperatorInstrumentationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.lang.invoke.MethodHandles;
2020
import java.time.Duration;
2121
import java.util.function.Function;
22+
import java.util.function.UnaryOperator;
2223
import javax.annotation.Nullable;
2324
import org.junit.jupiter.api.Test;
2425
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -194,7 +195,7 @@ void storeContextForcesItToBecomeCurrent() {
194195
}
195196

196197
private static class StoreOpenTelemetryContext
197-
implements Function<reactor.util.context.Context, reactor.util.context.Context> {
198+
implements UnaryOperator<reactor.util.context.Context> {
198199

199200
private final Span span;
200201

instrumentation/reactor/reactor-3.1/library/src/main/java/io/opentelemetry/instrumentation/reactor/v3_1/ContextPropagationOperator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import java.lang.invoke.MethodHandle;
3232
import java.lang.invoke.MethodHandles;
3333
import java.util.function.BiFunction;
34+
import java.util.function.Function;
3435
import java.util.function.UnaryOperator;
3536
import java.util.logging.Level;
3637
import java.util.logging.Logger;

instrumentation/reactor/reactor-3.1/library/src/test/java/io/opentelemetry/instrumentation/reactor/v3_1/ReactorCoreTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.time.Duration;
2626
import java.util.concurrent.atomic.AtomicBoolean;
2727
import java.util.function.Function;
28+
import java.util.function.UnaryOperator;
2829
import org.junit.jupiter.api.AfterAll;
2930
import org.junit.jupiter.api.BeforeAll;
3031
import org.junit.jupiter.api.Test;
@@ -131,7 +132,7 @@ void fluxInNonBlockingPublisherAssembly() {
131132
(Flux<Integer>)
132133
FLUX_CONTEXT_WRITE_METHOD.invoke(
133134
interim,
134-
(Function<reactor.util.context.Context, reactor.util.context.Context>)
135+
(UnaryOperator<reactor.util.context.Context>)
135136
ctx -> {
136137
Context parent =
137138
ContextPropagationOperator.getOpenTelemetryContext(
@@ -389,7 +390,7 @@ void doesNotOverrideInnerCurrentSpansWithThereIsOuterCurrent() {
389390
(Flux<Object>)
390391
FLUX_CONTEXT_WRITE_METHOD.invoke(
391392
interim,
392-
(Function<reactor.util.context.Context, reactor.util.context.Context>)
393+
(UnaryOperator<reactor.util.context.Context>)
393394
context -> {
394395
// subscribers that know that their subscription can happen
395396
// ahead of time and in the 'wrong' context, has to clean up 'wrong'
@@ -565,7 +566,7 @@ private <T> Mono<T> monoSpan(Mono<T> mono, String spanName) {
565566
return (Mono<T>)
566567
MONO_CONTEXT_WRITE_METHOD.invoke(
567568
interim,
568-
(Function<reactor.util.context.Context, reactor.util.context.Context>)
569+
(UnaryOperator<reactor.util.context.Context>)
569570
ctx -> {
570571
Context parent =
571572
ContextPropagationOperator.getOpenTelemetryContext(ctx, Context.current());

instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/internal/JarServiceNameResourceExtractorTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import io.opentelemetry.sdk.resources.Resource;
1313
import java.nio.file.Path;
1414
import java.nio.file.Paths;
15-
import java.util.function.Function;
1615
import java.util.function.Predicate;
16+
import java.util.function.UnaryOperator;
1717
import java.util.stream.Stream;
1818
import org.junit.jupiter.api.Test;
1919
import org.junit.jupiter.api.extension.ExtendWith;
@@ -29,7 +29,7 @@ class JarServiceNameResourceExtractorTest {
2929
@Test
3030
void extractResource_empty() {
3131
String[] processArgs = new String[0];
32-
Function<String, String> getProperty = prop -> null;
32+
UnaryOperator<String> getProperty = prop -> null;
3333
Predicate<Path> fileExists = JarServiceNameResourceExtractorTest::failPath;
3434
JarServiceNameResourceExtractor serviceNameProvider =
3535
getExtractor(processArgs, getProperty, fileExists);
@@ -40,7 +40,7 @@ void extractResource_empty() {
4040
}
4141

4242
private static JarServiceNameResourceExtractor getExtractor(
43-
String[] processArgs, Function<String, String> getProperty, Predicate<Path> fileExists) {
43+
String[] processArgs, UnaryOperator<String> getProperty, Predicate<Path> fileExists) {
4444
return new JarServiceNameResourceExtractor(
4545
new MainJarPathFinder(() -> processArgs, getProperty, fileExists));
4646
}
@@ -100,7 +100,7 @@ static String[] getArgs(String jarName) {
100100
@ParameterizedTest
101101
@MethodSource("sunCommandLineArguments")
102102
void extractResource_sunCommandLine(String commandLine, Path jarPath) {
103-
Function<String, String> getProperty =
103+
UnaryOperator<String> getProperty =
104104
key -> "sun.java.command".equals(key) ? commandLine : null;
105105
Predicate<Path> fileExists = jarPath::equals;
106106

@@ -116,7 +116,7 @@ void extractResource_sunCommandLine(String commandLine, Path jarPath) {
116116
// https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7567
117117
@Test
118118
void extractResource_sunCommandLineProblematicArgs() {
119-
Function<String, String> getProperty =
119+
UnaryOperator<String> getProperty =
120120
key -> key.equals("sun.java.command") ? "one C:/two" : null;
121121
Predicate<Path> fileExists = path -> false;
122122

0 commit comments

Comments
 (0)