From 332e3bda7cde792c8241c49348f5c2a89bd5ef5b Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@tetrate.io>
Date: Mon, 18 Dec 2023 14:04:11 +0800
Subject: [PATCH] fixes issues around missing gson and armeria decoration

Signed-off-by: Adrian Cole <adrian@tetrate.io>
---
 build-bin/README.md                                      | 1 +
 build-bin/docker-compose-zipkin-gcp.yml                  | 4 ++--
 module/pom.xml                                           | 2 +-
 .../storage/stackdriver/CredentialsDecoratingClient.java | 3 ++-
 pom.xml                                                  | 9 +++++----
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/build-bin/README.md b/build-bin/README.md
index 89d3147f..e7989226 100755
--- a/build-bin/README.md
+++ b/build-bin/README.md
@@ -8,6 +8,7 @@ configuration settings.
 [docker-compose-zipkin-gcp.xml] ensures GCP authentication works. It is not run on pull request, as
 the required secure variable is only available on master push.
 
+[//]: # (Below here should be standard for all projects)
 
 ## Build Overview
 `build-bin` holds portable scripts used in CI to test and deploy the project.
diff --git a/build-bin/docker-compose-zipkin-gcp.yml b/build-bin/docker-compose-zipkin-gcp.yml
index 3c7d517c..7d9e2b66 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 c5769a3a..50a6dfdc 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -159,7 +159,7 @@
           <classifier>module</classifier>
           <!-- https://github.com/spring-projects/spring-boot/issues/3426 transitive exclude doesn't work -->
           <excludeGroupIds>
-            ${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
           </excludeGroupIds>
           <excludes>
             <!-- zipkin-server depends on armeria and its grpc protocol-->
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 fbf76513..d9dcd70c 100644
--- a/module/src/main/java/zipkin/module/storage/stackdriver/CredentialsDecoratingClient.java
+++ b/module/src/main/java/zipkin/module/storage/stackdriver/CredentialsDecoratingClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
+ * Copyright 2016-2023 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -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));
diff --git a/pom.xml b/pom.xml
index 4c47ad35..8ff50827 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
     <zipkin.groupId>io.zipkin.zipkin2</zipkin.groupId>
     <!-- when updating, update docker/Dockerfile and storage/src/test/java/zipkin2/storage/kafka/IT* -->
     <zipkin.version>2.25.2</zipkin.version>
-    <zipkin-reporter.version>2.17.0</zipkin-reporter.version>
+    <zipkin-reporter.version>2.17.1</zipkin-reporter.version>
     <spring-boot.version>2.7.18</spring-boot.version>
     <!-- armeria.groupId allows you to test feature branches with jitpack -->
     <armeria.groupId>com.linecorp.armeria</armeria.groupId>
@@ -73,7 +73,7 @@
     <!--    <brave.groupId>com.github.openzipkin.brave</brave.groupId>-->
     <!--    <brave.version>master-SNAPSHOT</brave.version>-->
     <brave.groupId>io.zipkin.brave</brave.groupId>
-    <brave.version>5.16.0</brave.version>
+    <brave.version>5.17.0</brave.version>
 
     <!-- from armeria-grpc -->
     <grpc.version>1.58.0</grpc.version>
@@ -298,9 +298,10 @@
         <version>${maven-compiler-plugin.version}</version>
         <inherited>true</inherited>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>${main.java.version}</source>
+          <target>${main.java.version}</target>
           <fork>true</fork>
+          <release>8</release>
           <showWarnings>true</showWarnings>
         </configuration>
       </plugin>