Skip to content

Commit eb3d80a

Browse files
jack-bergjack-berg
committed
Fix build
1 parent 4d94d04 commit eb3d80a

File tree

8 files changed

+367
-388
lines changed

8 files changed

+367
-388
lines changed

‎exporters/common/build.gradle.kts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,16 @@ testing {
6666

6767
implementation("io.grpc:grpc-stub")
6868
implementation("io.grpc:grpc-netty")
69+
70+
// NOTE: this is a strange dependency. junit reflectively analyzes classes as part of its test discovery process, eventually encounters to jackson-databind classes, and fails with a NoClassDefFoundError:
71+
// JUnit Jupiter > initializationError FAILED
72+
// org.junit.platform.launcher.core.DiscoveryIssueException: TestEngine with ID 'junit-jupiter' encountered a critical issue during test discovery:
73+
//
74+
// (1) [ERROR] ClassSelector [className = 'io.opentelemetry.exporter.internal.grpc.GrpcExporterTest$DummyMarshaler', classLoader = jdk.internal.loader.ClassLoaders$AppClassLoader@2aae9190] resolution failed
75+
// Source: ClassSource [className = 'io.opentelemetry.exporter.internal.grpc.GrpcExporterTest$DummyMarshaler', filePosition = null]
76+
// at io.opentelemetry.exporter.internal.grpc.GrpcExporterTest$DummyMarshaler.<no-method>(SourceFile:0)
77+
// Cause: java.lang.NoClassDefFoundError: com/fasterxml/jackson/core/JsonGenerator
78+
implementation("com.fasterxml.jackson.core:jackson-databind")
6979
}
7080
}
7181
}

‎exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/metrics/LowAllocationMetricsRequestMarshalerTest.java‎

Lines changed: 179 additions & 189 deletions
Large diffs are not rendered by default.

‎exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,10 @@
9191
import org.junit.jupiter.api.Order;
9292
import org.junit.jupiter.api.Test;
9393
import org.junit.jupiter.api.TestInstance;
94-
import org.junit.jupiter.api.extension.ExtensionContext;
9594
import org.junit.jupiter.api.extension.RegisterExtension;
9695
import org.junit.jupiter.params.ParameterizedTest;
9796
import org.junit.jupiter.params.provider.Arguments;
98-
import org.junit.jupiter.params.provider.ArgumentsProvider;
99-
import org.junit.jupiter.params.provider.ArgumentsSource;
97+
import org.junit.jupiter.params.provider.MethodSource;
10098
import org.junit.jupiter.params.provider.ValueSource;
10199
import org.slf4j.event.Level;
102100
import org.slf4j.event.LoggingEvent;
@@ -462,7 +460,7 @@ void tls_badCert() {
462460
}
463461

464462
@ParameterizedTest
465-
@ArgumentsSource(ClientPrivateKeyProvider.class)
463+
@MethodSource("clientPrivateKeyArgs")
466464
void clientTls(byte[] privateKey) throws Exception {
467465
TelemetryExporter<T> exporter =
468466
exporterBuilder()
@@ -480,14 +478,10 @@ void clientTls(byte[] privateKey) throws Exception {
480478
}
481479
}
482480

483-
private static class ClientPrivateKeyProvider implements ArgumentsProvider {
484-
@Override
485-
@SuppressWarnings("PrimitiveArrayPassedToVarargsMethod")
486-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
487-
return Stream.of(
488-
arguments(named("PEM", Files.readAllBytes(clientCertificate.privateKeyFile().toPath()))),
489-
arguments(named("DER", clientCertificate.privateKey().getEncoded())));
490-
}
481+
private static Stream<Arguments> clientPrivateKeyArgs() throws Exception {
482+
return Stream.of(
483+
arguments(named("PEM", Files.readAllBytes(clientCertificate.privateKeyFile().toPath()))),
484+
arguments(named("DER", clientCertificate.privateKey().getEncoded())));
491485
}
492486

493487
@Test

‎exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,10 @@
9292
import org.junit.jupiter.api.Order;
9393
import org.junit.jupiter.api.Test;
9494
import org.junit.jupiter.api.TestInstance;
95-
import org.junit.jupiter.api.extension.ExtensionContext;
9695
import org.junit.jupiter.api.extension.RegisterExtension;
9796
import org.junit.jupiter.params.ParameterizedTest;
9897
import org.junit.jupiter.params.provider.Arguments;
99-
import org.junit.jupiter.params.provider.ArgumentsProvider;
100-
import org.junit.jupiter.params.provider.ArgumentsSource;
98+
import org.junit.jupiter.params.provider.MethodSource;
10199
import org.junit.jupiter.params.provider.ValueSource;
102100
import org.mockserver.integration.ClientAndServer;
103101
import org.slf4j.event.Level;
@@ -477,7 +475,7 @@ void tls_badCert() {
477475
}
478476

479477
@ParameterizedTest
480-
@ArgumentsSource(ClientPrivateKeyProvider.class)
478+
@MethodSource("clientPrivateKeyArgs")
481479
void clientTls(byte[] privateKey) throws Exception {
482480
TelemetryExporter<T> exporter =
483481
exporterBuilder()
@@ -495,14 +493,10 @@ void clientTls(byte[] privateKey) throws Exception {
495493
}
496494
}
497495

498-
private static class ClientPrivateKeyProvider implements ArgumentsProvider {
499-
@Override
500-
@SuppressWarnings("PrimitiveArrayPassedToVarargsMethod")
501-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
502-
return Stream.of(
503-
arguments(named("PEM", Files.readAllBytes(clientCertificate.privateKeyFile().toPath()))),
504-
arguments(named("DER", clientCertificate.privateKey().getEncoded())));
505-
}
496+
private static Stream<Arguments> clientPrivateKeyArgs() throws Exception {
497+
return Stream.of(
498+
arguments(named("PEM", Files.readAllBytes(clientCertificate.privateKeyFile().toPath()))),
499+
arguments(named("DER", clientCertificate.privateKey().getEncoded())));
506500
}
507501

508502
@Test

‎exporters/sender/jdk/build.gradle.kts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@ dependencies {
1111
implementation(project(":sdk:common"))
1212

1313
compileOnly("com.fasterxml.jackson.core:jackson-core")
14+
15+
// NOTE: this is a strange dependency. junit reflectively analyzes classes as part of its test discovery process, eventually encounters to jackson-databind classes, and fails with a NoClassDefFoundError:
16+
// JUnit Jupiter > initializationError FAILED
17+
// org.junit.platform.launcher.core.DiscoveryIssueException: TestEngine with ID 'junit-jupiter' encountered a critical issue during test discovery:
18+
//
19+
// (1) [ERROR] ClassSelector [className = 'io.opentelemetry.exporter.sender.jdk.internal.JdkHttpSenderTest$NoOpMarshaler', classLoader = jdk.internal.loader.ClassLoaders$AppClassLoader@2aae9190] resolution failed
20+
// Source: ClassSource [className = 'io.opentelemetry.exporter.sender.jdk.internal.JdkHttpSenderTest$NoOpMarshaler', filePosition = null]
21+
// at io.opentelemetry.exporter.sender.jdk.internal.JdkHttpSenderTest$NoOpMarshaler.<no-method>(SourceFile:0)
22+
// Cause: java.lang.NoClassDefFoundError: com/fasterxml/jackson/core/JsonGenerator
23+
testImplementation("com.fasterxml.jackson.core:jackson-databind")
1424
}
1525

