diff --git a/build-bin/docker-compose-zipkin-gcp.yml b/build-bin/docker-compose-zipkin-gcp.yml index 3c7d517..7d9e2b6 100644 --- a/build-bin/docker-compose-zipkin-gcp.yml +++ b/build-bin/docker-compose-zipkin-gcp.yml @@ -3,14 +3,14 @@ volumes: gcp-service-account: services: extract-service-account: - image: ghcr.io/openzipkin/alpine:3.12.1 + image: ghcr.io/openzipkin/alpine:3.19.0 volumes: - gcp-service-account:/credentials:rw command: -c 'echo $GOOGLE_APPLICATION_CREDENTIALS_BASE64 | base64 -d > /credentials/service-account-key.json' environment: - GOOGLE_APPLICATION_CREDENTIALS_BASE64 show-service-account: - image: ghcr.io/openzipkin/alpine:3.12.1 + image: ghcr.io/openzipkin/alpine:3.19.0 volumes: - gcp-service-account:/credentials:ro # Show that the file exists as a sanity check in logs. diff --git a/module/pom.xml b/module/pom.xml index c5769a3..50a6dfd 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -159,7 +159,7 @@ module - ${zipkin.groupId},org.springframework.boot,org.springframework,com.fasterxml.jackson.core,com.google.auto.value,com.google.code.gson,org.reactivestreams,com.google.code.findbugs,javax.annotation,org.slf4j,io.netty,io.micrometer,org.hdrhistogram,org.latencyutils,${armeria.groupId},javax.inject,com.fasterxml.jackson.datatype + ${zipkin.groupId},org.springframework.boot,org.springframework,com.fasterxml.jackson.core,com.google.auto.value,org.reactivestreams,com.google.code.findbugs,javax.annotation,org.slf4j,io.netty,io.micrometer,org.hdrhistogram,org.latencyutils,${armeria.groupId},javax.inject,com.fasterxml.jackson.datatype diff --git a/module/src/main/java/zipkin/module/storage/stackdriver/CredentialsDecoratingClient.java b/module/src/main/java/zipkin/module/storage/stackdriver/CredentialsDecoratingClient.java index fbf7651..0896dba 100644 --- a/module/src/main/java/zipkin/module/storage/stackdriver/CredentialsDecoratingClient.java +++ b/module/src/main/java/zipkin/module/storage/stackdriver/CredentialsDecoratingClient.java @@ -64,6 +64,7 @@ private CredentialsDecoratingClient(HttpClient delegate, Credentials credentials headers.add(HttpHeaderNames.of(entry.getKey()), entry.getValue()); } })); + ctx.updateRequest(newReq); } try { responseFuture.complete(unwrap().execute(ctx, newReq));