From 2b7404f99e9c3f1da1a6f72148c338d71fb780ec Mon Sep 17 00:00:00 2001 From: sophia chen Date: Wed, 11 Mar 2026 14:11:42 +1100 Subject: [PATCH 1/9] updated defaultWorkerPoolSize to vCPU count --- src/main/java/com/uid2/operator/Main.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/uid2/operator/Main.java b/src/main/java/com/uid2/operator/Main.java index fa603d51b..49f842905 100644 --- a/src/main/java/com/uid2/operator/Main.java +++ b/src/main/java/com/uid2/operator/Main.java @@ -503,7 +503,7 @@ private static Vertx createVertx() { ? 60 * 1000 : 3600 * 1000; - final int defaultWorkerPoolSize = Math.max(2, (Runtime.getRuntime().availableProcessors() - 2) / 2 + 1); + final int defaultWorkerPoolSize = Math.max(2, Runtime.getRuntime().availableProcessors()); final int workerPoolSize = getEnvInt(Const.Config.DefaultWorkerPoolThreadCountProp, defaultWorkerPoolSize); LOGGER.info("Creating Vertx with default worker pool size: {}", workerPoolSize); @@ -657,4 +657,17 @@ private static int getEnvInt(String name, int defaultValue) { return defaultValue; } } + + private static boolean getEnvBool(String name, boolean defaultValue) { + String value = System.getenv(name); + if (value == null || value.isEmpty()) { + return defaultValue; + } + try { + return Boolean.parseBoolean(value); + } catch (NumberFormatException e) { + LOGGER.warn("Invalid boolean value for environment variable {}: '{}', using default: {}", name, value, defaultValue); + return defaultValue; + } + } } From 4f108b733bbe426a0430246889a4164045c4e914 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Wed, 11 Mar 2026 03:15:41 +0000 Subject: [PATCH 2/9] [CI Pipeline] Released Snapshot version: 5.67.13-alpha-693-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f44431ef4..549d19661 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.67.12 + 5.67.13-alpha-693-SNAPSHOT UTF-8 From 8187b7c7a0288fd8e87f710f6e751fe73c9d3abd Mon Sep 17 00:00:00 2001 From: sophia chen Date: Thu, 12 Mar 2026 10:53:21 +1100 Subject: [PATCH 3/9] clean up --- src/main/java/com/uid2/operator/Main.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/main/java/com/uid2/operator/Main.java b/src/main/java/com/uid2/operator/Main.java index 49f842905..436385880 100644 --- a/src/main/java/com/uid2/operator/Main.java +++ b/src/main/java/com/uid2/operator/Main.java @@ -657,17 +657,4 @@ private static int getEnvInt(String name, int defaultValue) { return defaultValue; } } - - private static boolean getEnvBool(String name, boolean defaultValue) { - String value = System.getenv(name); - if (value == null || value.isEmpty()) { - return defaultValue; - } - try { - return Boolean.parseBoolean(value); - } catch (NumberFormatException e) { - LOGGER.warn("Invalid boolean value for environment variable {}: '{}', using default: {}", name, value, defaultValue); - return defaultValue; - } - } } From 8293ff6b43912961c9a758b7de8926af92d03d7b Mon Sep 17 00:00:00 2001 From: sophia chen Date: Mon, 16 Mar 2026 10:08:25 +1100 Subject: [PATCH 4/9] update private operator instances --- scripts/aws/UID_CloudFormation.template.yml | 1 + scripts/azure-cc/deployment/operator.json | 8 ++++++++ scripts/azure-cc/deployment/operator.parameters.json | 2 +- scripts/gcp-oidc/terraform/main.tf | 10 +++++----- scripts/gcp-oidc/terraform/variables.tf | 2 +- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/scripts/aws/UID_CloudFormation.template.yml b/scripts/aws/UID_CloudFormation.template.yml index 720dec8f2..5ef1fe5b3 100644 --- a/scripts/aws/UID_CloudFormation.template.yml +++ b/scripts/aws/UID_CloudFormation.template.yml @@ -1,3 +1,4 @@ + AWSTemplateFormatVersion: 2010-09-09 Description: UID 2.0 CloudFormation template Parameters: diff --git a/scripts/azure-cc/deployment/operator.json b/scripts/azure-cc/deployment/operator.json index 60cf08d11..d115e825c 100644 --- a/scripts/azure-cc/deployment/operator.json +++ b/scripts/azure-cc/deployment/operator.json @@ -140,6 +140,14 @@ { "name": "SKIP_VALIDATIONS", "value": "[parameters('skipValidations')]" + }, + { + "name": "service_instances", + "value": "6" + }, + { + "name": "default_worker_pool_thread_count", + "value": "6" } ] } diff --git a/scripts/azure-cc/deployment/operator.parameters.json b/scripts/azure-cc/deployment/operator.parameters.json index 5095746ea..a4a9e43a7 100644 --- a/scripts/azure-cc/deployment/operator.parameters.json +++ b/scripts/azure-cc/deployment/operator.parameters.json @@ -18,7 +18,7 @@ "value": "operator-key" }, "count": { - "value": 2 + "value": 1 }, "deploymentEnvironment": { "value": "integ" diff --git a/scripts/gcp-oidc/terraform/main.tf b/scripts/gcp-oidc/terraform/main.tf index f67da53ee..871298b40 100644 --- a/scripts/gcp-oidc/terraform/main.tf +++ b/scripts/gcp-oidc/terraform/main.tf @@ -94,7 +94,7 @@ module "secret-manager" { resource "google_compute_instance_template" "uid_operator" { depends_on = [module.project_services] name_prefix = "uid-operator-cs-template-" - machine_type = var.uid_deployment_env == "prod" ? "n2d-standard-16" : "n2d-standard-2" + machine_type = var.uid_deployment_env == "prod" ? "n2d-standard-16" : "n2d-standard-8" tags = [var.network_name] @@ -107,10 +107,10 @@ resource "google_compute_instance_template" "uid_operator" { tee-image-reference = var.uid_operator_image tee-container-log-redirect = true tee-restart-policy = "Never" - tee-env-DEPLOYMENT_ENVIRONMENT = var.uid_deployment_env - tee-env-API_TOKEN_SECRET_NAME = module.secret-manager.secret_versions[0] - tee-env-CORE_BASE_URL = var.uid_deployment_env == "integ" ? "https://core-integ.uidapi.com" : "https://core-prod.uidapi.com" - tee-env-OPTOUT_BASE_URL = var.uid_deployment_env == "integ" ? "https://optout-integ.uidapi.com" : "https://optout-prod.uidapi.com" + tee-env-DEPLOYMENT_ENVIRONMENT = var.uid_deployment_env + tee-env-API_TOKEN_SECRET_NAME = module.secret-manager.secret_versions[0] + tee-env-CORE_BASE_URL = var.uid_deployment_env == "integ" ? "https://core-integ.uidapi.com" : "https://core-prod.uidapi.com" + tee-env-OPTOUT_BASE_URL = var.uid_deployment_env == "integ" ? "https://optout-integ.uidapi.com" : "https://optout-prod.uidapi.com" }, var.uid_deployment_env != "prod" ? { tee-env-DEBUG_MODE = var.debug_mode diff --git a/scripts/gcp-oidc/terraform/variables.tf b/scripts/gcp-oidc/terraform/variables.tf index 92cf5570f..2cf0be095 100644 --- a/scripts/gcp-oidc/terraform/variables.tf +++ b/scripts/gcp-oidc/terraform/variables.tf @@ -40,7 +40,7 @@ variable "uid_operator_key_secret_name" { variable "max_replicas" { type = number - default = 5 + default = 1 } variable "min_replicas" { From 7306dcf8c2334969ee3c9a1987738b2615c64f3a Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Sun, 15 Mar 2026 23:15:56 +0000 Subject: [PATCH 5/9] [CI Pipeline] Released Snapshot version: 5.68.5-alpha-698-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7eadd1b23..3b6276f16 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.68.4 + 5.68.5-alpha-698-SNAPSHOT UTF-8 From e15512cae636d4886f7b23defe1178a2938330fb Mon Sep 17 00:00:00 2001 From: sophia chen Date: Mon, 16 Mar 2026 12:14:12 +1100 Subject: [PATCH 6/9] updated workflow ref --- .github/workflows/run-e2e-tests-on-operator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-e2e-tests-on-operator.yaml b/.github/workflows/run-e2e-tests-on-operator.yaml index 462a992e1..155fd2161 100644 --- a/.github/workflows/run-e2e-tests-on-operator.yaml +++ b/.github/workflows/run-e2e-tests-on-operator.yaml @@ -117,7 +117,7 @@ on: jobs: e2e-test: name: E2E Test - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v3 + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@sch-UID2-6632-load-test-private-operator with: operator_type: ${{ inputs.operator_type }} identity_scope: ${{ inputs.identity_scope }} From 3d4aa2e9a3bc8a79635ec50c77e93f1e8dd8dd35 Mon Sep 17 00:00:00 2001 From: sophia chen Date: Mon, 16 Mar 2026 14:00:27 +1100 Subject: [PATCH 7/9] allowed new instance var --- scripts/gcp-oidc/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gcp-oidc/Dockerfile b/scripts/gcp-oidc/Dockerfile index 7bc63c787..9669416c1 100644 --- a/scripts/gcp-oidc/Dockerfile +++ b/scripts/gcp-oidc/Dockerfile @@ -1,7 +1,7 @@ # sha from https://hub.docker.com/layers/library/eclipse-temurin/21-jre-alpine-3.23/images/sha256-693c22ea458d62395bac47a2da405d0d18c77b205211ceec4846a550a37684b6 FROM eclipse-temurin@sha256:693c22ea458d62395bac47a2da405d0d18c77b205211ceec4846a550a37684b6 -LABEL "tee.launch_policy.allow_env_override"="API_TOKEN_SECRET_NAME,DEPLOYMENT_ENVIRONMENT,CORE_BASE_URL,OPTOUT_BASE_URL,DEBUG_MODE,SKIP_VALIDATIONS" +LABEL "tee.launch_policy.allow_env_override"="API_TOKEN_SECRET_NAME,DEPLOYMENT_ENVIRONMENT,CORE_BASE_URL,OPTOUT_BASE_URL,DEBUG_MODE,SKIP_VALIDATIONS,service_instances,default_worker_pool_thread_count" LABEL "tee.launch_policy.log_redirect"="always" # Install Packages From 9626349788b576140f0a69c89b495933076dec1a Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Mon, 16 Mar 2026 03:02:34 +0000 Subject: [PATCH 8/9] [CI Pipeline] Released Snapshot version: 5.68.6-alpha-226-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b6276f16..28030d9c3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.68.5-alpha-698-SNAPSHOT + 5.68.6-alpha-226-SNAPSHOT UTF-8 From 7f8ef0d538fbd7371a937165be415f0eb9ecd1ab Mon Sep 17 00:00:00 2001 From: sophia chen Date: Wed, 18 Mar 2026 11:52:15 +1100 Subject: [PATCH 9/9] clean up --- .github/workflows/run-e2e-tests-on-operator.yaml | 2 +- scripts/aws/UID_CloudFormation.template.yml | 1 - scripts/azure-cc/deployment/operator.json | 8 -------- scripts/azure-cc/deployment/operator.parameters.json | 2 +- scripts/gcp-oidc/Dockerfile | 2 +- scripts/gcp-oidc/terraform/main.tf | 10 +++++----- scripts/gcp-oidc/terraform/variables.tf | 2 +- 7 files changed, 9 insertions(+), 18 deletions(-) diff --git a/.github/workflows/run-e2e-tests-on-operator.yaml b/.github/workflows/run-e2e-tests-on-operator.yaml index 155fd2161..462a992e1 100644 --- a/.github/workflows/run-e2e-tests-on-operator.yaml +++ b/.github/workflows/run-e2e-tests-on-operator.yaml @@ -117,7 +117,7 @@ on: jobs: e2e-test: name: E2E Test - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@sch-UID2-6632-load-test-private-operator + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v3 with: operator_type: ${{ inputs.operator_type }} identity_scope: ${{ inputs.identity_scope }} diff --git a/scripts/aws/UID_CloudFormation.template.yml b/scripts/aws/UID_CloudFormation.template.yml index 5ef1fe5b3..720dec8f2 100644 --- a/scripts/aws/UID_CloudFormation.template.yml +++ b/scripts/aws/UID_CloudFormation.template.yml @@ -1,4 +1,3 @@ - AWSTemplateFormatVersion: 2010-09-09 Description: UID 2.0 CloudFormation template Parameters: diff --git a/scripts/azure-cc/deployment/operator.json b/scripts/azure-cc/deployment/operator.json index d115e825c..60cf08d11 100644 --- a/scripts/azure-cc/deployment/operator.json +++ b/scripts/azure-cc/deployment/operator.json @@ -140,14 +140,6 @@ { "name": "SKIP_VALIDATIONS", "value": "[parameters('skipValidations')]" - }, - { - "name": "service_instances", - "value": "6" - }, - { - "name": "default_worker_pool_thread_count", - "value": "6" } ] } diff --git a/scripts/azure-cc/deployment/operator.parameters.json b/scripts/azure-cc/deployment/operator.parameters.json index a4a9e43a7..5095746ea 100644 --- a/scripts/azure-cc/deployment/operator.parameters.json +++ b/scripts/azure-cc/deployment/operator.parameters.json @@ -18,7 +18,7 @@ "value": "operator-key" }, "count": { - "value": 1 + "value": 2 }, "deploymentEnvironment": { "value": "integ" diff --git a/scripts/gcp-oidc/Dockerfile b/scripts/gcp-oidc/Dockerfile index 9669416c1..7bc63c787 100644 --- a/scripts/gcp-oidc/Dockerfile +++ b/scripts/gcp-oidc/Dockerfile @@ -1,7 +1,7 @@ # sha from https://hub.docker.com/layers/library/eclipse-temurin/21-jre-alpine-3.23/images/sha256-693c22ea458d62395bac47a2da405d0d18c77b205211ceec4846a550a37684b6 FROM eclipse-temurin@sha256:693c22ea458d62395bac47a2da405d0d18c77b205211ceec4846a550a37684b6 -LABEL "tee.launch_policy.allow_env_override"="API_TOKEN_SECRET_NAME,DEPLOYMENT_ENVIRONMENT,CORE_BASE_URL,OPTOUT_BASE_URL,DEBUG_MODE,SKIP_VALIDATIONS,service_instances,default_worker_pool_thread_count" +LABEL "tee.launch_policy.allow_env_override"="API_TOKEN_SECRET_NAME,DEPLOYMENT_ENVIRONMENT,CORE_BASE_URL,OPTOUT_BASE_URL,DEBUG_MODE,SKIP_VALIDATIONS" LABEL "tee.launch_policy.log_redirect"="always" # Install Packages diff --git a/scripts/gcp-oidc/terraform/main.tf b/scripts/gcp-oidc/terraform/main.tf index 871298b40..f67da53ee 100644 --- a/scripts/gcp-oidc/terraform/main.tf +++ b/scripts/gcp-oidc/terraform/main.tf @@ -94,7 +94,7 @@ module "secret-manager" { resource "google_compute_instance_template" "uid_operator" { depends_on = [module.project_services] name_prefix = "uid-operator-cs-template-" - machine_type = var.uid_deployment_env == "prod" ? "n2d-standard-16" : "n2d-standard-8" + machine_type = var.uid_deployment_env == "prod" ? "n2d-standard-16" : "n2d-standard-2" tags = [var.network_name] @@ -107,10 +107,10 @@ resource "google_compute_instance_template" "uid_operator" { tee-image-reference = var.uid_operator_image tee-container-log-redirect = true tee-restart-policy = "Never" - tee-env-DEPLOYMENT_ENVIRONMENT = var.uid_deployment_env - tee-env-API_TOKEN_SECRET_NAME = module.secret-manager.secret_versions[0] - tee-env-CORE_BASE_URL = var.uid_deployment_env == "integ" ? "https://core-integ.uidapi.com" : "https://core-prod.uidapi.com" - tee-env-OPTOUT_BASE_URL = var.uid_deployment_env == "integ" ? "https://optout-integ.uidapi.com" : "https://optout-prod.uidapi.com" + tee-env-DEPLOYMENT_ENVIRONMENT = var.uid_deployment_env + tee-env-API_TOKEN_SECRET_NAME = module.secret-manager.secret_versions[0] + tee-env-CORE_BASE_URL = var.uid_deployment_env == "integ" ? "https://core-integ.uidapi.com" : "https://core-prod.uidapi.com" + tee-env-OPTOUT_BASE_URL = var.uid_deployment_env == "integ" ? "https://optout-integ.uidapi.com" : "https://optout-prod.uidapi.com" }, var.uid_deployment_env != "prod" ? { tee-env-DEBUG_MODE = var.debug_mode diff --git a/scripts/gcp-oidc/terraform/variables.tf b/scripts/gcp-oidc/terraform/variables.tf index 2cf0be095..92cf5570f 100644 --- a/scripts/gcp-oidc/terraform/variables.tf +++ b/scripts/gcp-oidc/terraform/variables.tf @@ -40,7 +40,7 @@ variable "uid_operator_key_secret_name" { variable "max_replicas" { type = number - default = 1 + default = 5 } variable "min_replicas" {