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

Fix build

This commit is contained in:
Jack Berg 2025-06-03 17:50:17 -05:00
parent 4d94d04f51
commit eb3d80a0b0
No known key found for this signature in database
GPG Key ID: 8ACA4A135F1F2D23
8 changed files with 367 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
exporters/common/build.gradle.kts
View File

@ -66,6 +66,16 @@ testing {
implementation("io.grpc:grpc-stub")
implementation("io.grpc:grpc-netty")
// 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:
// JUnit Jupiter > initializationError FAILED
// org.junit.platform.launcher.core.DiscoveryIssueException: TestEngine with ID 'junit-jupiter' encountered a critical issue during test discovery:
//
// (1) [ERROR] ClassSelector [className = 'io.opentelemetry.exporter.internal.grpc.GrpcExporterTest$DummyMarshaler', classLoader = jdk.internal.loader.ClassLoaders$AppClassLoader@2aae9190] resolution failed
// Source: ClassSource [className = 'io.opentelemetry.exporter.internal.grpc.GrpcExporterTest$DummyMarshaler', filePosition = null]
// at io.opentelemetry.exporter.internal.grpc.GrpcExporterTest$DummyMarshaler.<no-method>(SourceFile:0)
// Cause: java.lang.NoClassDefFoundError: com/fasterxml/jackson/core/JsonGenerator
implementation("com.fasterxml.jackson.core:jackson-databind")
}
}
}

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

