Enable Test_TelemetryEnhancedConfigReporting for java #5324

mtoffl01 · 2025-09-23T15:12:02Z

Motivation

Support for Enhanced Config Reporting will be added to dd-trace-java v1.53.0-SNAPSHOT thanks to: DataDog/dd-trace-java#9404

Changes

Enable Test_TelemetryEnhancedConfigReporting for Java v1.53.0-SNAPSHOT
Mount config file onto all Java weblog containers
Modify DD_TRACE_CONFIG to point to absolute file path

Workflow

⚠️ Create your PR as draft ⚠️
Work on you PR until the CI passes
Mark it as ready for review
- Test logic is modified? -> Get a review from RFC owner.
- Framework is modified, or non obvious usage of it -> get a review from R&P team

🚀 Once your PR is reviewed and the CI green, you can merge it!

🛟 #apm-shared-testing 🛟

Reviewer checklist

If PR title starts with [<language>], double-check that only <language> is impacted by the change
No system-tests internal is modified. Otherwise, I have the approval from R&P team
A docker base image is modified?
- the relevant build-XXX-image label is present
A scenario is added (or removed)?
- Get a review from R&P team

github-actions · 2025-10-03T16:31:39Z

CODEOWNERS have been resolved as:

manifests/java.yml                                                      @DataDog/asm-java @DataDog/apm-java
tests/test_telemetry.py                                                 @DataDog/libdatadog-telemetry @DataDog/apm-sdk-capabilities @DataDog/system-tests-core
utils/_context/_scenarios/__init__.py                                   @DataDog/system-tests-core
utils/build/docker/java/akka-http.Dockerfile                            @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core
utils/build/docker/java/jersey-grizzly2.Dockerfile                      @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core
utils/build/docker/java/play.Dockerfile                                 @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core
utils/build/docker/java/ratpack.Dockerfile                              @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core
utils/build/docker/java/resteasy-netty3.Dockerfile                      @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core
utils/build/docker/java/spring-boot-3-native.Dockerfile                 @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core
utils/build/docker/java/spring-boot-jetty.Dockerfile                    @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core
utils/build/docker/java/spring-boot-openliberty.Dockerfile              @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core
utils/build/docker/java/spring-boot-payara.Dockerfile                   @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core
utils/build/docker/java/spring-boot-undertow.Dockerfile                 @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core
utils/build/docker/java/spring-boot-wildfly.Dockerfile                  @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core
utils/build/docker/java/spring-boot.Dockerfile                          @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core
utils/build/docker/java/uds-spring-boot.Dockerfile                      @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core
utils/build/docker/java/vertx3.Dockerfile                               @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core
utils/build/docker/java/vertx4.Dockerfile                               @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core
utils/build/docker/java/ConfigChaining.properties                       @DataDog/apm-java @DataDog/asm-java @DataDog/system-tests-core

mhlidd

Thanks for the changes! 🙏 Just a few small questions.

mhlidd · 2025-10-03T20:22:19Z

tests/test_telemetry.py

+                {
+                    "origin": "jvm_prop",
+                    "value": "true",
+                },  # File-based properties 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


Suggested change

}, # File-based properties 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

}, # File-based properties have a lower precedence than env_var (different that System Properties which have the same origin but a higher 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

Not necessarily this wording, but I do feel like it makes sense to state that there is a nuance between origin and the actual source that is used.

mhlidd · 2025-10-03T20:28:38Z

utils/build/docker/java/spring-boot-openliberty.Dockerfile


-ENV JVM_ARGS='-javaagent:/app/dd-java-agent.jar'
+COPY ./utils/build/docker/java/ConfigChaining.properties app/ConfigChaining.properties
+ENV JVM_ARGS='-javaagent:/app/dd-java-agent.jar -Ddd.trace.config=/app/ConfigChaining.properties'


Not sure if you tested this already, but is it possible to change this in the definition of the Scenario? AKA would updating DD_TRACE_CONFIG to/app/ConfigChaining.properties work for all weblog apps? 🤔

… openliberty dockerfile

mhlidd

One small change. Otherwise LGTM! 🚀

mhlidd · 2025-10-06T18:18:50Z

utils/build/docker/java/spring-boot-openliberty.Dockerfile

 # FIXME: Fails on APPSEC_BLOCKING, see APPSEC-51405
 # ENV DD_TRACE_INTERNAL_EXIT_ON_FAILURE=true

+COPY ./utils/build/docker/java/ConfigChaining.properties app/ConfigChaining.properties


