Skip to content
This repository was archived by the owner on Sep 14, 2022. It is now read-only.

Commit 2e5dac3

Browse files
author
Bogdan Drutu
authored
Change to use google-cloud-java:google-cloud-trace for TraceConsumer. (#90)
1 parent a0ebf1c commit 2e5dac3

File tree

8 files changed

+46
-33
lines changed

8 files changed

+46
-33
lines changed

‎guice/grpc-sink/src/main/java/com/google/cloud/trace/guice/grpc/v1/GrpcTraceSinkModule.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.google.inject.AbstractModule;
2323
import com.google.inject.Provides;
2424
import com.google.inject.Singleton;
25+
import java.io.IOException;
2526

2627
public class GrpcTraceSinkModule extends AbstractModule {
2728
@Override
@@ -30,7 +31,8 @@ protected void configure() {}
3031
@Provides
3132
@ApiTraceSink
3233
@Singleton
33-
TraceConsumer provideTraceSink(@ApiHost String apiHost, Credentials credentials) {
34+
TraceConsumer provideTraceSink(@ApiHost String apiHost, Credentials credentials)
35+
throws IOException {
3436
return GrpcTraceConsumer.create(apiHost, credentials);
3537
}
3638
}

‎guice/v1/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
<version>${project.version}</version>
2929
</dependency>
3030
<dependency>
31-
<groupId>com.google.api.grpc</groupId>
32-
<artifactId>grpc-google-devtools-cloudtrace-v1</artifactId>
33-
<version>${grpc-google-devtools-cloudtrace-v1.version}</version>
31+
<groupId>com.google.cloud</groupId>
32+
<artifactId>google-cloud-trace</artifactId>
33+
<version>${google-cloud-trace.version}</version>
3434
</dependency>
3535
<dependency>
3636
<!-- replacement for excluded transitive dependency from com.google.api.grpc:grpc-google-devtools-cloudtrace-v1 -->

‎pom.xml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131

3232
<properties>
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
34-
<grpc.version>1.5.0</grpc.version>
34+
<grpc.version>1.4.0</grpc.version>
3535
<netty-boringssl.version>2.0.5.Final</netty-boringssl.version>
36-
<grpc-google-devtools-cloudtrace-v1.version>0.1.1</grpc-google-devtools-cloudtrace-v1.version>
36+
<google-cloud-trace.version>0.22.0-alpha</google-cloud-trace.version>
3737
<google-auth-library-credentials.version>0.7.1</google-auth-library-credentials.version>
3838
<google-auth-library-oauth2-http.version>0.7.1</google-auth-library-oauth2-http.version>
3939
</properties>
@@ -67,15 +67,9 @@
6767
<dependencyManagement>
6868
<dependencies>
6969
<dependency>
70-
<groupId>com.google.api.grpc</groupId>
71-
<artifactId>grpc-google-devtools-cloudtrace-v1</artifactId>
72-
<version>${grpc-google-devtools-cloudtrace-v1.version}</version>
73-
<exclusions>
74-
<exclusion>
75-
<groupId>io.grpc</groupId>
76-
<artifactId>grpc-all</artifactId>
77-
</exclusion>
78-
</exclusions>
70+
<groupId>com.google.cloud</groupId>
71+
<artifactId>google-cloud-trace</artifactId>
72+
<version>${google-cloud-trace.version}</version>
7973
</dependency>
8074
<dependency>
8175
<groupId>io.grpc</groupId>

‎services/trace-grpc-api-service/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
<artifactId>service</artifactId>
3232
<version>${project.version}</version>
3333
</dependency>
34+
<dependency>
35+
<groupId>${project.groupId}</groupId>
36+
<artifactId>sdk-sink</artifactId>
37+
<version>${project.version}</version>
38+
</dependency>
3439
<dependency>
3540
<groupId>${project.groupId}.v1</groupId>
3641
<artifactId>sink</artifactId>

‎sinks/v1/grpc-consumer/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
<version>${project.version}</version>
2323
</dependency>
2424
<dependency>
25-
<groupId>com.google.api.grpc</groupId>
26-
<artifactId>grpc-google-devtools-cloudtrace-v1</artifactId>
25+
<groupId>com.google.cloud</groupId>
26+
<artifactId>google-cloud-trace</artifactId>
27+
<version>${google-cloud-trace.version}</version>
2728
</dependency>
2829
<dependency>
2930
<groupId>com.google.auth</groupId>

‎sinks/v1/grpc-consumer/src/main/java/com/google/cloud/trace/grpc/v1/GrpcTraceConsumer.java‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414

1515
package com.google.cloud.trace.grpc.v1;
1616

17+
import com.google.api.gax.core.FixedCredentialsProvider;
1718
import com.google.auth.Credentials;
19+
import com.google.cloud.trace.v1.TraceServiceClient;
20+
import com.google.cloud.trace.v1.TraceServiceSettings;
1821
import com.google.cloud.trace.v1.consumer.TraceConsumer;
1922
import com.google.devtools.cloudtrace.v1.PatchTracesRequest;
20-
import com.google.devtools.cloudtrace.v1.TraceServiceGrpc;
2123
import com.google.devtools.cloudtrace.v1.Traces;
22-
import io.grpc.Channel;
23-
import io.grpc.ManagedChannelBuilder;
24-
import io.grpc.auth.MoreCallCredentials;
24+
import java.io.IOException;
2525

2626

2727
/**
@@ -33,14 +33,14 @@
3333
* @see TraceConsumer
3434
*/
3535
public class GrpcTraceConsumer implements TraceConsumer {
36-
private final TraceServiceGrpc.TraceServiceBlockingStub traceService;
36+
private final TraceServiceClient traceService;
3737

3838
/**
3939
* Creates a trace consumer that sends trace messages to the Stackdriver Trace API via gRPC.
4040
*
4141
* @param traceService the trace service to use for sending API calls.
4242
*/
43-
public GrpcTraceConsumer(TraceServiceGrpc.TraceServiceBlockingStub traceService) {
43+
public GrpcTraceConsumer(TraceServiceClient traceService) {
4444
this.traceService = traceService;
4545
}
4646

@@ -64,9 +64,20 @@ public void receive(Traces traces) {
6464
* @param apiHost a string containing the API host name.
6565
* @param credentials a credentials used to authenticate API calls.
6666
*/
67-
public static GrpcTraceConsumer create(String apiHost, Credentials credentials) {
68-
Channel channel = ManagedChannelBuilder.forTarget(apiHost).build();
69-
return new GrpcTraceConsumer(TraceServiceGrpc.newBlockingStub(channel)
70-
.withCallCredentials(MoreCallCredentials.from(credentials)));
67+
public static GrpcTraceConsumer create(String apiHost, Credentials credentials)
68+
throws IOException {
69+
TraceServiceSettings traceServiceSettings =
70+
TraceServiceSettings.defaultBuilder()
71+
.setCredentialsProvider(FixedCredentialsProvider.create(credentials))
72+
.setTransportProvider(
73+
TraceServiceSettings.defaultGrpcTransportProviderBuilder()
74+
.setChannelProvider(
75+
TraceServiceSettings.defaultGrpcChannelProviderBuilder()
76+
.setEndpoint(apiHost)
77+
.build())
78+
.build())
79+
.build();
80+
81+
return new GrpcTraceConsumer(TraceServiceClient.create(traceServiceSettings));
7182
}
7283
}

‎sinks/v1/http-consumer/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
<version>${project.version}</version>
2323
</dependency>
2424
<dependency>
25-
<groupId>com.google.api.grpc</groupId>
26-
<artifactId>grpc-google-devtools-cloudtrace-v1</artifactId>
27-
<version>${grpc-google-devtools-cloudtrace-v1.version}</version>
25+
<groupId>com.google.cloud</groupId>
26+
<artifactId>google-cloud-trace</artifactId>
27+
<version>${google-cloud-trace.version}</version>
2828
</dependency>
2929
<dependency>
3030
<!-- replacement for excluded transitive dependency from com.google.api.grpc:grpc-google-devtools-cloudtrace-v1 -->

‎sinks/v1/sink/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
<version>19.0</version>
2929
</dependency>
3030
<dependency>
31-
<groupId>com.google.api.grpc</groupId>
32-
<artifactId>grpc-google-devtools-cloudtrace-v1</artifactId>
33-
<version>${grpc-google-devtools-cloudtrace-v1.version}</version>
31+
<groupId>com.google.cloud</groupId>
32+
<artifactId>google-cloud-trace</artifactId>
33+
<version>${google-cloud-trace.version}</version>
3434
</dependency>
3535
<dependency>
3636
<!-- replacement for excluded transitive dependency from com.google.api.grpc:grpc-google-devtools-cloudtrace-v1 -->

0 commit comments

Comments
 (0)