@ -50,16 +50,14 @@ import java.util.List;
import java.util.function.Consumer;
import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
import org.junit.jupiter.params.provider.MethodSource;
class LowAllocationMetricsRequestMarshalerTest {
@ParameterizedTest
@ArgumentsSource(MetricsProvider.class)
@MethodSource("metricsArgs")
void validateOutput(Collection<MetricData> metrics) throws Exception {
byte[] result;
{
@ -85,7 +83,7 @@ class LowAllocationMetricsRequestMarshalerTest {
}
@ParameterizedTest
@ArgumentsSource(MetricsProvider.class)
@MethodSource("metricsArgs")
void validateJsonOutput(Collection<MetricData> metrics) throws Exception {
String result;
{
@ -110,122 +108,7 @@ class LowAllocationMetricsRequestMarshalerTest {
assertThat(lowAllocationResult).isEqualTo(result);
}
@ParameterizedTest
@ArgumentsSource(ExemplarProvider.class)
void validateExemplar(ExemplarData exemplar) throws Exception {
byte[] result;
{
Marshaler marshaler = ExemplarMarshaler.create(exemplar);
ByteArrayOutputStream customOutput =
new ByteArrayOutputStream(marshaler.getBinarySerializedSize());
marshaler.writeBinaryTo(customOutput);
result = customOutput.toByteArray();
}
byte[] lowAllocationResult;
{
MarshalerContext context = new MarshalerContext();
class TestMarshaler extends MarshalerWithSize {
protected TestMarshaler() {
super(ExemplarStatelessMarshaler.INSTANCE.getBinarySerializedSize(exemplar, context));
}
@Override
protected void writeTo(Serializer output) throws IOException {
ExemplarStatelessMarshaler.INSTANCE.writeTo(output, exemplar, context);
}
}
Marshaler marshaler = new TestMarshaler();
ByteArrayOutputStream customOutput =
new ByteArrayOutputStream(marshaler.getBinarySerializedSize());
marshaler.writeBinaryTo(customOutput);
lowAllocationResult = customOutput.toByteArray();
}
assertThat(lowAllocationResult).isEqualTo(result);
}
@Test
void validateSummary() throws Exception {
List<ValueAtQuantile> percentileValues =
Arrays.asList(ImmutableValueAtQuantile.create(3.0, 4.0));
List<SummaryPointData> points =
Arrays.asList(
ImmutableSummaryPointData.create(
12345, 12346, Attributes.empty(), 1, 2.0, percentileValues));
SummaryData summary = ImmutableSummaryData.create(points);
byte[] result;
{
Marshaler marshaler = SummaryMarshaler.create(summary);
ByteArrayOutputStream customOutput =
new ByteArrayOutputStream(marshaler.getBinarySerializedSize());
marshaler.writeBinaryTo(customOutput);
result = customOutput.toByteArray();
}
byte[] lowAllocationResult;
{
MarshalerContext context = new MarshalerContext();
class TestMarshaler extends MarshalerWithSize {
protected TestMarshaler() {
super(SummaryStatelessMarshaler.INSTANCE.getBinarySerializedSize(summary, context));
}
@Override
protected void writeTo(Serializer output) throws IOException {
SummaryStatelessMarshaler.INSTANCE.writeTo(output, summary, context);
}
}
Marshaler marshaler = new TestMarshaler();
ByteArrayOutputStream customOutput =
new ByteArrayOutputStream(marshaler.getBinarySerializedSize());
marshaler.writeBinaryTo(customOutput);
lowAllocationResult = customOutput.toByteArray();
}
assertThat(lowAllocationResult).isEqualTo(result);
}
private static Collection<MetricData> metrics(Consumer<MeterProvider> metricProducer) {
InMemoryMetricReader metricReader = InMemoryMetricReader.create();
SdkMeterProvider meterProvider =
SdkMeterProvider.builder()
.registerMetricReader(metricReader)
.registerView(
InstrumentSelector.builder().setName("exponentialhistogram").build(),
View.builder()
.setAggregation(Aggregation.base2ExponentialBucketHistogram())
.build())
.setResource(
Resource.create(
Attributes.builder()
.put(AttributeKey.booleanKey("key_bool"), true)
.put(AttributeKey.stringKey("key_string"), "string")
.put(AttributeKey.longKey("key_int"), 100L)
.put(AttributeKey.doubleKey("key_double"), 100.3)
.put(
AttributeKey.stringArrayKey("key_string_array"),
Arrays.asList("string", "string"))
.put(AttributeKey.longArrayKey("key_long_array"), Arrays.asList(12L, 23L))
.put(
AttributeKey.doubleArrayKey("key_double_array"),
Arrays.asList(12.3, 23.1))
.put(
AttributeKey.booleanArrayKey("key_boolean_array"),
Arrays.asList(true, false))
.build()))
.build();
metricProducer.accept(meterProvider);
return metricReader.collectAllMetrics();
}
private static class MetricsProvider implements ArgumentsProvider {
@Override
public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
private static Stream<Arguments> metricsArgs() {
return Stream.of(
arguments(
named(
@ -242,8 +125,7 @@ class LowAllocationMetricsRequestMarshalerTest {
measurement ->
measurement.record(
5,
Attributes.of(
AttributeKey.stringKey("key"), "value")))))),
Attributes.of(AttributeKey.stringKey("key"), "value")))))),
arguments(
named(
"long counter",
@ -273,8 +155,7 @@ class LowAllocationMetricsRequestMarshalerTest {
.setUnit("unit")
.build();
longUpDownCounter.add(1);
longUpDownCounter.add(
-1, Attributes.of(AttributeKey.booleanKey("on"), true));
longUpDownCounter.add(-1, Attributes.of(AttributeKey.booleanKey("on"), true));
longUpDownCounter.add(1);
}))),
arguments(
@ -382,11 +263,44 @@ class LowAllocationMetricsRequestMarshalerTest {
histogram.record(5);
}))));
}
@ParameterizedTest
@MethodSource("exemplarArgs")
void validateExemplar(ExemplarData exemplar) throws Exception {
byte[] result;
{
Marshaler marshaler = ExemplarMarshaler.create(exemplar);
ByteArrayOutputStream customOutput =
new ByteArrayOutputStream(marshaler.getBinarySerializedSize());
marshaler.writeBinaryTo(customOutput);
result = customOutput.toByteArray();
}
byte[] lowAllocationResult;
{
MarshalerContext context = new MarshalerContext();
class TestMarshaler extends MarshalerWithSize {
protected TestMarshaler() {
super(ExemplarStatelessMarshaler.INSTANCE.getBinarySerializedSize(exemplar, context));
}
private static class ExemplarProvider implements ArgumentsProvider {
@Override
public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
protected void writeTo(Serializer output) throws IOException {
ExemplarStatelessMarshaler.INSTANCE.writeTo(output, exemplar, context);
}
}
Marshaler marshaler = new TestMarshaler();
ByteArrayOutputStream customOutput =
new ByteArrayOutputStream(marshaler.getBinarySerializedSize());
marshaler.writeBinaryTo(customOutput);
lowAllocationResult = customOutput.toByteArray();
}
assertThat(lowAllocationResult).isEqualTo(result);
}
private static Stream<Arguments> exemplarArgs() {
SpanContext spanContext =
SpanContext.create(
"7b2e170db4df2d593ddb4ddf2ddf2d59",
@ -404,5 +318,81 @@ class LowAllocationMetricsRequestMarshalerTest {
"long exemplar",
ImmutableLongExemplarData.create(Attributes.empty(), 12345, spanContext, 5))));
}
@Test
void validateSummary() throws Exception {
List<ValueAtQuantile> percentileValues =
Arrays.asList(ImmutableValueAtQuantile.create(3.0, 4.0));
List<SummaryPointData> points =
Arrays.asList(
ImmutableSummaryPointData.create(
12345, 12346, Attributes.empty(), 1, 2.0, percentileValues));
SummaryData summary = ImmutableSummaryData.create(points);
byte[] result;
{
Marshaler marshaler = SummaryMarshaler.create(summary);
ByteArrayOutputStream customOutput =
new ByteArrayOutputStream(marshaler.getBinarySerializedSize());
marshaler.writeBinaryTo(customOutput);
result = customOutput.toByteArray();
}
byte[] lowAllocationResult;
{
MarshalerContext context = new MarshalerContext();
class TestMarshaler extends MarshalerWithSize {
protected TestMarshaler() {
super(SummaryStatelessMarshaler.INSTANCE.getBinarySerializedSize(summary, context));
}
@Override
protected void writeTo(Serializer output) throws IOException {
SummaryStatelessMarshaler.INSTANCE.writeTo(output, summary, context);
}
}
Marshaler marshaler = new TestMarshaler();
ByteArrayOutputStream customOutput =
new ByteArrayOutputStream(marshaler.getBinarySerializedSize());
marshaler.writeBinaryTo(customOutput);
lowAllocationResult = customOutput.toByteArray();
}
assertThat(lowAllocationResult).isEqualTo(result);
}
private static Collection<MetricData> metrics(Consumer<MeterProvider> metricProducer) {
InMemoryMetricReader metricReader = InMemoryMetricReader.create();
SdkMeterProvider meterProvider =
SdkMeterProvider.builder()
.registerMetricReader(metricReader)
.registerView(
InstrumentSelector.builder().setName("exponentialhistogram").build(),
View.builder()
.setAggregation(Aggregation.base2ExponentialBucketHistogram())
.build())
.setResource(
Resource.create(
Attributes.builder()
.put(AttributeKey.booleanKey("key_bool"), true)
.put(AttributeKey.stringKey("key_string"), "string")
.put(AttributeKey.longKey("key_int"), 100L)
.put(AttributeKey.doubleKey("key_double"), 100.3)
.put(
AttributeKey.stringArrayKey("key_string_array"),
Arrays.asList("string", "string"))
.put(AttributeKey.longArrayKey("key_long_array"), Arrays.asList(12L, 23L))
.put(
AttributeKey.doubleArrayKey("key_double_array"),
Arrays.asList(12.3, 23.1))
.put(
AttributeKey.booleanArrayKey("key_boolean_array"),
Arrays.asList(true, false))
.build()))
.build();
metricProducer.accept(meterProvider);
return metricReader.collectAllMetrics();
}
}

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

