Skip to content

Commit b6e0f2c

Browse files
committed
Update Pubsub and Cloud Trace libraries.
1 parent 0f832ee commit b6e0f2c

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

stackdriver-trace/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,19 @@
2626

2727
val cloudTraceVersion: String by extra
2828

29+
val grpcVersion = "1.46.0"
30+
val googleOauth2Version = "1.7.0"
31+
2932
dependencies {
3033
api("com.google.cloud:google-cloud-trace:$cloudTraceVersion")
34+
35+
/**
36+
* The following libraries are the dependencies of the most recent `google-cloud-trace`.
37+
*
38+
* However, for some reason, they aren't available via `compileClasspath` as previously.
39+
* The tests heavily rely onto these libraries, therefore they are added ad-hoc.
40+
*/
41+
testImplementation("com.google.auth:google-auth-library-oauth2-http:$googleOauth2Version")
42+
testImplementation("io.grpc:grpc-core:$grpcVersion")
43+
testImplementation("io.grpc:grpc-auth:$grpcVersion")
3144
}

stackdriver-trace/src/main/java/io/spine/server/trace/stackdriver/StackdriverTracer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
import io.spine.server.trace.AbstractTracer;
3535
import io.spine.system.server.EntityTypeName;
3636

37+
import java.util.ArrayList;
3738
import java.util.List;
3839

39-
import static com.google.api.client.util.Lists.newArrayList;
4040
import static com.google.common.base.Preconditions.checkNotNull;
4141
import static java.util.Collections.synchronizedList;
4242

@@ -60,7 +60,7 @@ protected StackdriverTracer(Signal<?, ?, ?> signal,
6060
this.traceService = checkNotNull(traceService);
6161
this.projectId = checkNotNull(gcpProjectId);
6262
this.context = checkNotNull(context);
63-
this.spans = synchronizedList(newArrayList());
63+
this.spans = synchronizedList(new ArrayList<>());
6464
}
6565

6666
@Override

version.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
*/
3333

3434
val cloudDatastoreVersion: String by extra("2.8.0")
35-
val cloudPubsubV1Version: String by extra("1.92.1")
36-
val cloudTraceVersion: String by extra("1.2.8")
35+
val cloudPubsubV1Version: String by extra("1.101.1")
36+
val cloudTraceVersion: String by extra("2.2.0")
3737

3838
val spineBaseVersion: String by extra("1.8.2")
3939
val spineCoreVersion: String by extra("1.8.2")

0 commit comments

Comments
 (0)