Merge branch 'main' into renovate/busybox-latest

GoogleCloudPlatform · Dec 11, 2023 · bcf022c · bcf022c
2 parents fbc7d40 + 53c680a
commit bcf022c
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git a/helm-chart/templates/opentelemetry-collector.yaml b/helm-chart/templates/opentelemetry-collector.yaml
@@ -94,7 +94,7 @@ spec:
           readOnlyRootFilesystem: true
         args:
         - --config=/conf/collector-gateway-config.yaml
-        image: otel/opentelemetry-collector-contrib:0.89.0@sha256:995f17004231249d2c7d775849bf100b209508448919ca2077f8023ba49e3a95
+        image: otel/opentelemetry-collector-contrib:0.90.1@sha256:68e281e285f6ded5ec9da245ad68cd3cd963d5d55c329cf3fd3167ca7b51894a
         volumeMounts:
         - name: collector-gateway-config
           mountPath: /conf

diff --git a/kustomize/components/google-cloud-operations/otel-collector.yaml b/kustomize/components/google-cloud-operations/otel-collector.yaml
@@ -68,7 +68,7 @@ spec:
           readOnlyRootFilesystem: true
         args:
         - --config=/conf/collector-gateway-config.yaml
-        image: otel/opentelemetry-collector-contrib:0.89.0@sha256:995f17004231249d2c7d775849bf100b209508448919ca2077f8023ba49e3a95
+        image: otel/opentelemetry-collector-contrib:0.90.1@sha256:68e281e285f6ded5ec9da245ad68cd3cd963d5d55c329cf3fd3167ca7b51894a
         volumeMounts:
         - name: collector-gateway-config
           mountPath: /conf

diff --git a/src/adservice/build.gradle b/src/adservice/build.gradle
@@ -14,7 +14,7 @@ description = 'Ad Service'
 group = "adservice"
 version = "0.1.0-SNAPSHOT"
 
-def grpcVersion = "1.59.0"
+def grpcVersion = "1.59.1"
 def jacksonCoreVersion = "2.16.0"
 def jacksonDatabindVersion = "2.16.0"
 def protocVersion = "3.25.1"
@@ -33,7 +33,7 @@ dependencies {
     if (speed) {
         implementation fileTree(dir: offlineCompile, include: '*.jar')
     } else {
-        implementation "com.google.api.grpc:proto-google-common-protos:2.28.0",
+        implementation "com.google.api.grpc:proto-google-common-protos:2.29.0",
                 "javax.annotation:javax.annotation-api:1.3.2",
                 "io.grpc:grpc-protobuf:${grpcVersion}",
                 "io.grpc:grpc-stub:${grpcVersion}",

diff --git a/src/adservice/gradle/wrapper/gradle-wrapper.jar b/src/adservice/gradle/wrapper/gradle-wrapper.jar
diff --git a/src/adservice/gradle/wrapper/gradle-wrapper.properties b/src/adservice/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/currencyservice/package-lock.json b/src/currencyservice/package-lock.json
diff --git a/src/currencyservice/package.json b/src/currencyservice/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@google-cloud/profiler": "6.0.0",
     "@google-cloud/trace-agent": "7.1.2",
-    "@grpc/grpc-js": "1.9.11",
+    "@grpc/grpc-js": "1.9.12",
     "@grpc/proto-loader": "0.7.10",
     "async": "3.2.5",
     "google-protobuf": "3.21.2",

diff --git a/src/loadgenerator/requirements.txt b/src/loadgenerator/requirements.txt
@@ -33,7 +33,7 @@ gevent==23.9.1
     #   locust
 geventhttpclient==2.0.11
     # via locust
-greenlet==3.0.1
+greenlet==3.0.2
     # via gevent
 idna==3.6
     # via requests
@@ -51,7 +51,7 @@ msgpack==1.0.7
     # via locust
 psutil==5.9.6
     # via locust
-pyzmq==25.1.1
+pyzmq==25.1.2
     # via locust
 requests==2.31.0
     # via locust

diff --git a/src/paymentservice/package-lock.json b/src/paymentservice/package-lock.json
diff --git a/src/paymentservice/package.json b/src/paymentservice/package.json
@@ -11,7 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "@google-cloud/profiler": "6.0.0",
-    "@grpc/grpc-js": "1.9.11",
+    "@grpc/grpc-js": "1.9.12",
     "@grpc/proto-loader": "0.7.10",
     "@opentelemetry/api": "1.7.0",
     "@opentelemetry/exporter-otlp-grpc": "0.26.0",

diff --git a/terraform/providers.tf b/terraform/providers.tf
@@ -16,7 +16,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "5.7.0"
+      version = "5.8.0"
     }
   }
 }