@ -91,12 +91,10 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.provider.ValueSource;
import org.slf4j.event.Level;
import org.slf4j.event.LoggingEvent;
@ -462,7 +460,7 @@ public abstract class AbstractGrpcTelemetryExporterTest<T, U extends Message> {
}
@ParameterizedTest
@ArgumentsSource(ClientPrivateKeyProvider.class)
@MethodSource("clientPrivateKeyArgs")
void clientTls(byte[] privateKey) throws Exception {
TelemetryExporter<T> exporter =
exporterBuilder()
@ -480,15 +478,11 @@ public abstract class AbstractGrpcTelemetryExporterTest<T, U extends Message> {
}
}
private static class ClientPrivateKeyProvider implements ArgumentsProvider {
@Override
@SuppressWarnings("PrimitiveArrayPassedToVarargsMethod")
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
private static Stream<Arguments> clientPrivateKeyArgs() throws Exception {
return Stream.of(
arguments(named("PEM", Files.readAllBytes(clientCertificate.privateKeyFile().toPath()))),
arguments(named("DER", clientCertificate.privateKey().getEncoded())));
}
}
@Test
@SuppressLogger(GrpcExporter.class)

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

@ -92,12 +92,10 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.provider.ValueSource;
import org.mockserver.integration.ClientAndServer;
import org.slf4j.event.Level;
@ -477,7 +475,7 @@ public abstract class AbstractHttpTelemetryExporterTest<T, U extends Message> {
}
@ParameterizedTest
@ArgumentsSource(ClientPrivateKeyProvider.class)
@MethodSource("clientPrivateKeyArgs")
void clientTls(byte[] privateKey) throws Exception {
TelemetryExporter<T> exporter =
exporterBuilder()
@ -495,15 +493,11 @@ public abstract class AbstractHttpTelemetryExporterTest<T, U extends Message> {
}
}
private static class ClientPrivateKeyProvider implements ArgumentsProvider {
@Override
@SuppressWarnings("PrimitiveArrayPassedToVarargsMethod")
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
private static Stream<Arguments> clientPrivateKeyArgs() throws Exception {
return Stream.of(
arguments(named("PEM", Files.readAllBytes(clientCertificate.privateKeyFile().toPath()))),
arguments(named("DER", clientCertificate.privateKey().getEncoded())));
}
}
@Test
@SuppressLogger(HttpExporter.class)

