spcl · mcopik · Apr 28, 2026 · Jan 5, 2026 · Jan 5, 2026 · Apr 23, 2026
diff --git a/README.md b/README.md
@@ -242,4 +242,5 @@ However, they can be missing some of the features from the `master` branch.
 * [Alexander Schlieper (ETH Zurich)](https://github.com/xSurus) - improved support for Java benchmarks.
 * [Laurin Jahns (ETH Zurich)](https://github.com/userlaurin) - support for language variants.
 * [Sharayu Rasal](https://github.com/Sharayu1418) - help with function URLs on AWS.
-* [Livio D'Agostini](https://github.com/ldzgch) - new implementations of benchmarks in Node.js.
+* [Livio D'Agostini (ETH Zurich)](https://github.com/ldzgch) - new implementations of benchmarks in Node.js.
+* [toooadi (ETH Zurich)](https://github.com/toooadi) - container support for Google Cloud.
diff --git a/benchmarks/wrappers/gcp/java/src/main/java/org/serverlessbench/Handler.java b/benchmarks/wrappers/gcp/java/src/main/java/org/serverlessbench/Handler.java
@@ -17,12 +17,17 @@
 public class Handler implements HttpFunction {
 
     private static final ObjectMapper MAPPER = new ObjectMapper();
+    private static final String FUNCTION_EXECUTION_ID_HEADER = "Function-Execution-Id";
+    private static final String TRACE_CONTEXT_HEADER = "X-Cloud-Trace-Context";
 
     @Override
     public void service(HttpRequest request, HttpResponse response)
             throws IOException {
 
         Instant beginTs = Instant.now();
+        String requestId = request.getFirstHeader(TRACE_CONTEXT_HEADER)
+          .or(() -> request.getFirstHeader(FUNCTION_EXECUTION_ID_HEADER))
+          .orElse("");
 
         // Normalize request from GCP HTTP format
         Map<String, Object> normalized = normalizeRequest(request);
@@ -51,7 +56,7 @@ public void service(HttpRequest request, HttpResponse response)
         body.put("is_cold", ColdStartTracker.isCold());
         body.put("container_id", containerId);
         body.put("cold_start_var", coldStartVar);
-        body.put("request_id", request.getFirstHeader("Function-Execution-Id").orElse(""));
+        body.put("request_id", requestId);
 
         // Write JSON response
         response.setContentType("application/json");

diff --git a/benchmarks/wrappers/gcp/nodejs/handler.js b/benchmarks/wrappers/gcp/nodejs/handler.js
@@ -10,6 +10,7 @@ if('NOSQL_STORAGE_DATABASE' in process.env) {
 exports.handler = async function(req, res) {
   var begin = Date.now()/1000;
   var start = process.hrtime();
+  var requestId = req.headers["x-cloud-trace-context"] || req.headers["function-execution-id"];
   var func = require('./function/function')
   var ret = func.handler(req.body);
   return ret.then(
@@ -32,7 +33,7 @@ exports.handler = async function(req, res) {
           results_time: 0,
           result: result,
           is_cold: is_cold,
-          request_id: req.headers["function-execution-id"]
+          request_id: requestId
         });
     },
     (error) => {

diff --git a/benchmarks/wrappers/gcp/python/handler.py b/benchmarks/wrappers/gcp/python/handler.py
@@ -11,11 +11,9 @@
         os.environ['NOSQL_STORAGE_DATABASE']
     )
 
-
 def handler(req):
     income_timestamp = datetime.datetime.now().timestamp()
-    req_id = req.headers.get('Function-Execution-Id')
-
+    req_id = req.headers.get('X-Cloud-Trace-Context') or req.headers.get('Function-Execution-Id')
 
     req_json = req.get_json()
     req_json['request-id'] = req_id

diff --git a/benchmarks/wrappers/gcp/python/setup.py b/benchmarks/wrappers/gcp/python/setup.py
@@ -0,0 +1,9 @@
+from distutils.core import setup
+from glob import glob
+
+setup(
+    name='function',
+    packages=['function'],
+    package_dir={'function': '.'},
+    package_data={'function': glob('**', recursive=True)},
+)
diff --git a/configs/cpp.json b/configs/cpp.json
@@ -66,7 +66,34 @@
     "gcp": {
       "region": "europe-west1",
       "project_name": "",
-      "credentials": ""
+      "credentials": "",
+      "configuration": {
+        "function-gen1": {
+          "min-instances": 0,
+          "max-instances": 20
+        },
+        "function-gen2": {
+          "vcpus": 1,
+          "gcp-concurrency": 80,
+          "worker-concurrency": 1,
+          "worker-threads": 8,
+          "min-instances": 0,
+          "max-instances": 20,
+          "cpu-boost": false,
+          "cpu-throttle": true
+        },
+        "container": {
+          "environment": "gen2",
+          "vcpus": 1,
+          "gcp-concurrency": 80,
+          "worker-concurrency": 1,
+          "worker-threads": 8,
+          "min-instances": 0,
+          "max-instances": 20,
+          "cpu-boost": false,
+          "cpu-throttle": true
+        }
+      }
     },
     "local": {
       "storage": {

diff --git a/configs/java.json b/configs/java.json
@@ -58,7 +58,34 @@
     "gcp": {
       "region": "europe-west1",
       "project_name": "",
-      "credentials": ""
+      "credentials": "",
+      "configuration": {
+        "function-gen1": {
+          "min-instances": 0,
+          "max-instances": 20
+        },
+        "function-gen2": {
+          "vcpus": 1,
+          "gcp-concurrency": 80,
+          "worker-concurrency": 1,
+          "worker-threads": 8,
+          "min-instances": 0,
+          "max-instances": 20,
+          "cpu-boost": false,
+          "cpu-throttle": true
+        },
+        "container": {
+          "environment": "gen2",
+          "vcpus": 1,
+          "gcp-concurrency": 80,
+          "worker-concurrency": 1,
+          "worker-threads": 8,
+          "min-instances": 0,
+          "max-instances": 20,
+          "cpu-boost": false,
+          "cpu-throttle": true
+        }
+      }
     },
     "local": {
       "storage": {

diff --git a/configs/nodejs.json b/configs/nodejs.json
@@ -66,7 +66,34 @@
     "gcp": {
       "region": "europe-west1",
       "project_name": "",
-      "credentials": ""
+      "credentials": "",
+      "configuration": {
+        "function-gen1": {
+          "min-instances": 0,
+          "max-instances": 20
+        },
+        "function-gen2": {
+          "vcpus": 1,
+          "gcp-concurrency": 80,
+          "worker-concurrency": 1,
+          "worker-threads": 8,
+          "min-instances": 0,
+          "max-instances": 20,
+          "cpu-boost": false,
+          "cpu-throttle": true
+        },
+        "container": {
+          "environment": "gen2",
+          "vcpus": 1,
+          "gcp-concurrency": 80,
+          "worker-concurrency": 1,
+          "worker-threads": 8,
+          "min-instances": 0,
+          "max-instances": 20,
+          "cpu-boost": false,
+          "cpu-throttle": true
+        }
+      }
     },
     "local": {
       "storage": {

diff --git a/configs/python.json b/configs/python.json
@@ -66,7 +66,34 @@
     "gcp": {
       "region": "europe-west1",
       "project_name": "",
-      "credentials": ""
+      "credentials": "",
+      "configuration": {
+        "function-gen1": {
+          "min-instances": 0,
+          "max-instances": 20
+        },
+        "function-gen2": {
+          "vcpus": 1,
+          "gcp-concurrency": 80,
+          "worker-concurrency": 1,
+          "worker-threads": 8,
+          "min-instances": 0,
+          "max-instances": 20,
+          "cpu-boost": false,
+          "cpu-throttle": true
+        },
+        "container": {
+          "environment": "gen2",
+          "vcpus": 1,
+          "gcp-concurrency": 80,
+          "worker-concurrency": 1,
+          "worker-threads": 8,
+          "min-instances": 0,
+          "max-instances": 20,
+          "cpu-boost": false,
+          "cpu-throttle": true
+        }
+      }
     },
     "local": {
       "storage": {

diff --git a/configs/systems.json b/configs/systems.json
@@ -71,8 +71,12 @@
         }
       }
     },
-    "architecture": ["x64"],
-    "deployments": ["package"]
+    "architecture": [
+      "x64"
+    ],
+    "deployments": [
+      "package"
+    ]
   },
   "aws": {
     "languages": {
@@ -176,8 +180,14 @@
         }
       }
     },
-    "architecture": ["x64", "arm64"],
-    "deployments": ["package", "container"]
+    "architecture": [
+      "x64",
+      "arm64"
+    ],
+    "deployments": [
+      "package",
+      "container"
+    ]
   },
   "azure": {
     "languages": {
@@ -262,17 +272,21 @@
         "username": "docker_user"
       }
     },
-    "architecture": ["x64"],
-    "deployments": ["package"]
+    "architecture": [
+      "x64"
+    ],
+    "deployments": [
+      "package"
+    ]
   },
   "gcp": {
     "languages": {
       "python": {
         "base_images": {
           "x64": {
-            "3.10": "ubuntu:22.04",
-            "3.11": "ubuntu:22.04",
-            "3.12": "ubuntu:22.04"
+            "3.10": "us-central1-docker.pkg.dev/serverless-runtimes/google-22/runtimes/python310@sha256:88ac475abc994f60c6d156e2fcce443396e581fc984e154b5f8608e3298a7d18",
+            "3.11": "us-central1-docker.pkg.dev/serverless-runtimes/google-22/runtimes/python311@sha256:3c346ccf7b0de6c3df6cda05378e96532de1cfb82aaf1e823dc1cc0ca674f61c",
+            "3.12": "us-central1-docker.pkg.dev/serverless-runtimes/google-22/runtimes/python312@sha256:5aa81b77d8361b4b82e3d59f08c834ffb354ccbb7ddf4eff8bb22ce26dee477f"
           }
         },
         "images": [
@@ -283,24 +297,26 @@
           "files": [
             "handler.py",
             "storage.py",
-            "nosql.py"
+            "nosql.py",
+            "setup.py"
           ],
           "packages": [],
           "module_packages": {
             "storage": [
-              "google-cloud-storage"
+              "google-cloud-storage==3.10.1"
             ],
             "nosql": [
-              "google-cloud-datastore"
+              "google-cloud-datastore==2.24.0"
             ]
           }
         }
       },
       "nodejs": {
         "base_images": {
           "x64": {
-            "18": "ubuntu:22.04",
-            "20": "ubuntu:22.04"
+            "20": "us-central1-docker.pkg.dev/serverless-runtimes/google-22/runtimes/nodejs20@sha256:504eb1f482bb62a9c3524bfebada43db93105d7fe6447dc7c96a9f4423e79908",
+            "22": "us-central1-docker.pkg.dev/serverless-runtimes/google-22/runtimes/nodejs22@sha256:56a74d24510c0f4d0da44e13226a150821a84440ddfbf89b52ea620ca729db07",
+            "24": "us-central1-docker.pkg.dev/serverless-runtimes/google-24/runtimes/nodejs24@sha256:8309735602e6228412ba362959f63eebcac9fe5e9a114eb1e63b7febef13030c"
           }
         },
         "images": [
@@ -314,8 +330,8 @@
             "nosql.js"
           ],
           "packages": {
-            "@google-cloud/datastore": "^9.1.0",
-            "@google-cloud/storage": "^4.0.0",
+            "@google-cloud/datastore": "9.1.0",
+            "@google-cloud/storage": "4.0.0",
             "uuid": "3.4.0"
           }
         }
@@ -324,7 +340,7 @@
         "base_images": {
           "x64": {
             "11": "us-central1-docker.pkg.dev/serverless-runtimes/google-18-full/runtimes/java11:deprecated-public-image-java11_20260217_11_0_RC00",
-            "17": "us-central1-docker.pkg.dev/serverless-runtimes/google-22-full/runtimes/java17:java17_20260215_17_0_RC00"
+            "17": "us-central1-docker.pkg.dev/serverless-runtimes/google-22/runtimes/java17:java17_20260405_17_0_RC00"
           }
         },
         "images": [
@@ -348,8 +364,14 @@
         "username": "docker_user"
       }
     },
-    "architecture": ["x64"],
-    "deployments": ["package"]
+    "architecture": [
+      "x64",
+      "arm64"
+    ],
+    "deployments": [
+      "package",
+      "container"
+    ]
   },
   "openwhisk": {
     "languages": {
@@ -430,7 +452,11 @@
         }
       }
     },
-    "architecture": ["x64"],
-    "deployments": ["container"]
+    "architecture": [
+      "x64"
+    ],
+    "deployments": [
+      "container"
+    ]
   }
 }