* log-exporter: change gsutil to "gcloud storage"

Signed-off-by: neo <[email protected]>
neowu · Dec 7, 2024 · 5fcc52d · 5fcc52d
1 parent 44b8105
commit 5fcc52d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### 9.1.5 (11/11/2024 - )
 
+* log-exporter: change gsutil to "gcloud storage"
+
+> gsutil is deprecated and requires old version of python
+
 ### 9.1.4 (10/22/2024 - 11/08/2024)
 
 * http_server: always write multipart uploading for temp file

diff --git a/TODO.md b/TODO.md
@@ -26,6 +26,8 @@
 
 * track okHTTP fixed pin issue with virtual threads (looks like needs to wait until 5.0.0 released)
   https://github.com/square/okhttp/issues/8284
+* switch httpclient to jdk built in after jdk 24?, then send goaway frame in ShutdownHandler
+  https://bugs.openjdk.org/browse/JDK-8335181
 
 * log diagram, fix d3 tooltip (generate separated json, and make d3 tooltip show other non-HTML info)
 * change kafka compression to zstd? as it is production ready and widely used
diff --git a/ext/log-exporter/docker/Dockerfile b/ext/log-exporter/docker/Dockerfile
@@ -4,7 +4,7 @@ RUN         apk add --no-cache python3 curl
 # gcloud iam requires user home, so must not put --no-create-home
 RUN         addgroup --gid 1000 --system app && adduser --system --ingroup app --uid 1000 app
 RUN         curl -SL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-linux-x86_64.tar.gz | tar xzf - -C /opt \
-                && ln -s /opt/google-cloud-sdk/bin/gsutil /usr/local/bin/gsutil \
+                && ln -s /opt/google-cloud-sdk/bin/gcloud /usr/local/bin/gcloud \
                 && mkdir -p /var/log/app && chown -R app.app /var/log/app
 VOLUME      /var/log/app
 USER        1000

diff --git a/ext/log-exporter/src/main/java/core/log/service/UploadService.java b/ext/log-exporter/src/main/java/core/log/service/UploadService.java
@@ -16,6 +16,6 @@ public UploadService(String bucket) {
     public void upload(Path file, String remotePath) {
         // requires '-q', otherwise standard output may block if buffer is full, Shell reads std after process ends
         // and '-m' may stress network bandwidth, currently not really necessary
-        shell.execute("gsutil", "-q", "cp", file.toString(), bucket + remotePath);
+        shell.execute("gcloud", "storage", "--quiet", "cp", file.toString(), bucket + remotePath);
     }
 }