time

Author: vitkyrka

datadog_checks_dev/datadog_checks/dev/docker.py

@@ -256,11 +256,12 @@ def get_e2e_discovery_metadata(
             '/var/run/docker.sock:/var/run/docker.sock:ro',
         ],
         'env_vars': {
-            # Reduce the default service collection interval from 60s to speed
-            # up tests. This needs to be set on the container instead of being
-            # passed in to `agent check` since it's read by the
+            # Reduce the default service collection interval and minimum process
+            # age to speed up tests. This needs to be set on the container
+            # instead of being passed in to `agent check` since it's read by the
             # system-probe(-lite) daemon.
-            'DD_DISCOVERY_SERVICE_COLLECTION_INTERVAL': '10s',
+            'DD_DISCOVERY_SERVICE_COLLECTION_INTERVAL': '5s',
+            'DD_DISCOVERY_SERVICE_COLLECTION_MIN_PROCESS_AGE': '1s',
         },
         # system-probe(-lite) needs these capabilities to read /proc entries of
         # other processes for service discovery. Without them it falls back to

datadog_checks_dev/datadog_checks/dev/plugin/pytest.py

@@ -293,14 +293,7 @@ def dd_agent_check_discovery(dd_agent_check):
     if not e2e_testing():
         pytest.skip('Not running E2E tests')
 
-    def run(*, discovery_min_instances=1, discovery_timeout=None, process=False, **kwargs):
-        if discovery_timeout is None:
-            # Process autodiscovery needs to wait for the agent to recognize the
-            # process as a service which happens after a minimum process age of 1
-            # minute. This time can be reduced significantly once agent-side
-            # support for reducing the minimum age via configuration is available.
-            discovery_timeout = 90 if process else 30
-
+    def run(*, discovery_min_instances=1, discovery_timeout=30, process=False, **kwargs):
         if process:
             env_vars = kwargs.pop('env_vars', None) or {}
             # Exclude the `docker` feature so this run's autodiscovery never

datadog_checks_dev/tests/test_docker.py

@@ -69,6 +69,7 @@ def test_get_e2e_discovery_metadata(tmp_path):
         ],
         'env_vars': {
             'DD_DISCOVERY_SERVICE_COLLECTION_INTERVAL': '10s',
+            'DD_DISCOVERY_SERVICE_COLLECTION_MIN_PROCESS_AGE': '1s',
         },
         'cap_add': ['SYS_PTRACE', 'DAC_READ_SEARCH'],
     }