Skip to content

Commit 3b68652

Browse files
renovate[bot]trask
andauthored
fix(deps): update junit-framework monorepo to v5.14.1 (#7715)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
1 parent 44aa060 commit 3b68652

File tree

8 files changed

+27
-18
lines changed

8 files changed

+27
-18
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ val slf4jVersion = "2.0.17"
1717
val opencensusVersion = "0.31.1"
1818
val prometheusServerVersion = "1.3.10"
1919
val armeriaVersion = "1.33.4"
20-
val junitVersion = "5.13.4"
20+
val junitVersion = "5.14.1"
2121
val okhttpVersion = "5.3.2"
2222

2323
val DEPENDENCY_BOMS = listOf(

exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterOkHttpSenderTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ void stringRepresentation() {
8686
assertThat(metricExporter.toString())
8787
.matches(
8888
"OtlpHttpMetricExporter\\{"
89-
+ "exporterName=otlp, "
90-
+ "type=metric, "
9189
+ "endpoint=http://localhost:4318/v1/metrics, "
9290
+ "timeoutNanos="
9391
+ TimeUnit.SECONDS.toNanos(10)
@@ -100,9 +98,12 @@ void stringRepresentation() {
10098
+ "exportAsJson=false, "
10199
+ "headers=Headers\\{User-Agent=OBFUSCATED\\}, "
102100
+ "retryPolicy=RetryPolicy\\{.*\\}, "
101+
+ "componentLoader=.*, "
102+
+ "exporterType=OTLP_HTTP_METRIC_EXPORTER, "
103+
+ "internalTelemetrySchemaVersion=LEGACY, "
103104
+ "aggregationTemporalitySelector=AggregationTemporalitySelector\\{.*\\}, "
104105
+ "defaultAggregationSelector=DefaultAggregationSelector\\{.*\\}, "
105-
+ "memoryMode=IMMUTABLE_DATA"
106+
+ "memoryMode=REUSABLE_DATA"
106107
+ "\\}");
107108
}
108109
}

exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterOkHttpSenderTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ void stringRepresentation() {
3535
assertThat(spanExporter.toString())
3636
.matches(
3737
"OtlpHttpSpanExporter\\{"
38-
+ "exporterName=otlp, "
39-
+ "type=span, "
4038
+ "endpoint=http://localhost:4318/v1/traces, "
4139
+ "timeoutNanos="
4240
+ TimeUnit.SECONDS.toNanos(10)
@@ -49,7 +47,10 @@ void stringRepresentation() {
4947
+ "exportAsJson=false, "
5048
+ "headers=Headers\\{User-Agent=OBFUSCATED\\}, "
5149
+ "retryPolicy=RetryPolicy\\{.*\\}, "
52-
+ "memoryMode=IMMUTABLE_DATA"
50+
+ "componentLoader=.*, "
51+
+ "exporterType=OTLP_HTTP_SPAN_EXPORTER, "
52+
+ "internalTelemetrySchemaVersion=LEGACY, "
53+
+ "memoryMode=REUSABLE_DATA"
5354
+ "\\}");
5455
}
5556
}

exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ void stringRepresentation() {
8787
assertThat(metricExporter.toString())
8888
.matches(
8989
"OtlpGrpcMetricExporter\\{"
90-
+ "exporterName=otlp, "
91-
+ "type=metric, "
9290
+ "endpoint=http://localhost:4317, "
9391
+ "endpointPath=.*, "
9492
+ "timeoutNanos="
@@ -100,9 +98,12 @@ void stringRepresentation() {
10098
+ "compressorEncoding=null, "
10199
+ "headers=Headers\\{User-Agent=OBFUSCATED\\}, "
102100
+ "retryPolicy=RetryPolicy\\{.*\\}, "
101+
+ "componentLoader=.*, "
102+
+ "exporterType=OTLP_GRPC_METRIC_EXPORTER, "
103+
+ "internalTelemetrySchemaVersion=LEGACY, "
103104
+ "aggregationTemporalitySelector=AggregationTemporalitySelector\\{.*\\}, "
104105
+ "defaultAggregationSelector=DefaultAggregationSelector\\{.*\\}, "
105-
+ "memoryMode=IMMUTABLE_DATA"
106+
+ "memoryMode=REUSABLE_DATA"
106107
+ "\\}");
107108
}
108109
}

exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/traces/OtlpGrpcSpanExporterTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ void stringRepresentation() {
3636
assertThat(spanExporter.toString())
3737
.matches(
3838
"OtlpGrpcSpanExporter\\{"
39-
+ "exporterName=otlp, "
40-
+ "type=span, "
4139
+ "endpoint=http://localhost:4317, "
4240
+ "endpointPath=.*, "
4341
+ "timeoutNanos="
@@ -49,7 +47,10 @@ void stringRepresentation() {
4947
+ "compressorEncoding=null, "
5048
+ "headers=Headers\\{User-Agent=OBFUSCATED\\}, "
5149
+ "retryPolicy=RetryPolicy\\{.*\\}, "
52-
+ "memoryMode=IMMUTABLE_DATA"
50+
+ "componentLoader=.*, "
51+
+ "exporterType=OTLP_GRPC_SPAN_EXPORTER, "
52+
+ "internalTelemetrySchemaVersion=LEGACY, "
53+
+ "memoryMode=REUSABLE_DATA"
5354
+ "\\}");
5455
}
5556
}

exporters/otlp/all/src/testJdkHttpSender/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterJdkSenderTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ void stringRepresentation() {
8787
assertThat(metricExporter.toString())
8888
.matches(
8989
"OtlpHttpMetricExporter\\{"
90-
+ "exporterName=otlp, "
91-
+ "type=metric, "
9290
+ "endpoint=http://localhost:4318/v1/metrics, "
9391
+ "timeoutNanos="
9492
+ TimeUnit.SECONDS.toNanos(10)
@@ -101,9 +99,12 @@ void stringRepresentation() {
10199
+ "exportAsJson=false, "
102100
+ "headers=Headers\\{User-Agent=OBFUSCATED\\}, "
103101
+ "retryPolicy=RetryPolicy\\{.*\\}, "
102+
+ "componentLoader=.*, "
103+
+ "exporterType=OTLP_HTTP_METRIC_EXPORTER, "
104+
+ "internalTelemetrySchemaVersion=LEGACY, "
104105
+ "aggregationTemporalitySelector=AggregationTemporalitySelector\\{.*\\}, "
105106
+ "defaultAggregationSelector=DefaultAggregationSelector\\{.*\\}, "
106-
+ "memoryMode=IMMUTABLE_DATA"
107+
+ "memoryMode=REUSABLE_DATA"
107108
+ "\\}");
108109
}
109110
}

integration-tests/graal-incubating/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ dependencies {
3232
graalvmNative {
3333
binaries {
3434
named("test") {
35-
// JUnit initialization is now handled automatically by the GraalVM plugin 0.11+
35+
// JUnit initialization is (mostly) handled automatically by the GraalVM plugin 0.11+
36+
// Required as of junit 5.14.1
37+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.discovery.MethodSegmentResolver")
3638
}
3739
}
3840
toolchainDetection.set(false)

integration-tests/graal/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ dependencies {
3030
graalvmNative {
3131
binaries {
3232
named("test") {
33-
// JUnit initialization is now handled automatically by the GraalVM plugin 0.11+
33+
// JUnit initialization is (mostly) handled automatically by the GraalVM plugin 0.11+
34+
// Required as of junit 5.14.1
35+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.discovery.MethodSegmentResolver")
3436
}
3537
}
3638
toolchainDetection.set(false)

0 commit comments

Comments
 (0)