Skip to content

Commit 59d0073

Browse files
committed
Fix tests
1 parent a9ae144 commit 59d0073

File tree

5 files changed

+20
-15
lines changed

5 files changed

+20
-15
lines changed

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
}

0 commit comments

Comments
 (0)