1626
tasks {

‎integration-tests/src/test/java/io/opentelemetry/B3PropagationIntegrationTest.java‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,10 @@
3838
import javax.annotation.Nullable;
3939
import org.junit.jupiter.api.AfterEach;
4040
import org.junit.jupiter.api.BeforeAll;
41-
import org.junit.jupiter.api.extension.ExtensionContext;
4241
import org.junit.jupiter.api.extension.RegisterExtension;
4342
import org.junit.jupiter.params.ParameterizedTest;
4443
import org.junit.jupiter.params.provider.Arguments;
45-
import org.junit.jupiter.params.provider.ArgumentsProvider;
46-
import org.junit.jupiter.params.provider.ArgumentsSource;
44+
import org.junit.jupiter.params.provider.MethodSource;
4745

4846
/** Integration tests for the B3 propagators, in various configurations. */
4947
class B3PropagationIntegrationTest {
@@ -160,7 +158,7 @@ void shutdown() {
160158
}
161159

162160
@ParameterizedTest
163-
@ArgumentsSource(WebClientArgumentSupplier.class)
161+
@MethodSource("webClientArgs")
164162
void propagation(String testType, WebClient client) throws IOException {
165163
OpenTelemetrySdk clientSdk = setupClient();
166164

@@ -181,7 +179,7 @@ void propagation(String testType, WebClient client) throws IOException {
181179
}
182180

183181
@ParameterizedTest
184-
@ArgumentsSource(WebClientArgumentSupplier.class)
182+
@MethodSource("webClientArgs")
185183
void noClientTracing(String testType, WebClient client) throws IOException {
186184
assertThat(client.get("/frontend").aggregate().join().contentUtf8()).isEqualTo("OK");
187185

@@ -194,6 +192,11 @@ void noClientTracing(String testType, WebClient client) throws IOException {
194192
.allSatisfy(spanData -> assertThat(spanData.getTraceId()).isEqualTo(traceId));
195193
}
196194

195+
private static Stream<Arguments> webClientArgs() {
196+
return Stream.of(
197+
Arguments.of("b3multi", b3MultiClient), Arguments.of("b3single", b3SingleClient));
198+
}
199+
197200
private static WebClient createPropagatingClient(URI uri, TextMapPropagator propagator) {
198201
return WebClient.builder(uri)
199202
.decorator(
@@ -234,12 +237,4 @@ public String get(@Nullable HttpRequest carrier, String key) {
234237
}
235238
});
236239
}
237-
238-
public static class WebClientArgumentSupplier implements ArgumentsProvider {
239-
@Override
240-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
241-
return Stream.of(
242-
Arguments.of("b3multi", b3MultiClient), Arguments.of("b3single", b3SingleClient));
243-
}
244-
}
245240
}

‎sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerTest.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,10 @@
4545
import org.junit.jupiter.api.BeforeEach;
4646
import org.junit.jupiter.api.Order;
4747
import org.junit.jupiter.api.Test;
48-
import org.junit.jupiter.api.extension.ExtensionContext;
4948
import org.junit.jupiter.api.extension.RegisterExtension;
5049
import org.junit.jupiter.params.ParameterizedTest;
5150
import org.junit.jupiter.params.provider.Arguments;
52-
import org.junit.jupiter.params.provider.ArgumentsProvider;
53-
import org.junit.jupiter.params.provider.ArgumentsSource;
51+
import org.junit.jupiter.params.provider.MethodSource;
5452
import org.slf4j.event.Level;
5553
import org.slf4j.event.LoggingEvent;
5654

@@ -169,7 +167,7 @@ void tlsConnectionWorks() throws IOException {
169167
}
170168

171169
@ParameterizedTest
172-
@ArgumentsSource(ClientPrivateKeyProvider.class)
170+
@MethodSource("clientPrivateKeyArgs")
173171
void clientTlsConnectionWorks(byte[] privateKey) throws IOException {
174172
try (JaegerRemoteSampler sampler =
175173
JaegerRemoteSampler.builder()
@@ -189,14 +187,10 @@ void clientTlsConnectionWorks(byte[] privateKey) throws IOException {
189187
}
190188
}
191189

192-
private static class ClientPrivateKeyProvider implements ArgumentsProvider {
193-
@Override
194-
@SuppressWarnings("PrimitiveArrayPassedToVarargsMethod")
195-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
196-
return Stream.of(
197-
arguments(named("PEM", Files.readAllBytes(clientCertificate.privateKeyFile().toPath()))),
198-
arguments(named("DER", clientCertificate.privateKey().getEncoded())));
199-
}
190+
private static Stream<Arguments> clientPrivateKeyArgs() throws IOException {
191+
return Stream.of(
192+
arguments(named("PEM", Files.readAllBytes(clientCertificate.privateKeyFile().toPath()))),
193+
arguments(named("DER", clientCertificate.privateKey().getEncoded())));
200194
}
201195

202196
@Test

0 commit comments

Comments
 (0)