Merge branch 'main' into munir/fix-some-tracing-tests-1

.circleci/config.templ.yml

@@ -639,17 +639,6 @@ jobs:
           pattern: 'opentelemetry'
           snapshot: true
 
-  profile:
-    <<: *contrib_job
-    resource_class: large
-    # There are 32 jobs, so 2 per-node
-    parallelism: 16
-    steps:
-      - run_test:
-          # We don't want to run the profile-diff venvs
-          pattern: 'profile$'
-          trace_agent_url: ""
-
   integration_agent:
     <<: *machine_executor
     parallelism: 2

.github/CODEOWNERS

@@ -112,6 +112,7 @@ ddtrace/profiling                   @DataDog/profiling-python
 ddtrace/settings/profiling.py       @DataDog/profiling-python
 ddtrace/internal/datadog/profiling  @DataDog/profiling-python
 tests/profiling                     @DataDog/profiling-python
+.gitlab/tests/profiling.yml         @DataDog/profiling-python
 
 # MLObs
 ddtrace/llmobs/                                         @DataDog/ml-observability

.gitlab/tests.yml

@@ -52,5 +52,6 @@ variables:
 
 include:
   - local: ".gitlab/tests/appsec.yml"
-  - local: ".gitlab/tests/tracer.yml"
   - local: ".gitlab/tests/core.yml"
+  - local: ".gitlab/tests/tracer.yml"
+  - local: ".gitlab/tests/profiling.yml"

.gitlab/tests/profiling.yml

@@ -0,0 +1,6 @@
+profiling:
+  extends: .test_base_riot
+  parallel: 20
+  variables:
+    DD_TRACE_AGENT_URL: ""
+    SUITE_NAME: "profile$"

tests/tracer/test_rate_limiter.py

@@ -162,8 +162,8 @@ def test_rate_limiter_effective_rate_starting_rate(time_window):
         assert limiter.current_window_ns == now_ns
         assert limiter.prev_window_rate is None
 
-    # Gap of 0.9999 seconds, same window
-    time_ns = now_ns + (0.9999 * time_window)
+    # Gap of 0.85 seconds, same window
+    time_ns = now_ns + (0.85 * time_window)
     with mock.patch("ddtrace.internal.rate_limiter.compat.monotonic_ns", return_value=time_ns):
         assert limiter.is_allowed() is False
         # DEV: We have rate_limit=1 set