remove everything related to AZ

Author: pabloDeputter

sentry_sdk/consts.py

@@ -453,12 +453,6 @@ class SPANDATA:
     Example: "123456789012"
     """
 
-    CLOUD_AVAILABILITY_ZONE = "cloud.availability_zone"
-    """
-    Cloud regions often have multiple, isolated locations known as zones to increase availability
-    Example: "us-east-1c"
-    """
-
     CLOUD_PLATFORM = "cloud.platform"
     """
     The cloud platform in use.

sentry_sdk/integrations/aws_lambda/_handler.py

@@ -9,7 +9,6 @@
 from sentry_sdk.data_collection import _apply_key_value_collection_filtering
 from sentry_sdk.integrations._wsgi_common import _filter_headers
 from sentry_sdk.integrations.aws_lambda import AwsLambdaIntegration
-from sentry_sdk.integrations.aws_lambda._metadata import _get_availability_zone
 from sentry_sdk.integrations.aws_lambda._request import (
     _get_user_from_event,
     _make_request_event_processor,
@@ -187,12 +186,6 @@ def sentry_handler(
                     }
                 )
 
-            if "AWS_LAMBDA_METADATA_API" in environ:
-                with capture_internal_exceptions():
-                    availability_zone = _get_availability_zone()
-                    if availability_zone is not None:
-                        attributes[SPANDATA.CLOUD_AVAILABILITY_ZONE] = availability_zone
-
             sentry_sdk.continue_trace(headers)
             Scope.set_custom_sampling_context(sampling_context)
             with sentry_sdk.start_span(

sentry_sdk/integrations/aws_lambda/_metadata.py

@@ -4,5 +4,3 @@
 CLOUD_PROVIDER = "aws"
 CLOUD_PLATFORM = "aws_lambda"
 LATEST_FUNCTION_VERSION = "$LATEST"
-
-LAMBDA_METADATA_PATH = "/2026-01-15/metadata/execution-environment"

sentry_sdk/integrations/aws_lambda/consts.py

@@ -3,13 +3,6 @@
 import sentry_sdk
 from sentry_sdk.integrations.aws_lambda import AwsLambdaIntegration
 
-# otherwise SAM will call its built-in metadata endpoint/token.
-os.environ["AWS_LAMBDA_METADATA_API"] = os.environ[
-    "SENTRY_TEST_AWS_LAMBDA_METADATA_API"
-]
-os.environ["AWS_LAMBDA_METADATA_TOKEN"] = os.environ[
-    "SENTRY_TEST_AWS_LAMBDA_METADATA_TOKEN"
-]
 # the alias is only in the name to get a qualified invoked ARN.
 os.environ["AWS_LAMBDA_FUNCTION_NAME"] = os.environ["AWS_LAMBDA_FUNCTION_NAME"].split(
     ":"

tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollection/index.py

@@ -941,26 +941,6 @@ def test_url_query_params_with_data_collection(lambda_client, test_environment):
         _get_span_attr(attrs, SPANDATA.URL_QUERY)
         == "page=2&tracking=%5BFiltered%5D&token=%5BFiltered%5D"
     )
-    assert _get_span_attr(attrs, SPANDATA.CLOUD_AVAILABILITY_ZONE) == "use1-az1"
-    # The container may already be warm (and the metadata cached) from an earlier
-    # test invoking the same function, so only assert that the second invocation
-    # is served from the cache.
-    metadata_requests = server.lambda_metadata_requests
-    assert metadata_requests >= 1
-
-    server.clear_envelopes()
-    lambda_client.invoke(
-        FunctionName="BasicOkSpanStreamingDataCollection",
-        Payload=json.dumps(payload),
-    )
-    segment_spans = [s for s in server.span_items if s["is_segment"]]
-
-    assert len(segment_spans) == 1
-    assert (
-        _get_span_attr(segment_spans[0]["attributes"], SPANDATA.CLOUD_AVAILABILITY_ZONE)
-        == "use1-az1"
-    )
-    assert server.lambda_metadata_requests == metadata_requests
 
 
 def test_user_info_with_data_collection_user_info_off(lambda_client, test_environment):

tests/integrations/aws_lambda/test_aws_lambda.py

@@ -17,17 +17,14 @@
 )
 from constructs import Construct
 from fastapi import FastAPI, Request
-from fastapi.responses import JSONResponse
 
 from scripts.build_aws_lambda_layer import DIST_PATH, build_packaged_zip
-from sentry_sdk.integrations.aws_lambda.consts import LAMBDA_METADATA_PATH
 
 LAMBDA_FUNCTION_DIR = "./tests/integrations/aws_lambda/lambda_functions/"
 LAMBDA_FUNCTION_WITH_EMBEDDED_SDK_DIR = (
     "./tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/"
 )
 LAMBDA_FUNCTION_TIMEOUT = 10
-LAMBDA_METADATA_TOKEN = "test-token"
 SAM_PORT = 3001
 
 # functions invoked through a published version or an alias instead of `$LATEST`:
@@ -176,20 +173,6 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
             )
 
             environment = {"SENTRY_DSN": dsn}
-            if lambda_dir == "BasicOkSpanStreamingDataCollection":
-                # AWS exposes these env. vars when the metadata endpoint
-                # (`2026-01-15/metadata/execution-environment`) is available.
-                # We set et them only on the function that exercises `cloud.availability_zone`.
-                environment.update(
-                    {
-                        "SENTRY_TEST_AWS_LAMBDA_METADATA_API": (
-                            f"{get_host_ip()}:9999"
-                        ),
-                        "SENTRY_TEST_AWS_LAMBDA_METADATA_TOKEN": (
-                            LAMBDA_METADATA_TOKEN
-                        ),
-                    }
-                )
             if lambda_dir in QUALIFIED_FUNCTIONS:
                 qualifier, function_version = QUALIFIED_FUNCTIONS[lambda_dir]
                 # SAM builds the invoked ARN from `AWS_LAMBDA_FUNCTION_NAME`,
@@ -258,7 +241,6 @@ class SentryServerForTesting:
     def __init__(self, host="0.0.0.0", port=9999, log_level="warning"):
         self.envelopes = []
         self.span_items = []
-        self.lambda_metadata_requests = 0
         self.host = host
         self.port = port
         self.log_level = log_level
@@ -306,26 +288,6 @@ async def envelope(request: Request):
 
             return {"status": "ok"}
 
-        @self.app.get(LAMBDA_METADATA_PATH)
-        async def lambda_metadata(request: Request):
-            """
-            Mirrors the Lambda execution-environment metadata endpoint
-            (`2026-01-15/metadata/execution-environment`) used to collect
-            `AvailabilityZoneID`, including its cache lifetime.
-            https://docs.aws.amazon.com/lambda/latest/dg/configuration-metadata-endpoint.html
-            """
-            self.lambda_metadata_requests += 1
-
-            if request.headers.get("Authorization") != (
-                f"Bearer {LAMBDA_METADATA_TOKEN}"
-            ):
-                return JSONResponse({"message": "Unauthorized"}, status_code=401)
-
-            return JSONResponse(
-                {"AvailabilityZoneID": "use1-az1"},
-                headers={"Cache-Control": "private, max-age=43200, immutable"},
-            )
-
     def run_server(self):
         uvicorn.run(self.app, host=self.host, port=self.port, log_level=self.log_level)