Release 3.7.0 (2024-05-13)

### Features * Add the CPU affinity lib for inference ### Bug Fixes * Cap debug reporting URL * Fix the recency value passed to generateBid and scoreAds * make aws-image-tag optional * remove unitOverride in gcp seller dashboard terraform * replace ABSL_LOG with PS_LOG in reactors * update empty device signals to be an object, not string Bug: 340281159 GitOrigin-RevId: 64cb08b38dcb7b2f18000e626140c2376296ab40 Change-Id: I9ac2d2fa772cbb761afaf1f01cc5b8b86fe1554e
privacysandbox · May 14, 2024 · fa6b006 · fa6b006
1 parent 1c32ad4
commit fa6b006
Show file tree

Hide file tree

Showing 49 changed files with 865 additions and 258 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## 3.7.0 (2024-05-13)
+
+
+### Features
+
+* Add the CPU affinity lib for inference
+
+
+### Bug Fixes
+
+* Cap debug reporting URL
+* Fix the recency value passed to generateBid and scoreAds
+* make aws-image-tag optional
+* remove unitOverride in gcp seller dashboard terraform
+* replace ABSL_LOG with PS_LOG in reactors
+* update empty device signals to be an object, not string
+
 ## 3.6.0 (2024-05-01)
 
 

diff --git a/WORKSPACE b/WORKSPACE
@@ -23,11 +23,11 @@ http_archive(
 
 http_archive(
     name = "google_privacysandbox_servers_common",
-    # 2024-04-19
-    sha256 = "ac5dd014d81cdc76e86cdaf8b584d5ee8494453315dc986860eb1e60f424a668",
-    strip_prefix = "data-plane-shared-libraries-4b1e6744cf3e46efee0cf29d886b22fe93274c79",
+    # 2024-05-06
+    sha256 = "1b0d52c6218fa4db7f4760a7e197c2e656a1408549fee40cdea2cb7496a3f836",
+    strip_prefix = "data-plane-shared-libraries-10be592dd582044a79172d4c0530ce8b7ac39ae4",
     urls = [
-        "https://github.com/privacysandbox/data-plane-shared-libraries/archive/4b1e6744cf3e46efee0cf29d886b22fe93274c79.zip",
+        "https://github.com/privacysandbox/data-plane-shared-libraries/archive/10be592dd582044a79172d4c0530ce8b7ac39ae4.zip",
     ],
 )
 

diff --git a/api/bidding_auction_servers.proto b/api/bidding_auction_servers.proto
@@ -179,6 +179,14 @@ message BrowserSignals {
   // that occurred in the last 30 days. The time is specified in seconds
   // before the containing auctionBlob was requested.
   string prev_wins = 4;
+
+  // The most recent join time for this group expressed in milli seconds
+  // before the containing auctionBlob was requested. This field will be used
+  // by newer client versions. For older devices, the precison will be in seconds.
+  // If recency_ms is present, this value will be used to offer higher precision.
+  // If not, recency will be used.
+  // Only one of the recency or recency_ms is expected to present in the request.
+  optional int64 recency_ms = 5;
 }
 
 // Information passed by Android.
@@ -606,17 +614,6 @@ message SelectAdResponse {
   string key_id = 3;
 }
 
-// Context useful for logging and debugging requests.
-message LogContext {
-  // UUID for the request (as originating from client).
-  string generation_id = 1;
-
-  // Adtech debug id that can be used for correlating the request with the
-  // adtech. This will contain `buyer_debug_id` when used in context of buyer
-  // services and `seller_debug_id` when used in context of seller services.
-  string adtech_debug_id = 2;
-}
-
 // Buyer's FrontEnd service.
 service BuyerFrontEnd {
   // Returns bids for each Interest Group / Custom Audience.
@@ -679,7 +676,7 @@ message GetBidsRequest {
     bool enable_debug_reporting = 7;
 
     // Helpful context for logging and tracing the request.
-    LogContext log_context = 8;
+    server_common.LogContext log_context = 8;
 
     // Consented debugging field.
     server_common.ConsentedDebugConfiguration consented_debug_config = 9;
@@ -890,7 +887,7 @@ message GenerateBidsRequest {
     string publisher_name = 7;
 
     // Helpful context for logging and tracing the request.
-    LogContext log_context = 8;
+    server_common.LogContext log_context = 8;
 
     // Consented debugging field.
     server_common.ConsentedDebugConfiguration consented_debug_config = 9;
@@ -963,7 +960,7 @@ message GenerateProtectedAppSignalsBidsRequest {
     string publisher_name = 5;
 
     // Helpful context for logging and tracing the request.
-    LogContext log_context = 6;
+    server_common.LogContext log_context = 6;
 
     // Consented debugging field.
     server_common.ConsentedDebugConfiguration consented_debug_config = 7;
@@ -1167,7 +1164,7 @@ message ScoreAdsRequest {
     bool enable_debug_reporting = 6;
 
     // Helpful context for logging and tracing the request.
-    LogContext log_context = 7;
+    server_common.LogContext log_context = 7;
 
     // Map of buyer_origin to buyer_signals required as input for event level
     // reporting url generation for the winning buyer.

diff --git a/production/deploy/gcp/terraform/services/dashboards/seller_dashboard/main.tf b/production/deploy/gcp/terraform/services/dashboards/seller_dashboard/main.tf
@@ -1199,8 +1199,7 @@ resource "google_monitoring_dashboard" "environment_dashboard" {
                 "plotType": "LINE",
                 "targetAxis": "Y1",
                 "timeSeriesQuery": {
-                  "timeSeriesQueryLanguage": "fetch generic_task\n| { metric 'workload.googleapis.com/sfe.initiated_request.to_bfe.duration_ms'\n  ; metric 'workload.googleapis.com/sfe.initiated_request.to_bfe.count' }\n| filter (metric.deployment_environment == '${var.environment}')\n| group_by\n    [metric.buyer, metric.service_name, metric.deployment_environment,\n     metric.operator, metric.Noise, resource.task_id, metric.service_version]\n| align rate(1m)\n| outer_join 0\n| div",
-                  "unitOverride": ""
+                  "timeSeriesQueryLanguage": "fetch generic_task\n| { metric 'workload.googleapis.com/sfe.initiated_request.to_bfe.duration_ms'\n  ; metric 'workload.googleapis.com/sfe.initiated_request.to_bfe.count' }\n| filter (metric.deployment_environment == '${var.environment}')\n| group_by\n    [metric.buyer, metric.service_name, metric.deployment_environment,\n     metric.operator, metric.Noise, resource.task_id, metric.service_version]\n| align rate(1m)\n| outer_join 0\n| div"
                 }
               }
             ],

diff --git a/production/packaging/aws/auction_service/BUILD b/production/packaging/aws/auction_service/BUILD
@@ -22,6 +22,7 @@ load(
     "@rules_pkg//pkg:mappings.bzl",
     "pkg_attributes",
     "pkg_files",
+    "pkg_mklink",
 )
 load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
 load("@rules_pkg//pkg:zip.bzl", "pkg_zip")
@@ -36,17 +37,16 @@ pkg_files(
     prefix = "/",
 )
 
-pkg_files(
-    name = "kmstool_enclave_executable",
-    srcs = [
-        "@google_privacysandbox_servers_common//src/cpio/client_providers/kms_client_provider/aws:kms_cli",
-    ],
-    attributes = pkg_attributes(mode = "0555"),
-    prefix = "/",
+# Create a symlink between where kmstool_enclave_cli expects shell to be
+# (/bin/sh) and where it actually is on our image (/busybox/sh).
+pkg_mklink(
+    name = "busybox_sh_symlink",
+    link_name = "/bin/sh",
+    target = "/busybox/sh",
 )
 
 server_binaries = [
-    ":kmstool_enclave_executable",
+    ":busybox_sh_symlink",
     ":server_executables",
 ]
 
@@ -68,35 +68,6 @@ container_layer(
     ],
 )
 
-# Ensure libnsm ends up in the load path.
-pkg_tar(
-    name = "libnsm-tar",
-    srcs = [
-        "@google_privacysandbox_servers_common//src/cpio/client_providers/kms_client_provider/aws:libnsm_so",
-    ],
-    mode = "0644",
-    # TODO(b/294113069): Remove arch-specific path.
-    package_dir = "/lib/x86_64-linux-gnu/",
-    visibility = ["//visibility:public"],
-)
-
-# Create a symlink between where kmstool_enclave_cli expects shell to be
-# (/bin/sh) and where it actually is on our image (/busybox/sh).
-container_layer(
-    name = "kmstool_enclave_cli_layer",
-    env = {
-        "GLOG_logtostderr": "1",
-        "GLOG_stderrthreshold": "0",
-        "GRPC_DNS_RESOLVER": "native",
-    },
-    symlinks = {
-        "/bin/sh": "/busybox/sh",
-    },
-    tars = [
-        ":libnsm-tar",
-    ],
-)
-
 # This image target is meant for testing running the server in an enclave using
 # aws proxy to abstract vsock communication.
 container_image(
@@ -117,14 +88,14 @@ container_image(
     env = LOG_ENV_VARS,
     layers = [
         ":server_binary_layer",
-        ":kmstool_enclave_cli_layer",
     ] + select({
         "//:e2e_build": [
         ],
         "//conditions:default": [],
     }),
     tars = [
         "@google_privacysandbox_servers_common//src/aws/proxy:libnsm_and_proxify_tar",
+        "@google_privacysandbox_servers_common//src/cpio/client_providers/kms_client_provider/aws:kms_binaries",
     ],
 )
 

diff --git a/production/packaging/aws/bidding_service/BUILD b/production/packaging/aws/bidding_service/BUILD
@@ -22,6 +22,7 @@ load(
     "@rules_pkg//pkg:mappings.bzl",
     "pkg_attributes",
     "pkg_files",
+    "pkg_mklink",
 )
 load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
 load("@rules_pkg//pkg:zip.bzl", "pkg_zip")
@@ -47,17 +48,16 @@ pkg_files(
     prefix = "/",
 )
 
-pkg_files(
-    name = "kmstool_enclave_executable",
-    srcs = [
-        "@google_privacysandbox_servers_common//src/cpio/client_providers/kms_client_provider/aws:kms_cli",
-    ],
-    attributes = pkg_attributes(mode = "0555"),
-    prefix = "/",
+# Create a symlink between where kmstool_enclave_cli expects shell to be
+# (/bin/sh) and where it actually is on our image (/busybox/sh).
+pkg_mklink(
+    name = "busybox_sh_symlink",
+    link_name = "/bin/sh",
+    target = "/busybox/sh",
 )
 
 server_binaries = [
-    ":kmstool_enclave_executable",
+    ":busybox_sh_symlink",
     ":server_executables",
 ]
 
@@ -71,30 +71,6 @@ pkg_tar(
     srcs = server_binaries,
 )
 
-# Ensure libnsm ends up in the load path.
-pkg_tar(
-    name = "libnsm-tar",
-    srcs = [
-        "@google_privacysandbox_servers_common//src/cpio/client_providers/kms_client_provider/aws:libnsm_so",
-    ],
-    mode = "0644",
-    # TODO(b/294113069): Remove arch-specific path.
-    package_dir = "/lib/x86_64-linux-gnu/",
-    visibility = ["//visibility:public"],
-)
-
-# Create a symlink between where kmstool_enclave_cli expects shell to be
-# (/bin/sh) and where it actually is on our image (/busybox/sh).
-container_layer(
-    name = "kmstool_enclave_cli_layer",
-    symlinks = {
-        "/bin/sh": "/busybox/sh",
-    },
-    tars = [
-        ":libnsm-tar",
-    ],
-)
-
 container_layer(
     name = "server_binary_layer",
     directory = "/",
@@ -128,14 +104,14 @@ container_image(
     env = LOG_ENV_VARS,
     layers = [
         ":server_binary_layer",
-        ":kmstool_enclave_cli_layer",
     ] + select({
         "//:e2e_build": [
         ],
         "//conditions:default": [],
     }),
     tars = [
         "@google_privacysandbox_servers_common//src/aws/proxy:libnsm_and_proxify_tar",
+        "@google_privacysandbox_servers_common//src/cpio/client_providers/kms_client_provider/aws:kms_binaries",
     ],
 )
 

diff --git a/production/packaging/aws/buyer_frontend_service/BUILD b/production/packaging/aws/buyer_frontend_service/BUILD
@@ -22,6 +22,7 @@ load(
     "@rules_pkg//pkg:mappings.bzl",
     "pkg_attributes",
     "pkg_files",
+    "pkg_mklink",
 )
 load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
 load("@rules_pkg//pkg:zip.bzl", "pkg_zip")
@@ -36,17 +37,16 @@ pkg_files(
     prefix = "/",
 )
 
-pkg_files(
-    name = "kmstool_enclave_executable",
-    srcs = [
-        "@google_privacysandbox_servers_common//src/cpio/client_providers/kms_client_provider/aws:kms_cli",
-    ],
-    attributes = pkg_attributes(mode = "0555"),
-    prefix = "/",
+# Create a symlink between where kmstool_enclave_cli expects shell to be
+# (/bin/sh) and where it actually is on our image (/busybox/sh).
+pkg_mklink(
+    name = "busybox_sh_symlink",
+    link_name = "/bin/sh",
+    target = "/busybox/sh",
 )
 
 server_binaries = [
-    ":kmstool_enclave_executable",
+    ":busybox_sh_symlink",
     ":server_executables",
 ]
 
@@ -60,30 +60,6 @@ pkg_tar(
     srcs = server_binaries,
 )
 
-# Ensure libnsm ends up in the load path.
-pkg_tar(
-    name = "libnsm-tar",
-    srcs = [
-        "@google_privacysandbox_servers_common//src/cpio/client_providers/kms_client_provider/aws:libnsm_so",
-    ],
-    mode = "0644",
-    # TODO(b/294113069): Remove arch-specific path.
-    package_dir = "/lib/x86_64-linux-gnu/",
-    visibility = ["//visibility:public"],
-)
-
-# Create a symlink between where kmstool_enclave_cli expects shell to be
-# (/bin/sh) and where it actually is on our image (/busybox/sh).
-container_layer(
-    name = "kmstool_enclave_cli_layer",
-    symlinks = {
-        "/bin/sh": "/busybox/sh",
-    },
-    tars = [
-        ":libnsm-tar",
-    ],
-)
-
 container_layer(
     name = "server_binary_layer",
     directory = "/",
@@ -117,14 +93,14 @@ container_image(
     env = LOG_ENV_VARS,
     layers = [
         ":server_binary_layer",
-        ":kmstool_enclave_cli_layer",
     ] + select({
         "//:e2e_build": [
         ],
         "//conditions:default": [],
     }),
     tars = [
         "@google_privacysandbox_servers_common//src/aws/proxy:libnsm_and_proxify_tar",
+        "@google_privacysandbox_servers_common//src/cpio/client_providers/kms_client_provider/aws:kms_binaries",
     ],
 )