WIP

Author: PerfectSlayer

dd-smoke-tests/src/main/java/datadog/smoketest/AbstractSmokeApp.java

@@ -243,7 +243,7 @@ private void launch() throws IOException {
       command.add("-Ddd.version=" + VERSION);
       String sessionToken = this.backend.sessionToken();
       if (sessionToken != null) {
-        command.add("-Ddd.trace.agent.test.session.token=" + sessionToken);
+        command.add("-Ddd.test.agent.session.token=" + sessionToken);
       }
       if (this.checkTelemetry) {
         // Emit telemetry promptly so app-started is captured before a (long-running server) app is

dd-smoke-tests/src/main/java/datadog/smoketest/backend/TestAgentBackend.java

@@ -28,8 +28,8 @@
  * <p><strong>Per-test isolation (Q4a, Option B).</strong> A shared external agent serves every test
  * in a job, so traces are scoped by an {@code X-Datadog-Test-Session-Token}: the backend owns a
  * token (see {@link #sessionToken()}), the launched app emits it via {@code
- * dd.trace.agent.test.session.token} (S3a tracer change, wired by the S4 app launcher), {@link
- * #clear()} opens a fresh session with it, and {@link #traces()} reads only that session's traces.
+ * dd.test.agent.session.token} (S3a tracer change, wired by the S4 app launcher), {@link #clear()}
+ * opens a fresh session with it, and {@link #traces()} reads only that session's traces.
  *
  * <p>Testcontainers is a {@code compileOnly} dependency of the smoke base, so this class only loads
  * when a test actually selects a test-agent backend (mock-only tests stay Testcontainers-free).
@@ -84,7 +84,7 @@ static Builder builder() {
 
   /**
    * The session token this backend scopes its traces by. The launched app must emit it via {@code
-   * -Ddd.trace.agent.test.session.token=<token>} so its traces land in this backend's session.
+   * -Ddd.test.agent.session.token=<token>} so its traces land in this backend's session.
    */
   @Override
   public String sessionToken() {

dd-smoke-tests/src/main/java/datadog/smoketest/backend/TraceBackend.java

@@ -43,9 +43,9 @@ public interface TraceBackend
   void close();
 
   /**
-   * The session token the launched app must emit (via {@code dd.trace.agent.test.session.token})
-   * for its traces to be attributed to this backend, or {@code null} if the backend does not scope
-   * by session (e.g. the in-process mock, which owns its own server). Overridden by the test agent.
+   * The session token the launched app must emit (via {@code dd.test.agent.session.token}) for its
+   * traces to be attributed to this backend, or {@code null} if the backend does not scope by
+   * session (e.g. the in-process mock, which owns its own server). Overridden by the test agent.
    */
   default String sessionToken() {
     return null;