Tweak Sentry SDK setup

Dockerfile

@@ -1,5 +1,5 @@
 # Build libdispatch for the strip binary
 FROM --platform=linux/amd64 debian:12-slim AS libdispatch-build
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
@@ -109,5 +109,8 @@
 # Expose ports
 EXPOSE 2218
 
+ARG LAUNCHPAD_VERSION_SHA
+ENV LAUNCHPAD_VERSION_SHA=$LAUNCHPAD_VERSION_SHA
+
 # Default command
 CMD ["launchpad", "serve", "--verbose"]

cloudbuild.ci.yaml

@@ -15,6 +15,7 @@ steps:
         set -euxo pipefail
         docker buildx build \
             --platform linux/amd64,linux/arm64 \
+            --build-arg LAUNCHPAD_VERSION_SHA=$COMMIT_SHA \
             -t $LOCATION-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:$COMMIT_SHA \
             --label org.opencontainers.image.revision=$COMMIT_SHA \
             --label org.opencontainers.image.version=$COMMIT_SHA \

cloudbuild.yaml

@@ -25,6 +25,7 @@ steps:
         docker buildx build \
             --push \
             --platform linux/amd64 \
+            --build-arg LAUNCHPAD_VERSION_SHA=$COMMIT_SHA \
             -t $LOCATION-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:$COMMIT_SHA \
             -t $LOCATION-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:$SHORT_SHA \
             -t $LOCATION-docker.pkg.dev/$PROJECT_ID/$REPO_NAME/image:nightly \

src/launchpad/sentry_sdk_init.py

@@ -46,13 +46,12 @@ def initialize_sentry_sdk() -> None:
         dsn=config["dsn"],
         integrations=integrations,
         send_default_pii=True,
+        # Release is the git sha
         release=config.get("release"),
-        environment=config.get("environment"),
+        # Convention is to set the Sentry environment to the region (us, de, etc).
+        environment=config["region"],
     )
 
-    if config.get("region"):
-        sentry_sdk.set_tag("sentry_region", config["region"])
-
     logger.info(f"Sentry SDK initialized for environment: {config.get('environment')}")
 
 
@@ -65,6 +64,6 @@ def get_sentry_config() -> Dict[str, Any]:
     return {
         "dsn": os.getenv("SENTRY_DSN"),
         "environment": environment.lower(),
-        "release": os.getenv("LAUNCHPAD_VERSION_SHA", "unknown"),  # TODO: auto fetch latest git commit hash
-        "region": os.getenv("SENTRY_REGION"),
+        "release": os.getenv("LAUNCHPAD_VERSION_SHA", "unknown"),
+        "region": os.getenv("SENTRY_REGION", "unknown"),
     }