address feedback and fix typos

DataDog · Sep 20, 2024 · 4227910 · 4227910
1 parent c46f5ce
commit 4227910
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 14 deletions.
diff --git a/manifests/cpp.yml b/manifests/cpp.yml
@@ -137,7 +137,7 @@ tests/:
       Test_Dsm_Manual_Checkpoint_Intra_Process: missing_feature
   parametric/:
     test_config_consistency.py:
-      Test_Config_DDTraceAgentURL: missing_feature
+      Test_Config_TraceAgentURL: missing_feature
       Test_Config_TraceEnabled: missing_feature
       Test_Config_TraceLogDirectory: missing_feature
       Test_Config_UnifiedServiceTagging: missing_feature

diff --git a/manifests/dotnet.yml b/manifests/dotnet.yml
@@ -317,7 +317,7 @@ tests/:
       TestAdmisionControllerProfiling: missing_feature
   parametric/:
     test_config_consistency.py:
-      Test_Config_DDTraceAgentURL: missing_feature
+      Test_Config_TraceAgentURL: missing_feature
       Test_Config_TraceEnabled: missing_feature
       Test_Config_TraceLogDirectory: missing_feature
       Test_Config_UnifiedServiceTagging: missing_feature

diff --git a/manifests/golang.yml b/manifests/golang.yml
@@ -444,7 +444,7 @@ tests/:
         net-http: missing_feature (Endpoint not implemented)
   parametric/:
     test_config_consistency.py:
-      Test_Config_DDTraceAgentURL: missing_feature
+      Test_Config_TraceAgentURL: missing_feature
       Test_Config_TraceEnabled: missing_feature
       Test_Config_TraceLogDirectory: missing_feature
       Test_Config_UnifiedServiceTagging: missing_feature

diff --git a/manifests/java.yml b/manifests/java.yml
@@ -1176,7 +1176,7 @@ tests/:
       TestAdmisionControllerProfiling: v1.39.0
   parametric/:
     test_config_consistency.py:
-      Test_Config_DDTraceAgentURL: missing_feature
+      Test_Config_TraceAgentURL: missing_feature
       Test_Config_TraceEnabled: missing_feature
       Test_Config_TraceLogDirectory: missing_feature
       Test_Config_UnifiedServiceTagging: missing_feature

diff --git a/manifests/nodejs.yml b/manifests/nodejs.yml
@@ -517,7 +517,7 @@ tests/:
       TestAdmisionControllerProfiling: *ref_5_22_0
   parametric/:
     test_config_consistency.py:
-      Test_Config_DDTraceAgentURL: *ref_5_23_0
+      Test_Config_TraceAgentURL: *ref_5_22_0
       Test_Config_TraceEnabled: missing_feature
       Test_Config_TraceLogDirectory: missing_feature
       Test_Config_UnifiedServiceTagging: missing_feature

diff --git a/manifests/php.yml b/manifests/php.yml
@@ -257,7 +257,7 @@ tests/:
     test_128_bit_traceids.py:
       Test_128_Bit_Traceids: v0.84.0
     test_config_consistency.py:
-      Test_Config_DDTraceAgentURL: missing_feature
+      Test_Config_TraceAgentURL: missing_feature
       Test_Config_TraceEnabled: v1.3.0 # Unknown initial version
       Test_Config_TraceLogDirectory: missing_feature
       Test_Config_UnifiedServiceTagging: missing_feature

diff --git a/manifests/python.yml b/manifests/python.yml
@@ -679,7 +679,7 @@ tests/:
     test_128_bit_traceids.py:
       Test_128_Bit_Traceids: v2.6.0
     test_config_consistency.py:
-      Test_Config_DDTraceAgentURL: missing_feature
+      Test_Config_TraceAgentURL: missing_feature
       Test_Config_TraceEnabled: missing_feature
       Test_Config_TraceLogDirectory: missing_feature
       Test_Config_UnifiedServiceTagging: missing_feature

diff --git a/manifests/ruby.yml b/manifests/ruby.yml
@@ -330,7 +330,7 @@ tests/:
       TestAdmisionControllerProfiling: missing_feature
   parametric/:
     test_config_consistency.py:
-      Test_Config_DDTraceAgentURL: missing_feature
+      Test_Config_TraceAgentURL: missing_feature
       Test_Config_TraceEnabled: missing_feature
       Test_Config_TraceLogDirectory: missing_feature
       Test_Config_UnifiedServiceTagging: missing_feature

diff --git a/tests/parametric/test_config_consistency.py b/tests/parametric/test_config_consistency.py
@@ -140,9 +140,6 @@ def test_dd_trace_agent_unix_url_nonexistent(self, library_env, test_agent, test
         assert resp["dd_trace_agent_url"] == "unix:///var/run/datadog/apm.socket"
         with pytest.raises(ValueError):
             test_agent.wait_for_num_traces(num=1, clear=True)
-        assert (
-            True
-        ), "wait_for_num_traces raises an exception after waiting for 1 trace."  # wait_for_num_traces will throw an error if not received within 2 sec, so we expect to see an exception
 
     # The DD_TRACE_AGENT_URL is validated using the tracer configuration. This approach avoids the need to modify the setup file to create additional containers at the specified URL, which would be unnecessarily complex.
     @parametrize(
@@ -155,6 +152,3 @@ def test_dd_trace_agent_http_url_nonexistent(self, library_env, test_agent, test
         assert resp["dd_trace_agent_url"] == "http://random-host:9999/"
         with pytest.raises(ValueError):
             test_agent.wait_for_num_traces(num=1, clear=True)
-        assert (
-            True
-        ), "wait_for_num_traces raises an exception after waiting for 1 trace."  # wait_for_num_traces will throw an error if not received within 2 sec, so we expect to see an exception