Skip to content

Commit 20f0a3a

Browse files
authored
Copy component loader testing (#7596)
1 parent cbc1183 commit 20f0a3a

12 files changed

+65
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ public GrpcExporterBuilder<T> copy() {
205205
copy.meterProviderSupplier = meterProviderSupplier;
206206
copy.internalTelemetryVersion = internalTelemetryVersion;
207207
copy.grpcChannel = grpcChannel;
208+
copy.componentLoader = componentLoader;
208209
return copy;
209210
}
210211

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ public HttpExporterBuilder<T> copy() {
204204
copy.meterProviderSupplier = meterProviderSupplier;
205205
copy.internalTelemetryVersion = internalTelemetryVersion;
206206
copy.proxyOptions = proxyOptions;
207+
copy.componentLoader = componentLoader;
207208
return copy;
208209
}
209210

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.linecorp.armeria.testing.junit5.server.SelfSignedCertificateExtension;
2828
import com.linecorp.armeria.testing.junit5.server.ServerExtension;
2929
import io.github.netmikey.logunit.api.LogCapturer;
30+
import io.opentelemetry.common.ComponentLoader;
3031
import io.opentelemetry.exporter.internal.FailedExportException;
3132
import io.opentelemetry.exporter.internal.TlsUtil;
3233
import io.opentelemetry.exporter.internal.compression.GzipCompressor;
@@ -839,6 +840,7 @@ void toBuilderEquality()
839840
.setInitialBackoff(Duration.ofMillis(50))
840841
.setBackoffMultiplier(1.3)
841842
.build())
843+
.setComponentLoader(ComponentLoader.forClassLoader(new ClassLoader() {}))
842844
.build()) {
843845
Object unwrapped = exporter.unwrap();
844846
Field builderField = unwrapped.getClass().getDeclaredField("builder");

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import io.grpc.ManagedChannel;
99
import io.opentelemetry.api.metrics.MeterProvider;
10+
import io.opentelemetry.common.ComponentLoader;
1011
import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporterBuilder;
1112
import io.opentelemetry.sdk.common.InternalTelemetryVersion;
1213
import io.opentelemetry.sdk.common.export.ProxyOptions;
@@ -122,6 +123,13 @@ public TelemetryExporterBuilder<LogRecordData> setServiceClassLoader(
122123
return this;
123124
}
124125

126+
@Override
127+
public TelemetryExporterBuilder<LogRecordData> setComponentLoader(
128+
ComponentLoader componentLoader) {
129+
builder.setComponentLoader(componentLoader);
130+
return this;
131+
}
132+
125133
@Override
126134
public TelemetryExporterBuilder<LogRecordData> setExecutorService(
127135
ExecutorService executorService) {

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import io.grpc.ManagedChannel;
99
import io.opentelemetry.api.metrics.MeterProvider;
10+
import io.opentelemetry.common.ComponentLoader;
1011
import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder;
1112
import io.opentelemetry.sdk.common.InternalTelemetryVersion;
1213
import io.opentelemetry.sdk.common.export.ProxyOptions;
@@ -122,6 +123,12 @@ public TelemetryExporterBuilder<MetricData> setServiceClassLoader(
122123
return this;
123124
}
124125

126+
@Override
127+
public TelemetryExporterBuilder<MetricData> setComponentLoader(ComponentLoader componentLoader) {
128+
builder.setComponentLoader(componentLoader);
129+
return this;
130+
}
131+
125132
@Override
126133
public TelemetryExporterBuilder<MetricData> setExecutorService(ExecutorService executorService) {
127134
builder.setExecutorService(executorService);

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import io.grpc.ManagedChannel;
99
import io.opentelemetry.api.metrics.MeterProvider;
10+
import io.opentelemetry.common.ComponentLoader;
1011
import io.opentelemetry.exporter.otlp.profiles.OtlpGrpcProfilesExporterBuilder;
1112
import io.opentelemetry.exporter.otlp.profiles.ProfileData;
1213
import io.opentelemetry.sdk.common.InternalTelemetryVersion;
@@ -122,6 +123,12 @@ public TelemetryExporterBuilder<ProfileData> setServiceClassLoader(
122123
return this;
123124
}
124125

126+
@Override
127+
public TelemetryExporterBuilder<ProfileData> setComponentLoader(ComponentLoader componentLoader) {
128+
builder.setComponentLoader(componentLoader);
129+
return this;
130+
}
131+
125132
@Override
126133
public TelemetryExporterBuilder<ProfileData> setExecutorService(ExecutorService executorService) {
127134
builder.setExecutorService(executorService);

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import io.grpc.ManagedChannel;
99
import io.opentelemetry.api.metrics.MeterProvider;
10+
import io.opentelemetry.common.ComponentLoader;
1011
import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder;
1112
import io.opentelemetry.sdk.common.InternalTelemetryVersion;
1213
import io.opentelemetry.sdk.common.export.ProxyOptions;
@@ -122,6 +123,12 @@ public TelemetryExporterBuilder<SpanData> setServiceClassLoader(ClassLoader serv
122123
return this;
123124
}
124125

126+
@Override
127+
public TelemetryExporterBuilder<SpanData> setComponentLoader(ComponentLoader componentLoader) {
128+
builder.setComponentLoader(componentLoader);
129+
return this;
130+
}
131+
125132
@Override
126133
public TelemetryExporterBuilder<SpanData> setExecutorService(ExecutorService executorService) {
127134
builder.setExecutorService(executorService);

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.exporter.otlp.testing.internal;
77

88
import io.opentelemetry.api.metrics.MeterProvider;
9+
import io.opentelemetry.common.ComponentLoader;
910
import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporterBuilder;
1011
import io.opentelemetry.sdk.common.InternalTelemetryVersion;
1112
import io.opentelemetry.sdk.common.export.ProxyOptions;
@@ -122,6 +123,13 @@ public TelemetryExporterBuilder<LogRecordData> setServiceClassLoader(
122123
return this;
123124
}
124125

126+
@Override
127+
public TelemetryExporterBuilder<LogRecordData> setComponentLoader(
128+
ComponentLoader componentLoader) {
129+
builder.setComponentLoader(componentLoader);
130+
return this;
131+
}
132+
125133
@Override
126134
public TelemetryExporterBuilder<LogRecordData> setExecutorService(
127135
ExecutorService executorService) {

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.exporter.otlp.testing.internal;
77

88
import io.opentelemetry.api.metrics.MeterProvider;
9+
import io.opentelemetry.common.ComponentLoader;
910
import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporterBuilder;
1011
import io.opentelemetry.sdk.common.InternalTelemetryVersion;
1112
import io.opentelemetry.sdk.common.export.ProxyOptions;
@@ -121,6 +122,12 @@ public TelemetryExporterBuilder<MetricData> setServiceClassLoader(
121122
return this;
122123
}
123124

125+
@Override
126+
public TelemetryExporterBuilder<MetricData> setComponentLoader(ComponentLoader componentLoader) {
127+
builder.setComponentLoader(componentLoader);
128+
return this;
129+
}
130+
124131
@Override
125132
public TelemetryExporterBuilder<MetricData> setExecutorService(ExecutorService executorService) {
126133
builder.setExecutorService(executorService);

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.exporter.otlp.testing.internal;
77

88
import io.opentelemetry.api.metrics.MeterProvider;
9+
import io.opentelemetry.common.ComponentLoader;
910
import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder;
1011
import io.opentelemetry.sdk.common.InternalTelemetryVersion;
1112
import io.opentelemetry.sdk.common.export.ProxyOptions;
@@ -120,6 +121,12 @@ public TelemetryExporterBuilder<SpanData> setServiceClassLoader(ClassLoader serv
120121
return this;
121122
}
122123

124+
@Override
125+
public TelemetryExporterBuilder<SpanData> setComponentLoader(ComponentLoader componentLoader) {
126+
builder.setComponentLoader(componentLoader);
127+
return this;
128+
}
129+
123130
@Override
124131
public TelemetryExporterBuilder<SpanData> setExecutorService(ExecutorService executorService) {
125132
builder.setExecutorService(executorService);

0 commit comments

Comments
 (0)