Merge branch 'main' into avara1986/APPSEC-60297_reduce_flakyness_2

Author: avara1986

.github/workflows/requirements-locks.yml

@@ -180,6 +180,17 @@ requirements_json_test:
     REQUIREMENTS_BLOCK_JSON_PATH: ".gitlab/requirements_block.json"
     REQUIREMENTS_ALLOW_JSON_PATH: ".gitlab/requirements_allow.json"
 
+check_requirements_lockfiles:
+  stage: tests
+  needs: []
+  extends: .testrunner
+  script:
+    - pip install toml==0.10.2
+    - scripts/compile-and-prune-test-requirements
+    - scripts/check-diff '.riot/requirements/' 'Mismatches found between .riot/requirements/*.txt and riotfile.py. Run scripts/compile-and-prune-test-requirements and commit the result.'
+    - python scripts/requirements_to_csv.py
+    - scripts/check-diff 'requirements.csv' 'Tracer dependency requirements in requirements.csv is out of date. Run `python scripts/requirements_to_csv.py` and commit the result.'
+
 detect_circular_imports:
   stage: tests
   needs: []

.gitlab-ci.yml

@@ -29,8 +29,13 @@
 
 def _rc_callback(data: t.Sequence[Payload]):
     with shared_pid_file.lock_exclusive() as f:
+        if (pid := str(os.getpid())) not in (pids := set(shared_pid_file.peekall_unlocked(f))):
+            # Store the PID of the current process so that we know which processes
+            # have Symbol DB enabled.
+            shared_pid_file.put_unlocked(f, pid)
+
         if (get_ancestor_runtime_id() is not None and has_forked()) or len(
-            set(shared_pid_file.peekall_unlocked(f))
+            pids - {pid, str(os.getppid())}
         ) >= MAX_CHILD_UPLOADERS:
             log.debug("[PID %d] SymDB: Disabling Symbol DB in child process", os.getpid())
             # We assume that forking is being used for spawning child worker
@@ -44,10 +49,6 @@ def _rc_callback(data: t.Sequence[Payload]):
 
             return
 
-        # Store the PID of the current process so that we know which processes
-        # have Symbol DB enabled.
-        shared_pid_file.put_unlocked(f, str(os.getpid()))
-
     for payload in data:
         if payload.metadata is None:
             continue

ddtrace/internal/symbol_db/remoteconfig.py

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    dynamic instrumentation: fixed an issue that prevented autocomplete
+    information to be extracted from the running application.

releasenotes/notes/fix-symdb-child-check-f26b630125d6c55d.yaml

@@ -319,10 +319,12 @@ def test_symbols_fork_uploads():
 
     for _ in range(10):
         if not (pid := os.fork()):
-            _rc_callback(rc_data)
-            assert SymbolDatabaseUploader.is_installed() != (
-                get_ancestor_runtime_id() is not None and forksafe.has_forked()
-            )
+            # Call the RC callback multiple times to check for stability
+            for i in range(10):
+                _rc_callback(rc_data)
+                assert SymbolDatabaseUploader.is_installed() != (
+                    get_ancestor_runtime_id() is not None and forksafe.has_forked()
+                ), f"iteration {i} is stable"
             os._exit(0)
 
         pids.append(pid)