ssi: enable instrumentation source tests (#5007)

Author: mabdinur

manifests/java.yml

@@ -2164,7 +2164,7 @@ tests/:
       Test_Stable_Configuration_Origin: v1.47.0-SNAPSHOT
       Test_TelemetryInstallSignature: v1.27.0
       Test_TelemetrySCAEnvVar: v1.34.0
-      Test_TelemetrySSIConfigs: missing_feature
+      Test_TelemetrySSIConfigs: v1.51.0
     test_trace_sampling.py:
       Test_Trace_Sampling_Basic: v0.111.0
       Test_Trace_Sampling_Globs: v1.25.1

manifests/nodejs.yml

@@ -1366,7 +1366,7 @@ tests/:
       Test_Stable_Configuration_Origin: *ref_5_41_0
       Test_TelemetryInstallSignature: *ref_4_23_0
       Test_TelemetrySCAEnvVar: *ref_5_13_0
-      Test_TelemetrySSIConfigs: missing_feature
+      Test_TelemetrySSIConfigs: *ref_5_59_0
     test_trace_sampling.py:
       Test_Trace_Sampling_Basic: *ref_5_16_0  #actual version unknown
       Test_Trace_Sampling_Globs: *ref_5_16_0  #actual version unknown

manifests/python.yml

@@ -1165,7 +1165,7 @@ tests/:
       Test_Stable_Configuration_Origin: v3.7.0.dev
       Test_TelemetryInstallSignature: v2.5.0
       Test_TelemetrySCAEnvVar: v2.9.0
-      Test_TelemetrySSIConfigs: v3.8.0.dev
+      Test_TelemetrySSIConfigs: v3.11.0
     test_trace_sampling.py:
       Test_Trace_Sampling_Basic: v1.9.0  # actual version unknown
       Test_Trace_Sampling_Globs: v2.8.0

manifests/ruby.yml

@@ -800,7 +800,7 @@ tests/:
       Test_Stable_Configuration_Origin: v2.18.0
       Test_TelemetryInstallSignature: missing_feature
       Test_TelemetrySCAEnvVar: v2.1.0
-      Test_TelemetrySSIConfigs: missing_feature
+      Test_TelemetrySSIConfigs: v2.18.0
     test_trace_sampling.py:
       Test_Trace_Sampling_Basic: v1.0.0  # TODO what is the earliest version?
       Test_Trace_Sampling_Globs: v2.0.0

tests/docker_ssi/test_docker_ssi.py

@@ -1,6 +1,17 @@
 from urllib.parse import urlparse
 
-from utils import scenarios, features, context, irrelevant, bug, interfaces, weblog, logger, missing_feature
+from tests.parametric.test_telemetry import _mapped_telemetry_name
+from utils import (
+    scenarios,
+    features,
+    context,
+    irrelevant,
+    bug,
+    interfaces,
+    weblog,
+    logger,
+    missing_feature,
+)
 
 
 @scenarios.docker_ssi
@@ -131,25 +142,25 @@ def setup_instrumentation_source_ssi(self):
         self._setup_all()
 
     @features.ssi_service_tracking
-    @missing_feature(context.library in ("nodejs", "dotnet", "java", "ruby"), reason="Not implemented yet")
-    @missing_feature(context.library < "python@3.8.0.dev", reason="Not implemented")
     @irrelevant(context.library == "python" and context.installed_language_runtime < "3.9.0")
-    @irrelevant(context.library == "php" and context.installed_language_runtime < "7.0")
+    @irrelevant(context.library == "java" and context.installed_language_runtime < "1.8.0_0")
+    @irrelevant(context.library == "php" and context.installed_language_runtime < "7.1")
+    @irrelevant(context.library == "nodejs" and context.installed_language_runtime < "17.0")
+    @irrelevant(context.library >= "python@4.0.0.dev" and context.installed_language_runtime < "3.9.0")
+    @irrelevant(context.library < "python@4.0.0.dev" and context.installed_language_runtime < "3.8.0")
+    @missing_feature(context.library < "java@1.52.0", reason="Not implemented yet")
+    @missing_feature(context.library < "python@3.11.0", reason="Not implemented yet")
+    @missing_feature(context.library < "dotnet@3.22.0", reason="Not implemented yet")
+    @missing_feature(context.library < "nodejs@5.66.0", reason="Not implemented yet")
+    @missing_feature(context.library < "php@1.12.0", reason="Not implemented yet")
+    @missing_feature(context.library < "ruby@v2.19.0", reason="Not implemented yet")
     def test_instrumentation_source_ssi(self):
         logger.info("Testing Docker SSI service tracking")
-        # There are traces related with the request
-        root_span = interfaces.test_agent.get_traces(request=self.r)
-        assert root_span, f"No traces found for request {self.r.get_rid()}"
-        assert "service" in root_span, f"No service name found in root_span: {root_span}"
-        # Get all captured telemetry configuration data
-        configurations = interfaces.test_agent.get_telemetry_configurations(
-            root_span["service"], root_span["meta"]["runtime-id"]
-        )
-
-        # Check that instrumentation source is ssi
-        injection_source = configurations.get("instrumentation_source")
-        assert injection_source, f"instrumentation_source not found in configuration {configurations}"
-        assert injection_source["value"] == "ssi", f"instrumentation_source value is not ssi {injection_source}"
+        # Get the latest (effective) configurations
+        telemetry_name = _mapped_telemetry_name("instrumentation_source")
+        configurations = interfaces.test_agent.get_telemetry_configurations()
+        instrumentation_source = configurations.get(telemetry_name, {})
+        assert instrumentation_source.get("value") == "ssi", f"{telemetry_name}=ssi not found in {configurations}"
 
     def setup_injection_metadata(self):
         self._setup_all()

tests/parametric/test_telemetry.py

@@ -9,19 +9,22 @@
 
 from .conftest import StableConfigWriter, _TestAgentAPI
 from utils.telemetry_utils import TelemetryUtils
+
 from utils import context, scenarios, rfc, features, missing_feature, irrelevant, logger, bug
 from utils.docker_fixtures import TestAgentAPI
 from .conftest import APMLibrary
 
 
 telemetry_name_mapping = {
     "ssi_injection_enabled": {
-        "nodejs": "DD_INJECTION_ENABLED",
         "python": "DD_INJECTION_ENABLED",
+        "java": "injection_enabled",
+        "ruby": "DD_INJECTION_ENABLED",
     },
     "ssi_forced_injection_enabled": {
-        "nodejs": "DD_INJECT_FORCE",
         "python": "DD_INJECT_FORCE",
+        "ruby": "DD_INJECT_FORCE",
+        "java": "inject_force",
     },
     "trace_sample_rate": {
         "dotnet": "DD_TRACE_SAMPLE_RATE",
@@ -1053,20 +1056,12 @@ class Test_TelemetrySSIConfigs:
                 },
                 "service_test,profiler,false",
             ),
-            (
-                {
-                    **DEFAULT_ENVVARS,
-                    "DD_SERVICE": "service_test",
-                    "DD_INJECTION_ENABLED": None,
-                },
-                None,
-            ),
         ],
     )
     def test_injection_enabled(
         self,
         library_env: dict[str, str],
-        expected_value: str | None,
+        expected_value: str,
         test_agent: TestAgentAPI,
         test_library: APMLibrary,
     ):