Suggested change

COPY ./utils/build/docker/java/ConfigChaining.properties app/ConfigChaining.properties

Duplicate from above

Enable Test_TelemetryEnhancedConfigReporting for java 1.53.0-SNAPSHOT

97e838f

mtoffl01 requested review from a team as code owners September 23, 2025 15:12

mtoffl01 requested review from jandro996, mhlidd and robertpi September 23, 2025 15:12

mtoffl01 marked this pull request as draft September 23, 2025 15:12

mtoffl01 and others added 14 commits September 23, 2025 15:56

Merge branch 'main' into mtoff/java-config-sources

cf5735d

Merge branch 'main' into mtoff/java-config-sources

4eb824d

Apply for spring-boot only

1d67eb0

Try mounting ConfigChaining for more libs

a05e1b7

run formatter

1dfab01

Apply ConfigChaining mount for all java dockerfiles

fe1c349

Use v1.54.0-SNAPSHOT for Test_TelemetryEnhancedConfigReporting

d1c7135

Merge branch 'main' into mtoff/java-config-sources

8354010

disable for graalvm

446528c

Apply JVM args to openliberty

568ce6c

Revert app.sh command to previous state

a80d551

Put JVM_ARGS in app start command

3c6fb24

Remove JVM_ARGS from app start cmd

e98241d

Modify openliberty dockerfile to use /app/ConfigChaining.properties

4b96513

mtoffl01 added 2 commits October 3, 2025 13:47

remove reverse ordering

236a990

linter

06df82e

mtoffl01 marked this pull request as ready for review October 3, 2025 19:37

mtoffl01 requested review from a team as code owners October 3, 2025 19:37

mtoffl01 requested a review from paullegranddc October 3, 2025 19:37

remove superfluous comment on openliberty dockerfile

a9fc107

mhlidd reviewed Oct 3, 2025

View reviewed changes

mtoffl01 and others added 3 commits October 6, 2025 10:28

Use /app/ConfigChaining for config file path in scenario; remove from…

8790c6c

… openliberty dockerfile

Clarify file-based origin wording

b8ab89c

Merge branch 'main' into mtoff/java-config-sources

25743d5

mtoffl01 requested a review from mhlidd October 6, 2025 17:49

mhlidd approved these changes Oct 6, 2025

View reviewed changes

mtoffl01 marked this pull request as draft October 6, 2025 18:54

mtoffl01 changed the title ~~[java] Enable Test_TelemetryEnhancedConfigReporting~~ Enable Test_TelemetryEnhancedConfigReporting for java Oct 6, 2025

mtoffl01 force-pushed the mtoff/java-config-sources branch from ac1c288 to 25743d5 Compare October 6, 2025 20:45

Remove duplicate in openliberty dockerfile

66a8ee4

mtoffl01 marked this pull request as ready for review October 7, 2025 14:30

mtoffl01 merged commit 7e329cf into main Oct 8, 2025
2696 of 2698 checks passed

mtoffl01 deleted the mtoff/java-config-sources branch October 8, 2025 18:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Enable Test_TelemetryEnhancedConfigReporting for java #5324

Enable Test_TelemetryEnhancedConfigReporting for java #5324

Uh oh!

mtoffl01 commented Sep 23, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Oct 3, 2025 •

edited

Loading

Uh oh!

mhlidd left a comment

Uh oh!

mhlidd Oct 3, 2025

Uh oh!

mhlidd Oct 3, 2025

Uh oh!

mhlidd left a comment

Uh oh!

mhlidd Oct 6, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	}, # File-based properties 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
	}, # File-based properties have a lower precedence than env_var (different that System Properties which have the same origin but a higher 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

Enable Test_TelemetryEnhancedConfigReporting for java #5324

Enable Test_TelemetryEnhancedConfigReporting for java #5324

Uh oh!

Conversation

mtoffl01 commented Sep 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Motivation

Changes

Workflow

Reviewer checklist

Uh oh!

github-actions bot commented Oct 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mhlidd left a comment

Choose a reason for hiding this comment

Uh oh!

mhlidd Oct 3, 2025

Choose a reason for hiding this comment

Uh oh!

mhlidd Oct 3, 2025

Choose a reason for hiding this comment

Uh oh!

mhlidd left a comment

Choose a reason for hiding this comment

Uh oh!

mhlidd Oct 6, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mtoffl01 commented Sep 23, 2025 •

edited

Loading

github-actions bot commented Oct 3, 2025 •

edited

Loading