Skip to content

Commit 1b4948b

Browse files
committed
Fix tests
1 parent 68967e7 commit 1b4948b

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,6 @@ public String toString(boolean includePrefixAndSuffix) {
250250
includePrefixAndSuffix
251251
? new StringJoiner(", ", "GrpcExporterBuilder{", "}")
252252
: new StringJoiner(", ");
253-
joiner.add("internalTelemetrySchemaVersion=" + internalTelemetrySchemaVersion);
254-
joiner.add("exporterType=" + exporterType.toString());
255253
joiner.add("endpoint=" + endpoint.toString());
256254
joiner.add("endpointPath=" + grpcEndpointPath);
257255
joiner.add("timeoutNanos=" + timeoutNanos);
@@ -276,6 +274,8 @@ public String toString(boolean includePrefixAndSuffix) {
276274
if (executorService != null) {
277275
joiner.add("executorService=" + executorService);
278276
}
277+
joiner.add("exporterType=" + exporterType.toString());
278+
joiner.add("internalTelemetrySchemaVersion=" + internalTelemetrySchemaVersion);
279279
// Note: omit tlsConfigHelper because we can't log the configuration in any readable way
280280
// Note: omit meterProviderSupplier because we can't log the configuration in any readable way
281281
return joiner.toString();

exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,6 @@ public String toString(boolean includePrefixAndSuffix) {
249249
includePrefixAndSuffix
250250
? new StringJoiner(", ", "HttpExporterBuilder{", "}")
251251
: new StringJoiner(", ");
252-
joiner.add("internalTelemetrySchemaVersion=" + internalTelemetrySchemaVersion);
253-
joiner.add("exporterType=" + exporterType);
254252
joiner.add("endpoint=" + endpoint);
255253
joiner.add("timeoutNanos=" + timeoutNanos);
256254
joiner.add("proxyOptions=" + proxyOptions);
@@ -273,6 +271,8 @@ public String toString(boolean includePrefixAndSuffix) {
273271
if (executorService != null) {
274272
joiner.add("executorService=" + executorService);
275273
}
274+
joiner.add("exporterType=" + exporterType);
275+
joiner.add("internalTelemetrySchemaVersion=" + internalTelemetrySchemaVersion);
276276
// Note: omit tlsConfigHelper because we can't log the configuration in any readable way
277277
// Note: omit meterProviderSupplier because we can't log the configuration in any readable way
278278
return joiner.toString();

exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public final class OtlpGrpcSpanExporterBuilder {
5757
OtlpGrpcSpanExporterBuilder() {
5858
this(
5959
new GrpcExporterBuilder<>(
60-
ComponentId.StandardExporterType.OTLP_GRPC_LOG_EXPORTER,
60+
ComponentId.StandardExporterType.OTLP_GRPC_SPAN_EXPORTER,
6161
DEFAULT_TIMEOUT_SECS,
6262
DEFAULT_ENDPOINT,
6363
() -> MarshalerTraceServiceGrpc::newFutureStub,

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,8 +1058,6 @@ void stringRepresentation() throws IOException, CertificateEncodingException {
10581058
assertThat(telemetryExporter.unwrap().toString())
10591059
.matches(
10601060
"OtlpGrpc[a-zA-Z]*Exporter\\{"
1061-
+ "exporterName=otlp, "
1062-
+ "type=[a-zA_Z]*, "
10631061
+ "endpoint=http://localhost:4317, "
10641062
+ "endpointPath=.*, "
10651063
+ "timeoutNanos="
@@ -1099,8 +1097,6 @@ void stringRepresentation() throws IOException, CertificateEncodingException {
10991097
assertThat(telemetryExporter.unwrap().toString())
11001098
.matches(
11011099
"OtlpGrpc[a-zA-Z]*Exporter\\{"
1102-
+ "exporterName=otlp, "
1103-
+ "type=[a-zA_Z]*, "
11041100
+ "endpoint=http://example:4317, "
11051101
+ "endpointPath=.*, "
11061102
+ "timeoutNanos="

0 commit comments

Comments
 (0)