Skip to content

Commit 207c861

Browse files
authored
Delete ManagedChannelUtil, which is only used in tests (#8244)
1 parent 707adad commit 207c861

File tree

4 files changed

+29
-104
lines changed

4 files changed

+29
-104
lines changed

exporters/common/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ dependencies {
7373

7474
testImplementation("com.google.protobuf:protobuf-java-util")
7575
testImplementation("com.linecorp.armeria:armeria-junit5")
76-
testImplementation("org.skyscreamer:jsonassert")
7776
testImplementation("com.google.api.grpc:proto-google-common-protos")
7877
testImplementation("io.grpc:grpc-testing")
7978
testImplementation("edu.berkeley.cs.jqf:jqf-fuzz")

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

Lines changed: 0 additions & 50 deletions
This file was deleted.

exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/ManagedChannelUtilTest.java

Lines changed: 0 additions & 50 deletions
This file was deleted.

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

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55

66
package io.opentelemetry.exporter.otlp.testing.internal;
77

8+
import static java.util.Collections.singletonList;
9+
import static java.util.Collections.singletonMap;
810
import static java.util.Objects.requireNonNull;
11+
import static java.util.stream.Collectors.toList;
912

1013
import io.grpc.ManagedChannel;
1114
import io.grpc.ManagedChannelBuilder;
@@ -15,8 +18,8 @@
1518
import io.netty.handler.ssl.SslContext;
1619
import io.opentelemetry.api.metrics.MeterProvider;
1720
import io.opentelemetry.common.ComponentLoader;
21+
import io.opentelemetry.exporter.internal.RetryUtil;
1822
import io.opentelemetry.exporter.internal.TlsConfigHelper;
19-
import io.opentelemetry.exporter.internal.grpc.ManagedChannelUtil;
2023
import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent;
2124
import io.opentelemetry.sdk.common.CompletableResultCode;
2225
import io.opentelemetry.sdk.common.InternalTelemetryVersion;
@@ -25,6 +28,8 @@
2528
import java.net.URI;
2629
import java.time.Duration;
2730
import java.util.Collection;
31+
import java.util.HashMap;
32+
import java.util.List;
2833
import java.util.Map;
2934
import java.util.concurrent.ExecutorService;
3035
import java.util.concurrent.TimeUnit;
@@ -148,11 +153,32 @@ public TelemetryExporterBuilder<T> setRetryPolicy(@Nullable RetryPolicy retryPol
148153
throw new IllegalStateException("Can't happen");
149154
}
150155
requireNonNull(channelBuilder, "channel");
151-
channelBuilder.defaultServiceConfig(
152-
ManagedChannelUtil.toServiceConfig(grpcServiceName, retryPolicy));
156+
channelBuilder.defaultServiceConfig(toServiceConfig(grpcServiceName, retryPolicy));
153157
return this;
154158
}
155159

160+
/**
161+
* Convert the {@link RetryPolicy} into a gRPC service config for the {@code serviceName}. The
162+
* resulting map can be passed to {@link ManagedChannelBuilder#defaultServiceConfig(Map)}.
163+
*/
164+
private static Map<String, ?> toServiceConfig(String serviceName, RetryPolicy retryPolicy) {
165+
List<Double> retryableStatusCodes =
166+
RetryUtil.retryableGrpcStatusCodes().stream().map(Double::parseDouble).collect(toList());
167+
168+
Map<String, Object> retryConfig = new HashMap<>();
169+
retryConfig.put("retryableStatusCodes", retryableStatusCodes);
170+
retryConfig.put("maxAttempts", (double) retryPolicy.getMaxAttempts());
171+
retryConfig.put("initialBackoff", retryPolicy.getInitialBackoff().toMillis() / 1000.0 + "s");
172+
retryConfig.put("maxBackoff", retryPolicy.getMaxBackoff().toMillis() / 1000.0 + "s");
173+
retryConfig.put("backoffMultiplier", retryPolicy.getBackoffMultiplier());
174+
175+
Map<String, Object> methodConfig = new HashMap<>();
176+
methodConfig.put("name", singletonList(singletonMap("service", serviceName)));
177+
methodConfig.put("retryPolicy", retryConfig);
178+
179+
return singletonMap("methodConfig", singletonList(methodConfig));
180+
}
181+
156182
@Override
157183
public TelemetryExporterBuilder<T> setProxyOptions(ProxyOptions proxyOptions) {
158184
delegate.setProxyOptions(proxyOptions);

0 commit comments

Comments
 (0)