Merge main into Lambda telemetry flush branch

Incorporate upstream Lambda v130 and instrumentation updates for FFL-3412.

Environment: Datadog workspace

Co-Authored-By: Codex GPT-6 <noreply@localhost>

Author: vjfridge

Dockerfile

@@ -42,12 +42,12 @@ RUN rm -rf \
 
 # CI Visibility paths/integrations
 RUN rm -rf \
-    ./python/lib/$runtime/site-packages/ddtrace/contrib/coverage/ \
-    ./python/lib/$runtime/site-packages/ddtrace/contrib/pytest/ \
-    ./python/lib/$runtime/site-packages/ddtrace/contrib/pytest_bdd/ \
-    ./python/lib/$runtime/site-packages/ddtrace/contrib/pytest_benchmark/ \
-    ./python/lib/$runtime/site-packages/ddtrace/contrib/selenium/ \
-    ./python/lib/$runtime/site-packages/ddtrace/contrib/unittest/ \
+    ./python/lib/$runtime/site-packages/ddtrace/contrib/internal/coverage/ \
+    ./python/lib/$runtime/site-packages/ddtrace/contrib/internal/pytest/ \
+    ./python/lib/$runtime/site-packages/ddtrace/contrib/internal/pytest_bdd/ \
+    ./python/lib/$runtime/site-packages/ddtrace/contrib/internal/pytest_benchmark/ \
+    ./python/lib/$runtime/site-packages/ddtrace/contrib/internal/selenium/ \
+    ./python/lib/$runtime/site-packages/ddtrace/contrib/internal/unittest/ \
     ./python/lib/$runtime/site-packages/ddtrace/ext/ci_visibility \
     ./python/lib/$runtime/site-packages/ddtrace/ext/test_visibility \
     ./python/lib/$runtime/site-packages/ddtrace/internal/ci_visibility \

ci/input_files/build.yaml.tpl

@@ -40,7 +40,7 @@ build-layer ({{ $runtime.name }}-{{ $runtime.arch }}):
   tags: ["arch:amd64"]
   image: registry.ddbuild.io/images/docker:20.10
   artifacts:
-    expire_in: 1 hr # Unsigned zips expire in 1 hour
+    expire_in: 1 day # Unsigned zips expire in 1 day
     paths:
       - .layers/datadog_lambda_py-{{ $runtime.arch }}-{{ $runtime.python_version }}.zip
   variables:
@@ -227,7 +227,7 @@ layer bundle:
     - build-layer ({{ .name }}-{{ .arch }})
     {{ end }}
   artifacts:
-    expire_in: 1 hr
+    expire_in: 1 day
     paths:
       - datadog_lambda_py-bundle-${CI_JOB_ID}/
     name: datadog_lambda_py-bundle-${CI_JOB_ID}

datadog_lambda/patch.py

@@ -30,7 +30,10 @@ def patch_all():
     _patch_for_integration_tests()
 
     if config.trace_enabled:
-        patch_all_dd()
+        # unittest and selenium are CI Visibility integrations. The layer strips
+        # their code and ddtrace.internal.ci_visibility, so leaving them enabled
+        # logs an import error whenever the user's code imports those modules.
+        patch_all_dd(unittest=False, selenium=False)
     else:
         _patch_http()
         _ensure_patch_requests()

datadog_lambda/version.py

@@ -1 +1 @@
-__version__ = "8.130.0.dev0"
+__version__ = "8.130.0"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datadog_lambda"
-version = "8.130.0.dev0"
+version = "8.130.0"
 description = "The Datadog AWS Lambda Library"
 authors = ["Datadog, Inc. <dev@datadoghq.com>"]
 license = "Apache-2.0"

tests/test_patch.py

@@ -94,3 +94,15 @@ def test_patch_requests_with_headers_none(self):
         self.assertEqual(r.request.headers[TraceHeader.TRACE_ID], "123")
         self.assertEqual(r.request.headers[TraceHeader.PARENT_ID], "321")
         self.assertEqual(r.request.headers[TraceHeader.SAMPLING_PRIORITY], "2")
+
+
+@patch("datadog_lambda.patch.patch_all_dd")
+@patch("datadog_lambda.patch.config")
+def test_patch_all_disables_ci_visibility_integrations(mock_config, mock_patch_all_dd):
+    from datadog_lambda.patch import patch_all
+
+    mock_config.trace_enabled = True
+    mock_config.integration_test = False
+    patch_all()
+
+    mock_patch_all_dd.assert_called_once_with(unittest=False, selenium=False)