Skip to content

Delete ManagedChannelUtil, which is only used in tests #8244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jack-berg merged 2 commits into from
Apr 3, 2026
Merged

Delete ManagedChannelUtil, which is only used in tests #8244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0d39e8
Delete ManagedChannelUtil, which is only used in tests
jack-berg Apr 3, 2026
8115baf
static imports
jack-berg Apr 3, 2026
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
1 change: 0 additions & 1 deletion exporters/common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ dependencies {

testImplementation("com.google.protobuf:protobuf-java-util")
testImplementation("com.linecorp.armeria:armeria-junit5")
testImplementation("org.skyscreamer:jsonassert")
testImplementation("com.google.api.grpc:proto-google-common-protos")
testImplementation("io.grpc:grpc-testing")
testImplementation("edu.berkeley.cs.jqf:jqf-fuzz")
Expand Down
50 changes: 0 additions & 50 deletions ...ters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/ManagedChannelUtil.java
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions .../common/src/test/java/io/opentelemetry/exporter/internal/grpc/ManagedChannelUtilTest.java
View file
Open in desktop

This file was deleted.

32 changes: 29 additions & 3 deletions .../opentelemetry/exporter/otlp/testing/internal/ManagedChannelTelemetryExporterBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@

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

import static java.util.Collections.singletonList;
import static java.util.Collections.singletonMap;
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toList;

import io.grpc.ManagedChannel;
import io.grpc.ManagedChannelBuilder;
Expand All @@ -15,8 +18,8 @@
import io.netty.handler.ssl.SslContext;
import io.opentelemetry.api.metrics.MeterProvider;
import io.opentelemetry.common.ComponentLoader;
import io.opentelemetry.exporter.internal.RetryUtil;
import io.opentelemetry.exporter.internal.TlsConfigHelper;
import io.opentelemetry.exporter.internal.grpc.ManagedChannelUtil;
import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent;
import io.opentelemetry.sdk.common.CompletableResultCode;
import io.opentelemetry.sdk.common.InternalTelemetryVersion;
Expand All @@ -25,6 +28,8 @@
import java.net.URI;
import java.time.Duration;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -148,11 +153,32 @@ public TelemetryExporterBuilder<T> setRetryPolicy(@Nullable RetryPolicy retryPol
throw new IllegalStateException("Can't happen");
}
requireNonNull(channelBuilder, "channel");
channelBuilder.defaultServiceConfig(
ManagedChannelUtil.toServiceConfig(grpcServiceName, retryPolicy));
channelBuilder.defaultServiceConfig(toServiceConfig(grpcServiceName, retryPolicy));
return this;
}

/**
* Convert the {@link RetryPolicy} into a gRPC service config for the {@code serviceName}. The
* resulting map can be passed to {@link ManagedChannelBuilder#defaultServiceConfig(Map)}.
*/
private static Map<String, ?> toServiceConfig(String serviceName, RetryPolicy retryPolicy) {
List<Double> retryableStatusCodes =
RetryUtil.retryableGrpcStatusCodes().stream().map(Double::parseDouble).collect(toList());

Map<String, Object> retryConfig = new HashMap<>();
retryConfig.put("retryableStatusCodes", retryableStatusCodes);
retryConfig.put("maxAttempts", (double) retryPolicy.getMaxAttempts());
retryConfig.put("initialBackoff", retryPolicy.getInitialBackoff().toMillis() / 1000.0 + "s");
retryConfig.put("maxBackoff", retryPolicy.getMaxBackoff().toMillis() / 1000.0 + "s");
retryConfig.put("backoffMultiplier", retryPolicy.getBackoffMultiplier());

Map<String, Object> methodConfig = new HashMap<>();
methodConfig.put("name", singletonList(singletonMap("service", serviceName)));
methodConfig.put("retryPolicy", retryConfig);

return singletonMap("methodConfig", singletonList(methodConfig));
}

@Override
public TelemetryExporterBuilder<T> setProxyOptions(ProxyOptions proxyOptions) {
delegate.setProxyOptions(proxyOptions);
Expand Down
Loading