@@ -1108,14 +1103,6 @@ def test_injection_enabled(
                 },
                 "false",
             ),
-            (
-                {
-                    **DEFAULT_ENVVARS,
-                    "DD_SERVICE": "service_test",
-                    "DD_INJECT_FORCE": None,
-                },
-                "none",
-            ),
         ],
     )
     def test_inject_force(
@@ -1137,10 +1124,8 @@ def test_inject_force(
         assert inject_force is not None, f"No configuration found for '{inject_force_telemetry_name}'"
         assert isinstance(inject_force, dict)
         assert str(inject_force.get("value")).lower() == expected_value
-        if expected_value != "none":
-            assert inject_force.get("origin") == "env_var"
+        assert inject_force.get("origin") == "env_var"
 
-    @missing_feature(context.library == "dotnet", reason="Not implemented")
     @pytest.mark.parametrize("library_env", [{**DEFAULT_ENVVARS, "DD_SERVICE": "service_test"}])
     def test_instrumentation_source_non_ssi(
         self, library_env: dict[str, str], test_agent: TestAgentAPI, test_library: APMLibrary

utils/interfaces/_test_agent.py

@@ -125,21 +125,26 @@ def get_telemetry_configurations(self, service_name: str | None = None, runtime_
         requests = list(self.get_telemetry_for_runtime(runtime_id))
         requests.sort(key=lambda x: x["tracer_time"])
         for request in requests:
-            if service_name is not None:
+            if service_name is not None and request["application"]["service_name"] != service_name:
                 # Check if the service name in telemetry matches the expected service name
-                assert (
-                    request["application"]["service_name"] == service_name
-                ), f"Service name in telemetry in requests: {request} "
-                f"does not match expected service name {service_name}"
+                logger.debug(
+                    f"Service name in telemetry in requests: {request} "
+                    f"does not match expected service name {service_name}"
+                )
+                continue
             # Convert all telemetry payloads to the the message-batch format. This simplifies configuration extraction
             events = (
                 request.get("payload")
                 if request["request_type"] == "message-batch"
                 else [{"payload": request.get("payload"), "request_type": request["request_type"]}]
             )
+            logger.debug("Found telemetry events: %s", events)
             for event in events:
                 # Get the configuration from app-started or app-client-configuration-change payloads
                 if event and event["request_type"] in ("app-started", "app-client-configuration-change"):
-                    for config in event["payload"].get("configuration", []):
+                    # Sort configurations by seq_id so the latest configuration is the last one in the list
+                    config_list = event["payload"].get("configuration", [])
+                    config_list.sort(key=lambda x: x.get("seq_id", 0))
+                    for config in config_list:
                         configurations[config["name"]] = config
         return configurations