From a9ae1443f594e1703f610656c7e17838ec987680 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Nov 2025 16:26:02 +0000 Subject: [PATCH 1/3] fix(deps): update junit-framework monorepo to v5.14.1 --- dependencyManagement/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 85fe78b2dcf..b3c5883743a 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -17,7 +17,7 @@ val slf4jVersion = "2.0.17" val opencensusVersion = "0.31.1" val prometheusServerVersion = "1.3.10" val armeriaVersion = "1.33.4" -val junitVersion = "5.13.4" +val junitVersion = "5.14.1" val okhttpVersion = "5.3.2" val DEPENDENCY_BOMS = listOf( From 59d0073c73666253f3888804a192d2b9a0595b5a Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 19 Nov 2025 11:13:51 -0800 Subject: [PATCH 2/3] Fix tests --- .../metrics/OtlpHttpMetricExporterOkHttpSenderTest.java | 7 ++++--- .../http/trace/OtlpHttpSpanExporterOkHttpSenderTest.java | 7 ++++--- .../exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java | 7 ++++--- .../exporter/otlp/traces/OtlpGrpcSpanExporterTest.java | 7 ++++--- .../http/metrics/OtlpHttpMetricExporterJdkSenderTest.java | 7 ++++--- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterOkHttpSenderTest.java b/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterOkHttpSenderTest.java index eee09f314c5..a2b18d2bed0 100644 --- a/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterOkHttpSenderTest.java +++ b/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterOkHttpSenderTest.java @@ -86,8 +86,6 @@ void stringRepresentation() { assertThat(metricExporter.toString()) .matches( "OtlpHttpMetricExporter\\{" - + "exporterName=otlp, " - + "type=metric, " + "endpoint=http://localhost:4318/v1/metrics, " + "timeoutNanos=" + TimeUnit.SECONDS.toNanos(10) @@ -100,9 +98,12 @@ void stringRepresentation() { + "exportAsJson=false, " + "headers=Headers\\{User-Agent=OBFUSCATED\\}, " + "retryPolicy=RetryPolicy\\{.*\\}, " + + "componentLoader=.*, " + + "exporterType=OTLP_HTTP_METRIC_EXPORTER, " + + "internalTelemetrySchemaVersion=LEGACY, " + "aggregationTemporalitySelector=AggregationTemporalitySelector\\{.*\\}, " + "defaultAggregationSelector=DefaultAggregationSelector\\{.*\\}, " - + "memoryMode=IMMUTABLE_DATA" + + "memoryMode=REUSABLE_DATA" + "\\}"); } } diff --git a/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterOkHttpSenderTest.java b/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterOkHttpSenderTest.java index da42bed03d8..a68c2e5fd19 100644 --- a/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterOkHttpSenderTest.java +++ b/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterOkHttpSenderTest.java @@ -35,8 +35,6 @@ void stringRepresentation() { assertThat(spanExporter.toString()) .matches( "OtlpHttpSpanExporter\\{" - + "exporterName=otlp, " - + "type=span, " + "endpoint=http://localhost:4318/v1/traces, " + "timeoutNanos=" + TimeUnit.SECONDS.toNanos(10) @@ -49,7 +47,10 @@ void stringRepresentation() { + "exportAsJson=false, " + "headers=Headers\\{User-Agent=OBFUSCATED\\}, " + "retryPolicy=RetryPolicy\\{.*\\}, " - + "memoryMode=IMMUTABLE_DATA" + + "componentLoader=.*, " + + "exporterType=OTLP_HTTP_SPAN_EXPORTER, " + + "internalTelemetrySchemaVersion=LEGACY, " + + "memoryMode=REUSABLE_DATA" + "\\}"); } } diff --git a/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java b/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java index 6e57cabd41c..968ce2e5d03 100644 --- a/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java +++ b/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java @@ -87,8 +87,6 @@ void stringRepresentation() { assertThat(metricExporter.toString()) .matches( "OtlpGrpcMetricExporter\\{" - + "exporterName=otlp, " - + "type=metric, " + "endpoint=http://localhost:4317, " + "endpointPath=.*, " + "timeoutNanos=" @@ -100,9 +98,12 @@ void stringRepresentation() { + "compressorEncoding=null, " + "headers=Headers\\{User-Agent=OBFUSCATED\\}, " + "retryPolicy=RetryPolicy\\{.*\\}, " + + "componentLoader=.*, " + + "exporterType=OTLP_GRPC_METRIC_EXPORTER, " + + "internalTelemetrySchemaVersion=LEGACY, " + "aggregationTemporalitySelector=AggregationTemporalitySelector\\{.*\\}, " + "defaultAggregationSelector=DefaultAggregationSelector\\{.*\\}, " - + "memoryMode=IMMUTABLE_DATA" + + "memoryMode=REUSABLE_DATA" + "\\}"); } } diff --git a/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/traces/OtlpGrpcSpanExporterTest.java b/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/traces/OtlpGrpcSpanExporterTest.java index e54b7279cb5..77944c8c665 100644 --- a/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/traces/OtlpGrpcSpanExporterTest.java +++ b/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/traces/OtlpGrpcSpanExporterTest.java @@ -36,8 +36,6 @@ void stringRepresentation() { assertThat(spanExporter.toString()) .matches( "OtlpGrpcSpanExporter\\{" - + "exporterName=otlp, " - + "type=span, " + "endpoint=http://localhost:4317, " + "endpointPath=.*, " + "timeoutNanos=" @@ -49,7 +47,10 @@ void stringRepresentation() { + "compressorEncoding=null, " + "headers=Headers\\{User-Agent=OBFUSCATED\\}, " + "retryPolicy=RetryPolicy\\{.*\\}, " - + "memoryMode=IMMUTABLE_DATA" + + "componentLoader=.*, " + + "exporterType=OTLP_GRPC_SPAN_EXPORTER, " + + "internalTelemetrySchemaVersion=LEGACY, " + + "memoryMode=REUSABLE_DATA" + "\\}"); } } diff --git a/exporters/otlp/all/src/testJdkHttpSender/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterJdkSenderTest.java b/exporters/otlp/all/src/testJdkHttpSender/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterJdkSenderTest.java index 88f7b6cdfe3..58cfe8cb1bb 100644 --- a/exporters/otlp/all/src/testJdkHttpSender/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterJdkSenderTest.java +++ b/exporters/otlp/all/src/testJdkHttpSender/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterJdkSenderTest.java @@ -87,8 +87,6 @@ void stringRepresentation() { assertThat(metricExporter.toString()) .matches( "OtlpHttpMetricExporter\\{" - + "exporterName=otlp, " - + "type=metric, " + "endpoint=http://localhost:4318/v1/metrics, " + "timeoutNanos=" + TimeUnit.SECONDS.toNanos(10) @@ -101,9 +99,12 @@ void stringRepresentation() { + "exportAsJson=false, " + "headers=Headers\\{User-Agent=OBFUSCATED\\}, " + "retryPolicy=RetryPolicy\\{.*\\}, " + + "componentLoader=.*, " + + "exporterType=OTLP_HTTP_METRIC_EXPORTER, " + + "internalTelemetrySchemaVersion=LEGACY, " + "aggregationTemporalitySelector=AggregationTemporalitySelector\\{.*\\}, " + "defaultAggregationSelector=DefaultAggregationSelector\\{.*\\}, " - + "memoryMode=IMMUTABLE_DATA" + + "memoryMode=REUSABLE_DATA" + "\\}"); } } From ac4ddc4e323aec0b40bba47a59e688f5f36bd2a7 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 19 Nov 2025 12:18:38 -0800 Subject: [PATCH 3/3] fix --- integration-tests/graal-incubating/build.gradle.kts | 4 +++- integration-tests/graal/build.gradle.kts | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/integration-tests/graal-incubating/build.gradle.kts b/integration-tests/graal-incubating/build.gradle.kts index 7d60ec0ad3a..0eb9f33448b 100644 --- a/integration-tests/graal-incubating/build.gradle.kts +++ b/integration-tests/graal-incubating/build.gradle.kts @@ -32,7 +32,9 @@ dependencies { graalvmNative { binaries { named("test") { - // JUnit initialization is now handled automatically by the GraalVM plugin 0.11+ + // JUnit initialization is (mostly) handled automatically by the GraalVM plugin 0.11+ + // Required as of junit 5.14.1 + buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.discovery.MethodSegmentResolver") } } toolchainDetection.set(false) diff --git a/integration-tests/graal/build.gradle.kts b/integration-tests/graal/build.gradle.kts index d2ac75674db..6538a969226 100644 --- a/integration-tests/graal/build.gradle.kts +++ b/integration-tests/graal/build.gradle.kts @@ -30,7 +30,9 @@ dependencies { graalvmNative { binaries { named("test") { - // JUnit initialization is now handled automatically by the GraalVM plugin 0.11+ + // JUnit initialization is (mostly) handled automatically by the GraalVM plugin 0.11+ + // Required as of junit 5.14.1 + buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.discovery.MethodSegmentResolver") } } toolchainDetection.set(false)