Enable Test_TelemetryEnhancedConfigReporting for java (#5324)

Author: mtoffl01

manifests/java.yml

@@ -2412,8 +2412,10 @@ tests/:
       spring-boot-3-native: irrelevant (GraalVM. Tracing support only)
     Test_Telemetry:
       '*': v0.108.1
-      spring-boot-3-native: irrelevant (GraalVM. Tracing support only)
-    Test_TelemetryEnhancedConfigReporting: missing_feature
+      spring-boot-3-native: missing_feature (GraalVM. Tracing support only)
+    Test_TelemetryEnhancedConfigReporting:
+      '*': v1.54.0-SNAPSHOT
+      spring-boot-3-native: missing_feature (GraalVM. Tracing support only)
     Test_TelemetrySCAEnvVar: missing_feature
     Test_TelemetryV2: v1.23.0
   test_v1_payloads.py: missing_feature

tests/test_telemetry.py

@@ -612,7 +612,10 @@ class Test_TelemetryEnhancedConfigReporting:
             "name": "logs_injection_enabled",
             "precedence": [
                 {"origin": "default", "value": "true"},
-                {"origin": "jvm_prop", "value": "true"},
+                {
+                    "origin": "jvm_prop",
+                    "value": "true",
+                },  # File-based properties differ from sysprops, but still report with origin:jvm_prop, even though they have a lower precedence than env_var: https://github.com/DataDog/dd-trace-java/blob/5c66a150ff3b16ebf9626c0f0170fc9715461a6b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java#L507-L514
                 {"origin": "env_var", "value": "false"},
             ],
         },

utils/_context/_scenarios/__init__.py

@@ -128,7 +128,7 @@ class _Scenarios:
         weblog_env={
             "DD_LOGS_INJECTION": "false",
             "CONFIG_CHAINING_TEST": "true",
-            "DD_TRACE_CONFIG": "ConfigChaining.properties",
+            "DD_TRACE_CONFIG": "/app/ConfigChaining.properties",
         },
         doc="Test telemetry for environment variable configurations",
         scenario_groups=[scenario_groups.telemetry],

…va/spring-boot/ConfigChaining.properties …ld/docker/java/ConfigChaining.propertiesutils/build/docker/java/spring-boot/ConfigChaining.properties renamed to utils/build/docker/java/ConfigChaining.properties utils/build/docker/java/spring-boot/ConfigChaining.properties renamed to utils/build/docker/java/ConfigChaining.properties

@@ -22,6 +22,7 @@ COPY --from=build /binaries/SYSTEM_TESTS_LIBRARY_VERSION SYSTEM_TESTS_LIBRARY_VE
 COPY --from=build /app/target/my-akka-http-app-1.0.0-allinone.jar /app/app.jar
 COPY --from=build /dd-tracer/dd-java-agent.jar .
 
+COPY ./utils/build/docker/java/ConfigChaining.properties /app/ConfigChaining.properties
 COPY ./utils/build/docker/java/app.sh /app/app.sh
 RUN chmod +x /app/app.sh
 

utils/build/docker/java/akka-http.Dockerfile

@@ -21,6 +21,7 @@ COPY --from=build /binaries/SYSTEM_TESTS_LIBRARY_VERSION SYSTEM_TESTS_LIBRARY_VE
 COPY --from=build /app/target/jersey-grizzly2-1.0-SNAPSHOT.jar /app/app.jar
 COPY --from=build /dd-tracer/dd-java-agent.jar .
 
+COPY ./utils/build/docker/java/ConfigChaining.properties /app/ConfigChaining.properties
 COPY ./utils/build/docker/java/app.sh /app/app.sh
 RUN chmod +x /app/app.sh
 

utils/build/docker/java/jersey-grizzly2.Dockerfile

@@ -21,6 +21,7 @@ COPY --from=build /binaries/SYSTEM_TESTS_LIBRARY_VERSION SYSTEM_TESTS_LIBRARY_VE
 COPY --from=build /app/target/dist/play-app-1.0.0 .
 COPY --from=build /dd-tracer/dd-java-agent.jar .
 
+COPY ./utils/build/docker/java/ConfigChaining.properties /app/ConfigChaining.properties
 COPY ./utils/build/docker/java/app-play.sh /app/app.sh
 RUN chmod +x /app/app.sh
 

utils/build/docker/java/play.Dockerfile

@@ -21,6 +21,7 @@ COPY --from=build /binaries/SYSTEM_TESTS_LIBRARY_VERSION SYSTEM_TESTS_LIBRARY_VE
 COPY --from=build /app/target/ratpack-1.0-SNAPSHOT.jar /app/app.jar
 COPY --from=build /dd-tracer/dd-java-agent.jar .
 
+COPY ./utils/build/docker/java/ConfigChaining.properties /app/ConfigChaining.properties
 COPY ./utils/build/docker/java/app.sh /app/app.sh
 RUN chmod +x /app/app.sh
 

utils/build/docker/java/ratpack.Dockerfile

@@ -22,6 +22,7 @@ COPY --from=build /binaries/SYSTEM_TESTS_LIBRARY_VERSION SYSTEM_TESTS_LIBRARY_VE
 COPY --from=build /app/target/resteasy-netty3-1.0-SNAPSHOT.jar /app/app.jar
 COPY --from=build /dd-tracer/dd-java-agent.jar .
 
+COPY ./utils/build/docker/java/ConfigChaining.properties /app/ConfigChaining.properties
 COPY ./utils/build/docker/java/app.sh /app/app.sh
 RUN chmod +x /app/app.sh
 

utils/build/docker/java/resteasy-netty3.Dockerfile

@@ -29,6 +29,7 @@ COPY --from=build /app/without-profiling/myproject ./without-profiling/
 ENV DD_TRACE_HEADER_TAGS='user-agent:http.request.headers.user-agent'
 ENV DD_TRACE_INTERNAL_EXIT_ON_FAILURE=true
 
+COPY ./utils/build/docker/java/ConfigChaining.properties /app/ConfigChaining.properties
 COPY ./utils/build/docker/java/app-native-profiling.sh app.sh
 RUN chmod +x app.sh
 CMD [ "/app/app.sh" ]