Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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"
+ "\\}");
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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"
+ "\\}");
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ void stringRepresentation() {
assertThat(metricExporter.toString())
.matches(
"OtlpGrpcMetricExporter\\{"
+ "exporterName=otlp, "
+ "type=metric, "
+ "endpoint=http://localhost:4317, "
+ "endpointPath=.*, "
+ "timeoutNanos="
Expand All @@ -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"
+ "\\}");
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ void stringRepresentation() {
assertThat(spanExporter.toString())
.matches(
"OtlpGrpcSpanExporter\\{"
+ "exporterName=otlp, "
+ "type=span, "
+ "endpoint=http://localhost:4317, "
+ "endpointPath=.*, "
+ "timeoutNanos="
Expand All @@ -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"
+ "\\}");
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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"
+ "\\}");
}
}
Expand Down
4 changes: 3 additions & 1 deletion integration-tests/graal-incubating/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion integration-tests/graal/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading