Skip to content

Commit 3353528

Browse files
committed
test: fix ITOtelErrorType compilation by replacing OpenTelemetryTraceManager
1 parent 678f80d commit 3353528

File tree

1 file changed

+7
-15
lines changed
  • sdk-platform-java/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it

1 file changed

+7
-15
lines changed

sdk-platform-java/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITOtelErrorType.java

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import com.google.api.gax.rpc.StatusCode.Code;
4040
import com.google.api.gax.rpc.UnavailableException;
4141
import com.google.api.gax.tracing.ObservabilityAttributes;
42-
import com.google.api.gax.tracing.OpenTelemetryTraceManager;
4342
import com.google.api.gax.tracing.SpanTracerFactory;
4443
import com.google.auth.Credentials;
4544
import com.google.common.collect.ImmutableList;
@@ -129,8 +128,7 @@ private void verifyErrorTypeAttribute(String expectedErrorType) {
129128
}
130129

131130
private EchoClient createInterceptorClient(Throwable toThrow) throws IOException {
132-
SpanTracerFactory tracingFactory =
133-
new SpanTracerFactory(new OpenTelemetryTraceManager(openTelemetrySdk));
131+
SpanTracerFactory tracingFactory = new SpanTracerFactory(openTelemetrySdk);
134132

135133
ClientInterceptor interceptor =
136134
new ClientInterceptor() {
@@ -164,8 +162,7 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
164162

165163
@Test
166164
void testTracing_failedEcho_grpc_recordsErrorType() throws Exception {
167-
SpanTracerFactory tracingFactory =
168-
new SpanTracerFactory(new OpenTelemetryTraceManager(openTelemetrySdk));
165+
SpanTracerFactory tracingFactory = new SpanTracerFactory(openTelemetrySdk);
169166

170167
try (EchoClient client =
171168
TestClientInitializer.createGrpcEchoClientOpentelemetry(tracingFactory)) {
@@ -182,8 +179,7 @@ void testTracing_failedEcho_grpc_recordsErrorType() throws Exception {
182179

183180
@Test
184181
void testTracing_failedEcho_httpjson_recordsErrorType() throws Exception {
185-
SpanTracerFactory tracingFactory =
186-
new SpanTracerFactory(new OpenTelemetryTraceManager(openTelemetrySdk));
182+
SpanTracerFactory tracingFactory = new SpanTracerFactory(openTelemetrySdk);
187183

188184
try (EchoClient client =
189185
TestClientInitializer.createHttpJsonEchoClientOpentelemetry(tracingFactory)) {
@@ -205,8 +201,7 @@ void testTracing_clientConnectionError_ConnectException_grpc() throws Exception
205201
port = socket.getLocalPort();
206202
}
207203

208-
SpanTracerFactory tracingFactory =
209-
new SpanTracerFactory(new OpenTelemetryTraceManager(openTelemetrySdk));
204+
SpanTracerFactory tracingFactory = new SpanTracerFactory(openTelemetrySdk);
210205
EchoSettings grpcEchoSettings =
211206
EchoSettings.newBuilder()
212207
.setTransportChannelProvider(
@@ -236,8 +231,7 @@ void testTracing_clientConnectionError_ConnectException_grpc() throws Exception
236231

237232
@Test
238233
void testTracing_clientConnectionError_UnknownHost_grpc() throws Exception {
239-
SpanTracerFactory tracingFactory =
240-
new SpanTracerFactory(new OpenTelemetryTraceManager(openTelemetrySdk));
234+
SpanTracerFactory tracingFactory = new SpanTracerFactory(openTelemetrySdk);
241235
EchoSettings grpcEchoSettings =
242236
EchoSettings.newBuilder()
243237
.setTransportChannelProvider(
@@ -318,8 +312,7 @@ void testTracing_clientTimeout_SocketTimeoutException_grpc() throws Exception {
318312

319313
@Test
320314
void testTracing_clientTimeout_DeadlineExceededException_grpc() throws Exception {
321-
SpanTracerFactory tracingFactory =
322-
new SpanTracerFactory(new OpenTelemetryTraceManager(openTelemetrySdk));
315+
SpanTracerFactory tracingFactory = new SpanTracerFactory(openTelemetrySdk);
323316

324317
try (ServerSocket serverSocket = new ServerSocket(0)) {
325318
int port = serverSocket.getLocalPort();
@@ -396,8 +389,7 @@ public boolean hasRequestMetadataOnly() {
396389
public void refresh() throws IOException {}
397390
};
398391

399-
SpanTracerFactory tracingFactory =
400-
new SpanTracerFactory(new OpenTelemetryTraceManager(openTelemetrySdk));
392+
SpanTracerFactory tracingFactory = new SpanTracerFactory(openTelemetrySdk);
401393
EchoSettings grpcEchoSettings =
402394
EchoSettings.newBuilder()
403395
.setCredentialsProvider(FixedCredentialsProvider.create(credentials))

0 commit comments

Comments
 (0)