10
exporters/sender/jdk/build.gradle.kts
View File

@ -11,6 +11,16 @@ dependencies {
implementation(project(":sdk:common"))
compileOnly("com.fasterxml.jackson.core:jackson-core")
// 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:
// JUnit Jupiter > initializationError FAILED
// org.junit.platform.launcher.core.DiscoveryIssueException: TestEngine with ID 'junit-jupiter' encountered a critical issue during test discovery:
//
// (1) [ERROR] ClassSelector [className = 'io.opentelemetry.exporter.sender.jdk.internal.JdkHttpSenderTest$NoOpMarshaler', classLoader = jdk.internal.loader.ClassLoaders$AppClassLoader@2aae9190] resolution failed
// Source: ClassSource [className = 'io.opentelemetry.exporter.sender.jdk.internal.JdkHttpSenderTest$NoOpMarshaler', filePosition = null]
// at io.opentelemetry.exporter.sender.jdk.internal.JdkHttpSenderTest$NoOpMarshaler.<no-method>(SourceFile:0)
// Cause: java.lang.NoClassDefFoundError: com/fasterxml/jackson/core/JsonGenerator
testImplementation("com.fasterxml.jackson.core:jackson-databind")
}
tasks {

21
integration-tests/src/test/java/io/opentelemetry/B3PropagationIntegrationTest.java
View File

@ -38,12 +38,10 @@ import java.util.stream.Stream;
import javax.annotation.Nullable;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
import org.junit.jupiter.params.provider.MethodSource;
/** Integration tests for the B3 propagators, in various configurations. */
class B3PropagationIntegrationTest {
@ -160,7 +158,7 @@ class B3PropagationIntegrationTest {
}
@ParameterizedTest
@ArgumentsSource(WebClientArgumentSupplier.class)
@MethodSource("webClientArgs")
void propagation(String testType, WebClient client) throws IOException {
OpenTelemetrySdk clientSdk = setupClient();
@ -181,7 +179,7 @@ class B3PropagationIntegrationTest {
}
@ParameterizedTest
@ArgumentsSource(WebClientArgumentSupplier.class)
@MethodSource("webClientArgs")
void noClientTracing(String testType, WebClient client) throws IOException {
assertThat(client.get("/frontend").aggregate().join().contentUtf8()).isEqualTo("OK");
@ -194,6 +192,11 @@ class B3PropagationIntegrationTest {
.allSatisfy(spanData -> assertThat(spanData.getTraceId()).isEqualTo(traceId));
}
private static Stream<Arguments> webClientArgs() {
return Stream.of(
Arguments.of("b3multi", b3MultiClient), Arguments.of("b3single", b3SingleClient));
}
private static WebClient createPropagatingClient(URI uri, TextMapPropagator propagator) {
return WebClient.builder(uri)
.decorator(
@ -234,12 +237,4 @@ class B3PropagationIntegrationTest {
}
});
}
public static class WebClientArgumentSupplier implements ArgumentsProvider {
@Override
public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
return Stream.of(
Arguments.of("b3multi", b3MultiClient), Arguments.of("b3single", b3SingleClient));
}
}
}

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

@ -45,12 +45,10 @@ import org.awaitility.core.ThrowingRunnable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
import org.junit.jupiter.params.provider.MethodSource;
import org.slf4j.event.Level;
import org.slf4j.event.LoggingEvent;
@ -169,7 +167,7 @@ class JaegerRemoteSamplerTest {
}
@ParameterizedTest
@ArgumentsSource(ClientPrivateKeyProvider.class)
@MethodSource("clientPrivateKeyArgs")
void clientTlsConnectionWorks(byte[] privateKey) throws IOException {
try (JaegerRemoteSampler sampler =
JaegerRemoteSampler.builder()
@ -189,15 +187,11 @@ class JaegerRemoteSamplerTest {
}
}
private static class ClientPrivateKeyProvider implements ArgumentsProvider {
@Override
@SuppressWarnings("PrimitiveArrayPassedToVarargsMethod")
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
private static Stream<Arguments> clientPrivateKeyArgs() throws IOException {
return Stream.of(
arguments(named("PEM", Files.readAllBytes(clientCertificate.privateKeyFile().toPath()))),
arguments(named("DER", clientCertificate.privateKey().getEncoded())));
}
}
@Test
void tlsViaSslContext() throws Exception {

26
sdk/metrics/src/testIncubating/java/io/opentelemetry/sdk/metrics/AttributesAdviceTest.java
View File

@ -51,11 +51,9 @@ import java.util.function.Consumer;
import java.util.stream.Stream;
import javax.annotation.Nullable;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
import org.junit.jupiter.params.provider.MethodSource;
class AttributesAdviceTest {
@ -74,7 +72,7 @@ class AttributesAdviceTest {
}
@ParameterizedTest
@ArgumentsSource(InstrumentsProvider.class)
@MethodSource("instrumentProviderArgs")
void instrumentWithoutAdvice(
InstrumentFactory instrumentFactory, PointsAssert<AbstractPointAssert<?, ?>> pointsAssert) {
InMemoryMetricReader reader = InMemoryMetricReader.create();
@ -91,7 +89,7 @@ class AttributesAdviceTest {
}
@ParameterizedTest
@ArgumentsSource(InstrumentsProvider.class)
@MethodSource("instrumentProviderArgs")
void instrumentWithAdvice(
InstrumentFactory instrumentFactory, PointsAssert<AbstractPointAssert<?, ?>> pointsAssert) {
InMemoryMetricReader reader = InMemoryMetricReader.create();
@ -113,7 +111,7 @@ class AttributesAdviceTest {
}
@ParameterizedTest
@ArgumentsSource(InstrumentsProvider.class)
@MethodSource("instrumentProviderArgs")
void instrumentWithAdviceAndViews(
InstrumentFactory instrumentFactory, PointsAssert<AbstractPointAssert<?, ?>> pointsAssert) {
InMemoryMetricReader reader = InMemoryMetricReader.create();
@ -143,7 +141,7 @@ class AttributesAdviceTest {
}
@ParameterizedTest
@ArgumentsSource(InstrumentsProvider.class)
@MethodSource("instrumentProviderArgs")
void instrumentWithAdviceAndDescriptionViews(
InstrumentFactory instrumentFactory, PointsAssert<AbstractPointAssert<?, ?>> pointsAssert) {
InMemoryMetricReader reader = InMemoryMetricReader.create();
@ -175,7 +173,7 @@ class AttributesAdviceTest {
}
@ParameterizedTest
@ArgumentsSource(InstrumentsProvider.class)
@MethodSource("instrumentProviderArgs")
void instrumentWithAdviceAndBaggage(
InstrumentFactory instrumentFactory, PointsAssert<AbstractPointAssert<?, ?>> pointsAssert) {
InMemoryMetricReader reader = InMemoryMetricReader.create();
@ -217,10 +215,7 @@ class AttributesAdviceTest {
equalTo(stringKey("baggage1"), "value1"))));
}
static final class InstrumentsProvider implements ArgumentsProvider {
@Override
public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
private static Stream<Arguments> instrumentProviderArgs() {
return Stream.of(
// double counter
arguments(
@ -254,8 +249,7 @@ class AttributesAdviceTest {
},
(PointsAssert<LongPointAssert>)
(metricAssert, assertions) ->
metricAssert.hasLongSumSatisfying(
sum -> sum.hasPointsSatisfying(assertions))),
metricAssert.hasLongSumSatisfying(sum -> sum.hasPointsSatisfying(assertions))),
// double gauge
arguments(
(InstrumentFactory)
@ -356,9 +350,7 @@ class AttributesAdviceTest {
},
(PointsAssert<LongPointAssert>)
(metricAssert, assertions) ->
metricAssert.hasLongSumSatisfying(
sum -> sum.hasPointsSatisfying(assertions))));
}
metricAssert.hasLongSumSatisfying(sum -> sum.hasPointsSatisfying(assertions))));
}
@FunctionalInterface