Enable Stable Config tests for dd-trace-java v1.49.0

manifests/java.yml

@@ -1974,7 +1974,7 @@ tests/:
       Test_Config_TraceEnabled: v1.39.0
       Test_Config_TraceLogDirectory: missing_feature
       Test_Config_UnifiedServiceTagging: v1.41.1
-      Test_Stable_Config_Default: missing_feature (waiting on APMAPI-298 to be merged)
+      Test_Stable_Config_Default: v1.49.0-SNAPSHOT
     test_crashtracking.py:
       Test_Crashtracking: v1.38.0
     test_dynamic_configuration.py:

tests/parametric/conftest.py

@@ -3,7 +3,6 @@
 import contextlib
 import dataclasses
 import os
-import shlex
 import shutil
 import json
 import subprocess
@@ -765,7 +764,12 @@ def write_stable_config(self, stable_config: dict, path: str, test_library: APML
         self.write_stable_config_content(stable_config_content, path, test_library)
 
     def write_stable_config_content(self, stable_config_content: str, path: str, test_library: APMLibrary) -> None:
-        cmd = f'bash -c "mkdir -p {Path(path).parent!s} && printf {shlex.quote(stable_config_content)} | tee {path}"'
+        # Base64 encode the YAML content to avoid shell issues
+        encoded = base64.b64encode(stable_config_content.encode()).decode()
+
+        # Now execute the shell command to decode and write to the file
+        cmd = f'bash -c "mkdir -p {Path(path).parent!s} && echo {encoded} | base64 -d > {path}"'
+
         if test_library.lang == "php":
             cmd = "sudo " + cmd
         success, message = test_library.container_exec_run(cmd)

tests/parametric/test_config_consistency.py

@@ -3,6 +3,7 @@
 from urllib.parse import urlparse
 
 import pytest
+import yaml
 from utils import scenarios, features, context, missing_feature, irrelevant, flaky, bug, rfc, incomplete_test_app
 from .conftest import StableConfigWriter
 from utils.parametric.spec.trace import find_span_in_traces, find_only_span
@@ -389,12 +390,27 @@ def test_dogstatsd_custom_port(self, library_env, test_agent, test_library):
     if context.library != "php"
     else "1",  # Profiling is enabled as "1" by default in PHP if loaded
     "dd_data_streams_enabled": "false",
-    "dd_logs_injection": {"ruby": "true", "python": "structured", "nodejs": "structured"}.get(
+    "dd_logs_injection": {"ruby": "true", "java": "true", "python": "structured", "nodejs": "structured"}.get(
         context.library.name, "false"
     ),  # Enabled by default in ruby, set to None in python
 }
 
 
+class QuotedStr(str):
+    __slots__ = ()
+
+
+def quoted_presenter(dumper, data):
+    return dumper.represent_scalar("tag:yaml.org,2002:str", data, style='"')
+
+
+class CustomDumper(yaml.Dumper):
+    pass
+
+
+CustomDumper.add_representer(QuotedStr, quoted_presenter)
+
+
 @scenarios.parametric
 @features.stable_configuration_support
 @rfc("https://docs.google.com/document/d/1MNI5d3g6R8uU3FEWf2e08aAsFcJDVhweCPMjQatEb0o")
@@ -590,21 +606,22 @@ def test_config_precedence(self, name, test_agent, test_library, local_cfg, libr
 
     @pytest.mark.parametrize("library_env", [{"STABLE_CONFIG_SELECTOR": "true", "DD_SERVICE": "not-my-service"}])
     @missing_feature(
-        context.library in ["ruby", "cpp", "dotnet", "golang", "java", "nodejs", "php", "python"],
+        context.library in ["ruby", "cpp", "dotnet", "golang", "nodejs", "php", "python"],
         reason="UST stable config is phase 2",
     )
     def test_config_stable(self, library_env, test_agent, test_library):
         path = "/etc/datadog-agent/managed/datadog-agent/stable/application_monitoring.yaml"
         with test_library:
             self.write_stable_config(
                 {
-                    "rules": [
+                    "apm_configuration_rules": [
                         {
                             "selectors": [
                                 {
                                     "origin": "environment_variables",
-                                    "matches": ["STABLE_CONFIG_SELECTOR=true"],
+                                    "key": "STABLE_CONFIG_SELECTOR",
                                     "operator": "equals",
+                                    "matches": ["true"],
                                 }
                             ],
                             "configuration": {"DD_SERVICE": "my-service"},
@@ -619,3 +636,37 @@ def test_config_stable(self, library_env, test_agent, test_library):
             assert (
                 config["dd_service"] == "my-service"
             ), f"Service name is '{config["dd_service"]}' instead of 'my-service'"
+
+    @missing_feature(
+        context.library in ["ruby", "cpp", "dotnet", "golang", "nodejs", "php", "python"],
+        reason="UST stable config is phase 2",
+    )
+    @pytest.mark.parametrize(
+        "library_extra_command_arguments",
+        [
+            ["-Darg1=value"]
+        ],  # Note: This test was written for Java, so if this arg is not compatible for other libs, we may need to dynamically set library_extra_command_arguments based on context.library.name
+    )
+    def test_process_arguments(self, library_env, test_agent, test_library):
+        path = "/etc/datadog-agent/managed/datadog-agent/stable/application_monitoring.yaml"
+        with test_library:
+            config = {
+                "apm_configuration_rules": [
+                    {
+                        "selectors": [
+                            {
+                                "origin": "process_arguments",
+                                "key": "-Darg1",
+                                "operator": "exists",
+                            }
+                        ],
+                        "configuration": {"DD_SERVICE": QuotedStr("{{process_arguments['-Darg1']}}")},
+                    }
+                ]
+            }
+            # Use custom dumper for this specific test
+            stable_config_content = yaml.dump(config, Dumper=CustomDumper)
+            self.write_stable_config_content(stable_config_content, path, test_library)
+            test_library.container_restart()
+            config = test_library.config()
+            assert config["dd_service"] == "value", f"Service name is '{config["dd_service"]}' instead of 'value'"

utils/build/docker/dotnet/parametric/Program.cs

@@ -1,7 +1,8 @@
 // Force the initialization of the tracer
 _ = Datadog.Trace.Tracer.Instance;
 
-var builder = WebApplication.CreateBuilder(args);
+var builder = WebApplication.CreateBuilder();
+
 var app = builder.Build();
 
 var logger = app.Services.GetRequiredService<ILogger<ApmTestApi.Endpoints.ApmTestApi>>();

utils/build/docker/golang/parametric/main.go

@@ -41,6 +41,7 @@ func newServer() *apmClientServer {
 }
 
 func main() {
+	flag.String("Darg1", "", "Argument 1")
 	flag.Parse()
 	defer func() {
 		if err := recover(); err != nil {