Update to reflect expected behavior

Author: NoahStapp

pymongo/pool_options.py

@@ -179,39 +179,37 @@ def _getenv_int(key: str) -> Optional[int]:
 def _metadata_env() -> dict[str, Any]:
     env: dict[str, Any] = {}
     container = get_container_env_info()
-    # Don't populate FaaS metadata if a container is present.
     if container:
         env["container"] = container
-    else:
-        # Skip if multiple (or no) envs are matched.
-        if (_is_lambda(), _is_azure_func(), _is_gcp_func(), _is_vercel()).count(True) != 1:
-            return env
-        if _is_lambda():
-            env["name"] = "aws.lambda"
-            region = os.getenv("AWS_REGION")
-            if region:
-                env["region"] = region
-            memory_mb = _getenv_int("AWS_LAMBDA_FUNCTION_MEMORY_SIZE")
-            if memory_mb is not None:
-                env["memory_mb"] = memory_mb
-        elif _is_azure_func():
-            env["name"] = "azure.func"
-        elif _is_gcp_func():
-            env["name"] = "gcp.func"
-            region = os.getenv("FUNCTION_REGION")
-            if region:
-                env["region"] = region
-            memory_mb = _getenv_int("FUNCTION_MEMORY_MB")
-            if memory_mb is not None:
-                env["memory_mb"] = memory_mb
-            timeout_sec = _getenv_int("FUNCTION_TIMEOUT_SEC")
-            if timeout_sec is not None:
-                env["timeout_sec"] = timeout_sec
-        elif _is_vercel():
-            env["name"] = "vercel"
-            region = os.getenv("VERCEL_REGION")
-            if region:
-                env["region"] = region
+    # Skip if multiple (or no) envs are matched.
+    if (_is_lambda(), _is_azure_func(), _is_gcp_func(), _is_vercel()).count(True) != 1:
+        return env
+    if _is_lambda():
+        env["name"] = "aws.lambda"
+        region = os.getenv("AWS_REGION")
+        if region:
+            env["region"] = region
+        memory_mb = _getenv_int("AWS_LAMBDA_FUNCTION_MEMORY_SIZE")
+        if memory_mb is not None:
+            env["memory_mb"] = memory_mb
+    elif _is_azure_func():
+        env["name"] = "azure.func"
+    elif _is_gcp_func():
+        env["name"] = "gcp.func"
+        region = os.getenv("FUNCTION_REGION")
+        if region:
+            env["region"] = region
+        memory_mb = _getenv_int("FUNCTION_MEMORY_MB")
+        if memory_mb is not None:
+            env["memory_mb"] = memory_mb
+        timeout_sec = _getenv_int("FUNCTION_TIMEOUT_SEC")
+        if timeout_sec is not None:
+            env["timeout_sec"] = timeout_sec
+    elif _is_vercel():
+        env["name"] = "vercel"
+        region = os.getenv("VERCEL_REGION")
+        if region:
+            env["region"] = region
     return env
 
 

test/asynchronous/test_client.py

@@ -2020,15 +2020,19 @@ async def test_handshake_08_invalid_aws_ec2(self):
         )
 
     async def test_handshake_09_container_with_provider(self):
-        # No FaaS metadata should be present.
         await self._test_handshake(
             {
                 ENV_VAR_K8S: "1",
                 "AWS_LAMBDA_RUNTIME_API": "1",
                 "AWS_REGION": "us-east-1",
                 "AWS_LAMBDA_FUNCTION_MEMORY_SIZE": "256",
             },
-            {"container": {"orchestrator": "kubernetes"}},
+            {
+                "container": {"orchestrator": "kubernetes"},
+                "name": "aws.lambda",
+                "region": "us-east-1",
+                "memory_mb": 256,
+            },
         )
 
     def test_dict_hints(self):

test/test_client.py

@@ -1978,15 +1978,19 @@ def test_handshake_08_invalid_aws_ec2(self):
         )
 
     def test_handshake_09_container_with_provider(self):
-        # No FaaS metadata should be present.
         self._test_handshake(
             {
                 ENV_VAR_K8S: "1",
                 "AWS_LAMBDA_RUNTIME_API": "1",
                 "AWS_REGION": "us-east-1",
                 "AWS_LAMBDA_FUNCTION_MEMORY_SIZE": "256",
             },
-            {"container": {"orchestrator": "kubernetes"}},
+            {
+                "container": {"orchestrator": "kubernetes"},
+                "name": "aws.lambda",
+                "region": "us-east-1",
+                "memory_mb": 256,
+            },
         )
 
     def test_dict_hints(self):