Skip to content

Commit d0b2eb3

Browse files
committed
chore: simplify implementation (no C3)
1 parent 7f90d28 commit d0b2eb3

7 files changed

Lines changed: 10 additions & 408 deletions

File tree

gax-java/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,9 @@
4646
import com.google.api.gax.core.NoCredentialsProvider;
4747
import com.google.api.gax.tracing.ApiTracerFactory;
4848
import com.google.api.gax.tracing.BaseApiTracerFactory;
49-
import com.google.api.gax.tracing.CompositeApiTracerFactory;
50-
import com.google.api.gax.tracing.OpenTelemetryTracingRecorder;
51-
import com.google.api.gax.tracing.TracingTracerFactory;
52-
import com.google.api.gax.tracing.TracingUtils;
5349
import com.google.auth.oauth2.QuotaProjectIdProvider;
5450
import com.google.common.base.MoreObjects;
5551
import com.google.common.base.Preconditions;
56-
import io.opentelemetry.api.GlobalOpenTelemetry;
5752
import java.io.IOException;
5853
import java.util.concurrent.Executor;
5954
import javax.annotation.Nonnull;
@@ -109,26 +104,13 @@ protected StubSettings(Builder builder) {
109104
this.quotaProjectId = builder.quotaProjectId;
110105
this.streamWatchdogProvider = builder.streamWatchdogProvider;
111106
this.streamWatchdogCheckInterval = builder.streamWatchdogCheckInterval;
112-
this.tracerFactory = autoConfigureTracerFactory(builder.tracerFactory);
107+
this.tracerFactory = builder.tracerFactory;
113108
this.deprecatedExecutorProviderSet = builder.deprecatedExecutorProviderSet;
114109
this.gdchApiAudience = builder.gdchApiAudience;
115110
this.endpointContext = buildEndpointContext(builder);
116111
this.apiKey = builder.apiKey;
117112
}
118113

119-
private ApiTracerFactory autoConfigureTracerFactory(ApiTracerFactory factory) {
120-
if (TracingUtils.isTracingEnabled()) {
121-
ApiTracerFactory tracingFactory =
122-
new TracingTracerFactory(
123-
new OpenTelemetryTracingRecorder(GlobalOpenTelemetry.get(), getServiceName()));
124-
if (factory instanceof BaseApiTracerFactory) {
125-
return tracingFactory;
126-
}
127-
return CompositeApiTracerFactory.of(factory, tracingFactory);
128-
}
129-
return factory;
130-
}
131-
132114
/**
133115
* Attempt to build the EndpointContext from the Builder based on all the user configurations
134116
* passed in.

gax-java/gax/src/main/java/com/google/api/gax/tracing/CompositeApiTracer.java

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

gax-java/gax/src/main/java/com/google/api/gax/tracing/CompositeApiTracerFactory.java

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

gax-java/gax/src/main/java/com/google/api/gax/tracing/TracingTracerFactory.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ public TracingTracerFactory(TracingRecorder tracingRecorder, Map<String, String>
6767

6868
@Override
6969
public ApiTracer newTracer(ApiTracer parent, SpanName spanName, OperationType operationType) {
70-
if (!TracingUtils.isTracingEnabled()) {
71-
return BaseApiTracer.getInstance();
72-
}
7370
TracingTracer tracingTracer = new TracingTracer(tracingRecorder);
7471
attributes.forEach(tracingTracer::addAttributes);
7572
return tracingTracer;

gax-java/gax/src/main/java/com/google/api/gax/tracing/TracingUtils.java

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

gax-java/gax/src/test/java/com/google/api/gax/tracing/TracingUtilsTest.java

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

0 commit comments

Comments
 (0)