Merge branch '2.11' into revert-10702-backport-10681-to-2.11

.gitlab-ci.yml

@@ -68,7 +68,14 @@ onboarding_tests_installer:
 onboarding_tests_k8s_injection:
   parallel:
     matrix:
-      - WEBLOG_VARIANT: [dd-lib-python-init-test-django, dd-lib-python-init-test-django-gunicorn, dd-lib-python-init-test-django-uvicorn]
+      - WEBLOG_VARIANT:
+          - dd-lib-python-init-test-django
+          - dd-lib-python-init-test-django-gunicorn
+          - dd-lib-python-init-test-django-gunicorn-alpine
+          - dd-lib-python-init-test-django-preinstalled
+          - dd-lib-python-init-test-django-unsupported-package-force
+          - dd-lib-python-init-test-django-uvicorn
+          - dd-lib-python-init-test-protobuf-old
 
 deploy_to_di_backend:manual:
   stage: shared-pipeline

ddtrace/internal/datadog/profiling/ddup/_ddup.pyx

@@ -168,9 +168,16 @@ def upload() -> None:
     processor = ddtrace.tracer._endpoint_call_counter_span_processor
     endpoint_counts, endpoint_to_span_ids = processor.reset()
 
+    # We want to make sure that the endpoint_bytes strings outlive the for loops
+    # below and prevent them to be GC'ed. We do this by storing them in a list.
+    # This is necessary because we pass string_views to the C++ code, which is
+    # a view into the original string. If the original string is GC'ed, the view
+    # will point to garbage.
+    endpoint_bytes_list = []
     cdef map[int64_t, string_view] span_ids_to_endpoints = map[int64_t, string_view]()
     for endpoint, span_ids in endpoint_to_span_ids.items():
         endpoint_bytes = ensure_binary_or_empty(endpoint)
+        endpoint_bytes_list.append(endpoint_bytes)
         for span_id in span_ids:
             span_ids_to_endpoints.insert(
                 pair[int64_t, string_view](
@@ -183,6 +190,7 @@ def upload() -> None:
     cdef map[string_view, int64_t] trace_endpoints_to_counts = map[string_view, int64_t]()
     for endpoint, cnt in endpoint_counts.items():
         endpoint_bytes = ensure_binary_or_empty(endpoint)
+        endpoint_bytes_list.append(endpoint_bytes)
         trace_endpoints_to_counts.insert(pair[string_view, int64_t](
             string_view(<const char*>endpoint_bytes, len(endpoint_bytes)),
             clamp_to_int64_unsigned(cnt)

tests/.suitespec.json

@@ -23,17 +23,7 @@
             "tests/subprocesstest.py",
             "tests/wait-for-services.py",
             "tests/webclient.py",
-            "tests/test_module/*",
-            "tests/lib-injection/dd-lib-python-init-test-django/*",
-            "tests/lib-injection/dd-lib-python-init-test-django-gunicorn/*",
-            "tests/lib-injection/dd-lib-python-init-test-django-gunicorn-alpine/*",
-            "tests/lib-injection/dd-lib-python-init-test-django-no-perms/*",
-            "tests/lib-injection/dd-lib-python-init-test-django-pre-installed/*",
-            "tests/lib-injection/dd-lib-python-init-test-django-unsupported-python/*",
-            "tests/lib-injection/dd-lib-python-init-test-django-unsupported-package/*",
-            "tests/lib-injection/dd-lib-python-init-test-django-unsupported-package-force/*",
-            "tests/lib-injection/dd-lib-python-init-test-django-uvicorn/*",
-            "tests/lib-injection/dd-lib-python-init-test-protobuf-old/*"
+            "tests/test_module/*"
         ],
         "core": [
             "ddtrace/internal/__init__.py",