PYTHON-4574 - FaaS detection logic mistakenly identifies EKS as AWS Lambda

Author: NoahStapp

pymongo/pool_options.py

@@ -179,37 +179,39 @@ 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
-    # 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
+    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
     return env
 
 

test/asynchronous/test_client.py

@@ -2019,6 +2019,18 @@ async def test_handshake_08_invalid_aws_ec2(self):
             None,
         )
 
+    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"}},
+        )
+
     def test_dict_hints(self):
         self.db.t.find(hint={"x": 1})
 

test/test_client.py

@@ -1977,6 +1977,18 @@ def test_handshake_08_invalid_aws_ec2(self):
             None,
         )
 
+    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"}},
+        )
+
     def test_dict_hints(self):
         self.db.t.find(hint={"x": 1})