diff options
author | zachdriver <zach@driver.xyz> | 2017-10-03 13:05:21 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-03 13:05:21 -0700 |
commit | 16d2b4c6b4d230681cae45d2c2557a4cd46439a2 (patch) | |
tree | 4d27b2bed94d7e39db7419b4f1b5016178643d58 /src/main | |
parent | c9ccc77bcfe434716562ce19838e991025dbe7cc (diff) | |
parent | d888d2fa64f9de5d0e5417f65e31c5e35817ec54 (diff) | |
download | driver-core-16d2b4c6b4d230681cae45d2c2557a4cd46439a2.tar.gz driver-core-16d2b4c6b4d230681cae45d2c2557a4cd46439a2.tar.bz2 driver-core-16d2b4c6b4d230681cae45d2c2557a4cd46439a2.zip |
Merge pull request #70 from drivergroup/zsmith/upgrade-google-pubsubv1.2.2
Upgrade google pubsub and storage libraries
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/scala/xyz/driver/core/pubsub.scala | 2 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/trace/GoogleStackdriverTrace.scala | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/core/pubsub.scala b/src/main/scala/xyz/driver/core/pubsub.scala index fcd096d..7885c1f 100644 --- a/src/main/scala/xyz/driver/core/pubsub.scala +++ b/src/main/scala/xyz/driver/core/pubsub.scala @@ -4,7 +4,7 @@ import akka.http.scaladsl.marshalling._ import akka.http.scaladsl.unmarshalling.{Unmarshal, Unmarshaller} import akka.stream.Materializer import com.google.api.core.{ApiFutureCallback, ApiFutures} -import com.google.cloud.pubsub.spi.v1._ +import com.google.cloud.pubsub.v1._ import com.google.protobuf.ByteString import com.google.pubsub.v1.{PubsubMessage, PushConfig, SubscriptionName, TopicName} import com.typesafe.scalalogging.Logger diff --git a/src/main/scala/xyz/driver/core/trace/GoogleStackdriverTrace.scala b/src/main/scala/xyz/driver/core/trace/GoogleStackdriverTrace.scala index 04f2ec6..ce84f9d 100644 --- a/src/main/scala/xyz/driver/core/trace/GoogleStackdriverTrace.scala +++ b/src/main/scala/xyz/driver/core/trace/GoogleStackdriverTrace.scala @@ -30,8 +30,7 @@ final class GoogleStackdriverTrace(projectId: String, new LoggingTraceConsumer(log) } { clientSecretsInputStream => GrpcTraceConsumer - .create( - "cloudtrace.googleapis.com", + .createWithCredentials( GoogleCredentials .fromStream(clientSecretsInputStream) .createScoped(util.Arrays.asList("https://www.googleapis.com/auth/trace.append")) |