From 2e5dac3968380fb40925d76fa6567434c062d8af Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Tue, 5 Sep 2017 14:08:26 -0700 Subject: [PATCH] Change to use google-cloud-java:google-cloud-trace for TraceConsumer. (#90) --- .../guice/grpc/v1/GrpcTraceSinkModule.java | 4 ++- guice/v1/pom.xml | 6 ++-- pom.xml | 16 +++------- services/trace-grpc-api-service/pom.xml | 5 +++ sinks/v1/grpc-consumer/pom.xml | 5 +-- .../trace/grpc/v1/GrpcTraceConsumer.java | 31 +++++++++++++------ sinks/v1/http-consumer/pom.xml | 6 ++-- sinks/v1/sink/pom.xml | 6 ++-- 8 files changed, 46 insertions(+), 33 deletions(-) diff --git a/guice/grpc-sink/src/main/java/com/google/cloud/trace/guice/grpc/v1/GrpcTraceSinkModule.java b/guice/grpc-sink/src/main/java/com/google/cloud/trace/guice/grpc/v1/GrpcTraceSinkModule.java index 8a80ceb..682dd58 100644 --- a/guice/grpc-sink/src/main/java/com/google/cloud/trace/guice/grpc/v1/GrpcTraceSinkModule.java +++ b/guice/grpc-sink/src/main/java/com/google/cloud/trace/guice/grpc/v1/GrpcTraceSinkModule.java @@ -22,6 +22,7 @@ import com.google.inject.AbstractModule; import com.google.inject.Provides; import com.google.inject.Singleton; +import java.io.IOException; public class GrpcTraceSinkModule extends AbstractModule { @Override @@ -30,7 +31,8 @@ protected void configure() {} @Provides @ApiTraceSink @Singleton - TraceConsumer provideTraceSink(@ApiHost String apiHost, Credentials credentials) { + TraceConsumer provideTraceSink(@ApiHost String apiHost, Credentials credentials) + throws IOException { return GrpcTraceConsumer.create(apiHost, credentials); } } diff --git a/guice/v1/pom.xml b/guice/v1/pom.xml index 5a61c3f..4b9e410 100644 --- a/guice/v1/pom.xml +++ b/guice/v1/pom.xml @@ -28,9 +28,9 @@ ${project.version} - com.google.api.grpc - grpc-google-devtools-cloudtrace-v1 - ${grpc-google-devtools-cloudtrace-v1.version} + com.google.cloud + google-cloud-trace + ${google-cloud-trace.version} diff --git a/pom.xml b/pom.xml index 6267966..88f1312 100644 --- a/pom.xml +++ b/pom.xml @@ -31,9 +31,9 @@ UTF-8 - 1.5.0 + 1.4.0 2.0.5.Final - 0.1.1 + 0.22.0-alpha 0.7.1 0.7.1 @@ -67,15 +67,9 @@ - com.google.api.grpc - grpc-google-devtools-cloudtrace-v1 - ${grpc-google-devtools-cloudtrace-v1.version} - - - io.grpc - grpc-all - - + com.google.cloud + google-cloud-trace + ${google-cloud-trace.version} io.grpc diff --git a/services/trace-grpc-api-service/pom.xml b/services/trace-grpc-api-service/pom.xml index 6579869..9fcc030 100644 --- a/services/trace-grpc-api-service/pom.xml +++ b/services/trace-grpc-api-service/pom.xml @@ -31,6 +31,11 @@ service ${project.version} + + ${project.groupId} + sdk-sink + ${project.version} + ${project.groupId}.v1 sink diff --git a/sinks/v1/grpc-consumer/pom.xml b/sinks/v1/grpc-consumer/pom.xml index 699cfbb..f5b0129 100644 --- a/sinks/v1/grpc-consumer/pom.xml +++ b/sinks/v1/grpc-consumer/pom.xml @@ -22,8 +22,9 @@ ${project.version} - com.google.api.grpc - grpc-google-devtools-cloudtrace-v1 + com.google.cloud + google-cloud-trace + ${google-cloud-trace.version} com.google.auth diff --git a/sinks/v1/grpc-consumer/src/main/java/com/google/cloud/trace/grpc/v1/GrpcTraceConsumer.java b/sinks/v1/grpc-consumer/src/main/java/com/google/cloud/trace/grpc/v1/GrpcTraceConsumer.java index 99b3661..d96c965 100644 --- a/sinks/v1/grpc-consumer/src/main/java/com/google/cloud/trace/grpc/v1/GrpcTraceConsumer.java +++ b/sinks/v1/grpc-consumer/src/main/java/com/google/cloud/trace/grpc/v1/GrpcTraceConsumer.java @@ -14,14 +14,14 @@ package com.google.cloud.trace.grpc.v1; +import com.google.api.gax.core.FixedCredentialsProvider; import com.google.auth.Credentials; +import com.google.cloud.trace.v1.TraceServiceClient; +import com.google.cloud.trace.v1.TraceServiceSettings; import com.google.cloud.trace.v1.consumer.TraceConsumer; import com.google.devtools.cloudtrace.v1.PatchTracesRequest; -import com.google.devtools.cloudtrace.v1.TraceServiceGrpc; import com.google.devtools.cloudtrace.v1.Traces; -import io.grpc.Channel; -import io.grpc.ManagedChannelBuilder; -import io.grpc.auth.MoreCallCredentials; +import java.io.IOException; /** @@ -33,14 +33,14 @@ * @see TraceConsumer */ public class GrpcTraceConsumer implements TraceConsumer { - private final TraceServiceGrpc.TraceServiceBlockingStub traceService; + private final TraceServiceClient traceService; /** * Creates a trace consumer that sends trace messages to the Stackdriver Trace API via gRPC. * * @param traceService the trace service to use for sending API calls. */ - public GrpcTraceConsumer(TraceServiceGrpc.TraceServiceBlockingStub traceService) { + public GrpcTraceConsumer(TraceServiceClient traceService) { this.traceService = traceService; } @@ -64,9 +64,20 @@ public void receive(Traces traces) { * @param apiHost a string containing the API host name. * @param credentials a credentials used to authenticate API calls. */ - public static GrpcTraceConsumer create(String apiHost, Credentials credentials) { - Channel channel = ManagedChannelBuilder.forTarget(apiHost).build(); - return new GrpcTraceConsumer(TraceServiceGrpc.newBlockingStub(channel) - .withCallCredentials(MoreCallCredentials.from(credentials))); + public static GrpcTraceConsumer create(String apiHost, Credentials credentials) + throws IOException { + TraceServiceSettings traceServiceSettings = + TraceServiceSettings.defaultBuilder() + .setCredentialsProvider(FixedCredentialsProvider.create(credentials)) + .setTransportProvider( + TraceServiceSettings.defaultGrpcTransportProviderBuilder() + .setChannelProvider( + TraceServiceSettings.defaultGrpcChannelProviderBuilder() + .setEndpoint(apiHost) + .build()) + .build()) + .build(); + + return new GrpcTraceConsumer(TraceServiceClient.create(traceServiceSettings)); } } diff --git a/sinks/v1/http-consumer/pom.xml b/sinks/v1/http-consumer/pom.xml index 4f22663..e97178b 100644 --- a/sinks/v1/http-consumer/pom.xml +++ b/sinks/v1/http-consumer/pom.xml @@ -22,9 +22,9 @@ ${project.version} - com.google.api.grpc - grpc-google-devtools-cloudtrace-v1 - ${grpc-google-devtools-cloudtrace-v1.version} + com.google.cloud + google-cloud-trace + ${google-cloud-trace.version} diff --git a/sinks/v1/sink/pom.xml b/sinks/v1/sink/pom.xml index beb95fa..3c32e96 100644 --- a/sinks/v1/sink/pom.xml +++ b/sinks/v1/sink/pom.xml @@ -28,9 +28,9 @@ 19.0 - com.google.api.grpc - grpc-google-devtools-cloudtrace-v1 - ${grpc-google-devtools-cloudtrace-v1.version} + com.google.cloud + google-cloud-trace + ${google-cloud-trace.version}