fix: address review feedback from xlamorlette

- Rename constructor params to match member names
- Rename rid to session_rid in session header tests
- Use 3-param TracerSignature constructor where root_session == runtime_id

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: khanayan123

include/datadog/tracer_signature.h

@@ -41,15 +41,17 @@ struct TracerSignature {
   StringView library_language_version;
 
   TracerSignature() = delete;
-  TracerSignature(RuntimeID id, std::string service, std::string environment)
-      : TracerSignature(id, id.string(), std::move(service),
-                        std::move(environment)) {}
-  TracerSignature(RuntimeID id, std::string root_session, std::string service,
-                  std::string environment)
-      : runtime_id(id),
-        root_session_id(std::move(root_session)),
-        default_service(std::move(service)),
-        default_environment(std::move(environment)),
+  TracerSignature(RuntimeID runtime_id, std::string default_service,
+                  std::string default_environment)
+      : TracerSignature(runtime_id, runtime_id.string(),
+                        std::move(default_service),
+                        std::move(default_environment)) {}
+  TracerSignature(RuntimeID runtime_id, std::string root_session_id,
+                  std::string default_service, std::string default_environment)
+      : runtime_id(runtime_id),
+        root_session_id(std::move(root_session_id)),
+        default_service(std::move(default_service)),
+        default_environment(std::move(default_environment)),
         library_version(tracer_version),
         library_language("cpp"),
         library_language_version(DD_TRACE_STRINGIFY(__cplusplus), 6) {}

test/remote_config/test_remote_config.cpp

@@ -48,11 +48,7 @@ auto logger = std::make_shared<NullLogger>();
 REMOTE_CONFIG_TEST("initial state payload") {
   // Verify the initial payload structure for a remote configuration instance.
   auto runtime_id = RuntimeID::generate();
-  const TracerSignature tracer_signature{
-      /* runtime_id = */ runtime_id,
-      /* root_session_id = */ runtime_id.string(),
-      /* service = */ "testsvc",
-      /* environment = */ "test"};
+  const TracerSignature tracer_signature{runtime_id, "testsvc", "test"};
 
   auto tracing_listener = std::make_shared<FakeListener>();
   tracing_listener->products = rc::product::APM_TRACING;
@@ -95,11 +91,7 @@ REMOTE_CONFIG_TEST("initial state payload") {
 
 REMOTE_CONFIG_TEST("response processing") {
   auto runtime_id = RuntimeID::generate();
-  const TracerSignature tracer_signature{
-      /* runtime_id = */ runtime_id,
-      /* root_session_id = */ runtime_id.string(),
-      /* service = */ "testsvc",
-      /* environment = */ "test"};
+  const TracerSignature tracer_signature{runtime_id, "testsvc", "test"};
 
   SECTION("ill formatted input",
           "inputs not following the Remote Configuration JSON schema should "

test/telemetry/test_telemetry.cpp

@@ -103,11 +103,7 @@ TELEMETRY_IMPLEMENTATION_TEST("Tracer telemetry lifecycle") {
   auto scheduler = std::make_shared<FakeEventScheduler>();
 
   auto runtime_id = RuntimeID::generate();
-  const TracerSignature tracer_signature{
-      /* runtime_id = */ runtime_id,
-      /* root_session_id = */ runtime_id.string(),
-      /* service = */ "testsvc",
-      /* environment = */ "test"};
+  const TracerSignature tracer_signature{runtime_id, "testsvc", "test"};
 
   auto url = HTTPClient::URL::parse("http://localhost:8000");
 
@@ -375,41 +371,43 @@ TELEMETRY_IMPLEMENTATION_TEST("session ID headers") {
   auto url = HTTPClient::URL::parse("http://localhost:8000");
 
   SECTION("root process: DD-Session-ID present, DD-Root-Session-ID absent") {
-    auto rid = RuntimeID::generate();
-    const TracerSignature sig{rid, rid.string(), "testsvc", "test"};
+    auto session_rid = RuntimeID::generate();
+    const TracerSignature sig{session_rid, "testsvc", "test"};
 
     Telemetry telemetry{*finalize_config(), sig, logger, client,
                         scheduler,          *url};
 
     auto it = client->request_headers.items.find("DD-Session-ID");
     REQUIRE(it != client->request_headers.items.end());
-    CHECK(it->second == rid.string());
+    CHECK(it->second == session_rid.string());
 
     CHECK(client->request_headers.items.find("DD-Root-Session-ID") ==
           client->request_headers.items.end());
   }
 
   SECTION("child process: DD-Root-Session-ID present when different") {
-    auto rid = RuntimeID::generate();
+    auto session_rid = RuntimeID::generate();
     auto root_rid = RuntimeID::generate();
-    const TracerSignature sig{rid, root_rid.string(), "testsvc", "test"};
+    const TracerSignature sig{session_rid, root_rid.string(), "testsvc",
+                              "test"};
 
     Telemetry telemetry{*finalize_config(), sig, logger, client,
                         scheduler,          *url};
 
     auto session_it = client->request_headers.items.find("DD-Session-ID");
     REQUIRE(session_it != client->request_headers.items.end());
-    CHECK(session_it->second == rid.string());
+    CHECK(session_it->second == session_rid.string());
 
     auto root_it = client->request_headers.items.find("DD-Root-Session-ID");
     REQUIRE(root_it != client->request_headers.items.end());
     CHECK(root_it->second == root_rid.string());
   }
 
   SECTION("heartbeat includes session headers") {
-    auto rid = RuntimeID::generate();
+    auto session_rid = RuntimeID::generate();
     auto root_rid = RuntimeID::generate();
-    const TracerSignature sig{rid, root_rid.string(), "testsvc", "test"};
+    const TracerSignature sig{session_rid, root_rid.string(), "testsvc",
+                              "test"};
 
     Telemetry telemetry{*finalize_config(), sig, logger, client,
                         scheduler,          *url};
@@ -419,7 +417,7 @@ TELEMETRY_IMPLEMENTATION_TEST("session ID headers") {
 
     auto session_it = client->request_headers.items.find("DD-Session-ID");
     REQUIRE(session_it != client->request_headers.items.end());
-    CHECK(session_it->second == rid.string());
+    CHECK(session_it->second == session_rid.string());
 
     auto root_it = client->request_headers.items.find("DD-Root-Session-ID");
     REQUIRE(root_it != client->request_headers.items.end());
@@ -439,11 +437,7 @@ TELEMETRY_IMPLEMENTATION_TEST("Tracer telemetry API") {
   auto scheduler = std::make_shared<FakeEventScheduler>();
 
   auto runtime_id = RuntimeID::generate();
-  const TracerSignature tracer_signature{
-      /* runtime_id = */ runtime_id,
-      /* root_session_id = */ runtime_id.string(),
-      /* service = */ "testsvc",
-      /* environment = */ "test"};
+  const TracerSignature tracer_signature{runtime_id, "testsvc", "test"};
 
   auto url = HTTPClient::URL::parse("http://localhost:8000");
 
@@ -1045,11 +1039,7 @@ TELEMETRY_IMPLEMENTATION_TEST("Tracer telemetry configuration") {
   auto scheduler = std::make_shared<FakeEventScheduler>();
 
   auto runtime_id = RuntimeID::generate();
-  const TracerSignature tracer_signature{
-      /* runtime_id = */ runtime_id,
-      /* root_session_id = */ runtime_id.string(),
-      /* service = */ "testsvc",
-      /* environment = */ "test"};
+  const TracerSignature tracer_signature{runtime_id, "testsvc", "test"};
 
   auto url = HTTPClient::URL::parse("http://localhost:8000");
 

test/test_datadog_agent.cpp

@@ -200,7 +200,7 @@ DATADOG_AGENT_TEST("Remote Configuration") {
   REQUIRE(finalized);
 
   auto rid = RuntimeID::generate();
-  const TracerSignature signature(rid, rid.string(), "testsvc", "test");
+  const TracerSignature signature(rid, "testsvc", "test");
 
   // TODO: set telemetry mock
   auto config_manager = std::make_shared<ConfigManager>(*finalized);