Change to use google-cloud-java:google-cloud-trace for TraceConsumer. (…

…#90)
GoogleCloudPlatform · Sep 5, 2017 · 2e5dac3 · 2e5dac3
1 parent a0ebf1c
commit 2e5dac3
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 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
@@ -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
@@ -28,9 +28,9 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-devtools-cloudtrace-v1</artifactId>
-      <version>${grpc-google-devtools-cloudtrace-v1.version}</version>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-trace</artifactId>
+      <version>${google-cloud-trace.version}</version>
     </dependency>
     <dependency>
       <!-- replacement for excluded transitive dependency from com.google.api.grpc:grpc-google-devtools-cloudtrace-v1 -->

diff --git a/pom.xml b/pom.xml
@@ -31,9 +31,9 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <grpc.version>1.5.0</grpc.version>
+    <grpc.version>1.4.0</grpc.version>
     <netty-boringssl.version>2.0.5.Final</netty-boringssl.version>
-    <grpc-google-devtools-cloudtrace-v1.version>0.1.1</grpc-google-devtools-cloudtrace-v1.version>
+    <google-cloud-trace.version>0.22.0-alpha</google-cloud-trace.version>
     <google-auth-library-credentials.version>0.7.1</google-auth-library-credentials.version>
     <google-auth-library-oauth2-http.version>0.7.1</google-auth-library-oauth2-http.version>
   </properties>
@@ -67,15 +67,9 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-devtools-cloudtrace-v1</artifactId>
-        <version>${grpc-google-devtools-cloudtrace-v1.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-all</artifactId>
-          </exclusion>
-        </exclusions>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-trace</artifactId>
+        <version>${google-cloud-trace.version}</version>
       </dependency>
       <dependency>
         <groupId>io.grpc</groupId>

diff --git a/services/trace-grpc-api-service/pom.xml b/services/trace-grpc-api-service/pom.xml
@@ -31,6 +31,11 @@
       <artifactId>service</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>sdk-sink</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}.v1</groupId>
       <artifactId>sink</artifactId>

diff --git a/sinks/v1/grpc-consumer/pom.xml b/sinks/v1/grpc-consumer/pom.xml
@@ -22,8 +22,9 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-devtools-cloudtrace-v1</artifactId>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-trace</artifactId>
+      <version>${google-cloud-trace.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.auth</groupId>

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
@@ -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
@@ -22,9 +22,9 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-devtools-cloudtrace-v1</artifactId>
-      <version>${grpc-google-devtools-cloudtrace-v1.version}</version>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-trace</artifactId>
+      <version>${google-cloud-trace.version}</version>
     </dependency>
     <dependency>
       <!-- replacement for excluded transitive dependency from com.google.api.grpc:grpc-google-devtools-cloudtrace-v1 -->

diff --git a/sinks/v1/sink/pom.xml b/sinks/v1/sink/pom.xml
@@ -28,9 +28,9 @@
       <version>19.0</version>
     </dependency>
     <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-devtools-cloudtrace-v1</artifactId>
-      <version>${grpc-google-devtools-cloudtrace-v1.version}</version>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-trace</artifactId>
+      <version>${google-cloud-trace.version}</version>
     </dependency>
     <dependency>
       <!-- replacement for excluded transitive dependency from com.google.api.grpc:grpc-google-devtools-cloudtrace-v1 -->