Skip to content

Commit 7b97a77

Browse files
committed
update more things for junit update
1 parent 6da7e2b commit 7b97a77

File tree

6 files changed

+18
-7
lines changed

6 files changed

+18
-7
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import org.junit.jupiter.params.provider.Arguments;
5656
import org.junit.jupiter.params.provider.ArgumentsProvider;
5757
import org.junit.jupiter.params.provider.ArgumentsSource;
58+
import org.junit.jupiter.params.support.ParameterDeclarations;
5859

5960
class LowAllocationMetricsRequestMarshalerTest {
6061

@@ -225,7 +226,8 @@ private static Collection<MetricData> metrics(Consumer<MeterProvider> metricProd
225226

226227
private static class MetricsProvider implements ArgumentsProvider {
227228
@Override
228-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
229+
public Stream<? extends Arguments> provideArguments(
230+
ParameterDeclarations parameters, ExtensionContext context) {
229231
return Stream.of(
230232
arguments(
231233
named(
@@ -386,7 +388,8 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
386388

387389
private static class ExemplarProvider implements ArgumentsProvider {
388390
@Override
389-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
391+
public Stream<? extends Arguments> provideArguments(
392+
ParameterDeclarations parameters, ExtensionContext context) {
390393
SpanContext spanContext =
391394
SpanContext.create(
392395
"7b2e170db4df2d593ddb4ddf2ddf2d59",

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
import org.junit.jupiter.params.provider.ArgumentsProvider;
9999
import org.junit.jupiter.params.provider.ArgumentsSource;
100100
import org.junit.jupiter.params.provider.ValueSource;
101+
import org.junit.jupiter.params.support.ParameterDeclarations;
101102
import org.slf4j.event.Level;
102103
import org.slf4j.event.LoggingEvent;
103104

@@ -461,7 +462,8 @@ void clientTls(byte[] privateKey) throws Exception {
461462
private static class ClientPrivateKeyProvider implements ArgumentsProvider {
462463
@Override
463464
@SuppressWarnings("PrimitiveArrayPassedToVarargsMethod")
464-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
465+
public Stream<? extends Arguments> provideArguments(
466+
ParameterDeclarations parameters, ExtensionContext context) throws Exception {
465467
return Stream.of(
466468
arguments(named("PEM", Files.readAllBytes(clientCertificate.privateKeyFile().toPath()))),
467469
arguments(named("DER", clientCertificate.privateKey().getEncoded())));

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
import org.junit.jupiter.params.provider.ArgumentsProvider;
100100
import org.junit.jupiter.params.provider.ArgumentsSource;
101101
import org.junit.jupiter.params.provider.ValueSource;
102+
import org.junit.jupiter.params.support.ParameterDeclarations;
102103
import org.mockserver.integration.ClientAndServer;
103104
import org.slf4j.event.Level;
104105
import org.slf4j.event.LoggingEvent;
@@ -475,7 +476,8 @@ void clientTls(byte[] privateKey) throws Exception {
475476
private static class ClientPrivateKeyProvider implements ArgumentsProvider {
476477
@Override
477478
@SuppressWarnings("PrimitiveArrayPassedToVarargsMethod")
478-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
479+
public Stream<? extends Arguments> provideArguments(
480+
ParameterDeclarations parameters, ExtensionContext context) throws Exception {
479481
return Stream.of(
480482
arguments(named("PEM", Files.readAllBytes(clientCertificate.privateKeyFile().toPath()))),
481483
arguments(named("DER", clientCertificate.privateKey().getEncoded())));

exporters/sender/jdk/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
implementation(project(":exporters:common"))
1111
implementation(project(":sdk:common"))
1212

13-
compileOnly("com.fasterxml.jackson.core:jackson-core")
13+
testImplementation("com.fasterxml.jackson.core:jackson-core")
1414
}
1515

1616
tasks {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import org.junit.jupiter.params.provider.Arguments;
5252
import org.junit.jupiter.params.provider.ArgumentsProvider;
5353
import org.junit.jupiter.params.provider.ArgumentsSource;
54+
import org.junit.jupiter.params.support.ParameterDeclarations;
5455
import org.slf4j.event.Level;
5556
import org.slf4j.event.LoggingEvent;
5657

@@ -192,7 +193,8 @@ void clientTlsConnectionWorks(byte[] privateKey) throws IOException {
192193
private static class ClientPrivateKeyProvider implements ArgumentsProvider {
193194
@Override
194195
@SuppressWarnings("PrimitiveArrayPassedToVarargsMethod")
195-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
196+
public Stream<? extends Arguments> provideArguments(
197+
ParameterDeclarations parameters, ExtensionContext context) throws Exception {
196198
return Stream.of(
197199
arguments(named("PEM", Files.readAllBytes(clientCertificate.privateKeyFile().toPath()))),
198200
arguments(named("DER", clientCertificate.privateKey().getEncoded())));

sdk/metrics/src/testIncubating/java/io/opentelemetry/sdk/metrics/AttributesAdviceTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import org.junit.jupiter.params.provider.Arguments;
5757
import org.junit.jupiter.params.provider.ArgumentsProvider;
5858
import org.junit.jupiter.params.provider.ArgumentsSource;
59+
import org.junit.jupiter.params.support.ParameterDeclarations;
5960

6061
class AttributesAdviceTest {
6162

@@ -220,7 +221,8 @@ void instrumentWithAdviceAndBaggage(
220221
static final class InstrumentsProvider implements ArgumentsProvider {
221222

222223
@Override
223-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
224+
public Stream<? extends Arguments> provideArguments(
225+
ParameterDeclarations parameters, ExtensionContext context) {
224226
return Stream.of(
225227
// double counter
226228
arguments(

0 commit comments

Comments
 (0)