Merge remote-tracking branch 'origin/main' into glopes/rem-cfg

Author: cataphract

.github/CODEOWNERS

@@ -0,0 +1,5 @@
+# Automatically assign the team as a reviewer.
+# https://help.github.com/en/articles/about-code-owners
+
+# Default owners, overridden by file/directory specific owners below
+* @DataDog/dd-trace-cpp

.github/pull_request_template.md

@@ -0,0 +1,16 @@
+# Description
+
+# Motivation
+
+# Additional Notes
+
+Jira ticket: [PROJ-IDENT]
+
+<!--
+# Opening vs Drafting a PR:
+When opening a pull request, please open it as a draft to not auto assign reviewers before you feel the pull request is in a reviewable state.
+
+# Linking a JIRA ticket:
+Please link your JIRA ticket by adding its identifier between brackets (ex [PROJ-IDENT]) in the PR description, not the title.
+This requirement only applies to Datadog employees.
+-->

examples/http-server/common/tracingutil.h

@@ -16,7 +16,12 @@ class HeaderWriter final : public datadog::tracing::DictWriter {
   explicit HeaderWriter(httplib::Headers& headers) : headers_(headers) {}
 
   void set(std::string_view key, std::string_view value) override {
-    headers_.emplace(key, value);
+    auto found = headers_.find(std::string(key));
+    if (found == headers_.cend()) {
+      headers_.emplace(key, value);
+    } else {
+      found->second = value;
+    }
   }
 };
 

examples/http-server/proxy/proxy.cpp

@@ -49,37 +49,38 @@ int main() {
   auto forward_handler = [&tracer, &upstream_client](
                              const httplib::Request& req,
                              httplib::Response& res) {
-    auto span = tracer.create_span();
-    span.set_name("forward.request");
-    span.set_resource_name(req.method + " " + req.path);
-    span.set_tag("network.origin.ip", req.remote_addr);
-    span.set_tag("network.origin.port", std::to_string(req.remote_port));
-    span.set_tag("http.url_details.path", req.target);
-    span.set_tag("http.route", req.path);
-    span.set_tag("http.method", req.method);
+    tracingutil::HeaderReader reader(req.headers);
+    auto span = tracer.extract_or_create_span(reader);
+    span->set_name("forward.request");
+    span->set_resource_name(req.method + " " + req.path);
+    span->set_tag("network.origin.ip", req.remote_addr);
+    span->set_tag("network.origin.port", std::to_string(req.remote_port));
+    span->set_tag("http.url_details.path", req.target);
+    span->set_tag("http.route", req.path);
+    span->set_tag("http.method", req.method);
 
     httplib::Error er;
     httplib::Request forward_request(req);
     forward_request.path = req.target;
 
     tracingutil::HeaderWriter writer(forward_request.headers);
-    span.inject(writer);
+    span->inject(writer);
 
     upstream_client.send(forward_request, res, er);
     if (er != httplib::Error::Success) {
       res.status = 500;
-      span.set_error_message(httplib::to_string(er));
+      span->set_error_message(httplib::to_string(er));
       std::cerr << "Error occurred while proxying request: " << req.target
                 << "\n";
     } else {
       tracingutil::HeaderReader reader(res.headers);
-      auto status = span.read_sampling_delegation_response(reader);
+      auto status = span->read_sampling_delegation_response(reader);
       if (auto error = status.if_error()) {
         std::cerr << error << "\n";
       }
     }
 
-    span.set_tag("http.status_code", std::to_string(res.status));
+    span->set_tag("http.status_code", std::to_string(res.status));
   };
 
   httplib::Server server;

src/datadog/extracted_data.h

@@ -23,6 +23,10 @@ struct ExtractedData {
   bool delegate_sampling_decision = false;
   Optional<int> sampling_priority;
   // If this `ExtractedData` was created on account of `PropagationStyle::W3C`,
+  // then `datadog_w3c_parent_id` contains the parts of the "tracestate"
+  // refering to the latest datadog parent ID.
+  Optional<std::string> datadog_w3c_parent_id;
+  // If this `ExtractedData` was created on account of `PropagationStyle::W3C`,
   // then `additional_w3c_tracestate` contains the parts of the "tracestate"
   // header that are not the "dd" (Datadog) entry. If there are no other parts,
   // then `additional_w3c_tracestate` is null.

src/datadog/extraction_util.cpp

@@ -295,6 +295,7 @@ ExtractedData merge(const std::vector<ExtractedData>& contexts) {
       });
 
   if (other != contexts.end()) {
+    result.datadog_w3c_parent_id = other->datadog_w3c_parent_id;
     result.additional_w3c_tracestate = other->additional_w3c_tracestate;
     result.additional_datadog_w3c_tracestate =
         other->additional_datadog_w3c_tracestate;

src/datadog/glob.cpp

@@ -1,5 +1,6 @@
 #include "glob.h"
 
+#include <cctype>
 #include <cstdint>
 
 namespace datadog {
@@ -18,8 +19,11 @@ bool glob_match(StringView pattern, StringView subject) {
   Index next_p = 0;  // next [p]attern index
   Index next_s = 0;  // next [s]ubject index
 
-  while (p < pattern.size() || s < subject.size()) {
-    if (p < pattern.size()) {
+  const size_t p_size = pattern.size();
+  const size_t s_size = subject.size();
+
+  while (p < p_size || s < s_size) {
+    if (p < p_size) {
       const char pattern_char = pattern[p];
       switch (pattern_char) {
         case '*':
@@ -30,22 +34,22 @@ bool glob_match(StringView pattern, StringView subject) {
           ++p;
           continue;
         case '?':
-          if (s < subject.size()) {
+          if (s < s_size) {
             ++p;
             ++s;
             continue;
           }
           break;
         default:
-          if (s < subject.size() && subject[s] == pattern_char) {
+          if (s < s_size && tolower(subject[s]) == tolower(pattern_char)) {
             ++p;
             ++s;
             continue;
           }
       }
     }
     // Mismatch.  Maybe restart.
-    if (0 < next_s && next_s <= subject.size()) {
+    if (0 < next_s && next_s <= s_size) {
       p = next_p;
       s = next_s;
       continue;

src/datadog/parse_util.h

@@ -2,6 +2,7 @@
 
 // This component provides parsing-related miscellanea.
 
+#include <cstdint>
 #include <string>
 #include <unordered_map>
 #include <vector>

src/datadog/tags.cpp

@@ -1,7 +1,5 @@
 #include "tags.h"
 
-#include "string_util.h"
-
 namespace datadog {
 namespace tracing {
 namespace tags {
@@ -32,11 +30,10 @@ const std::string process_id = "process_id";
 const std::string language = "language";
 const std::string runtime_id = "runtime-id";
 const std::string sampling_decider = "_dd.is_sampling_decider";
+const std::string w3c_parent_id = "_dd.parent_id";
 
 }  // namespace internal
 
-bool is_internal(StringView tag_name) { return starts_with(tag_name, "_dd."); }
-
 }  // namespace tags
 }  // namespace tracing
 }  // namespace datadog

src/datadog/tags.h

@@ -5,6 +5,7 @@
 
 #include <string>
 
+#include "string_util.h"
 #include "string_view.h"
 
 namespace datadog {
@@ -36,11 +37,14 @@ extern const std::string process_id;
 extern const std::string language;
 extern const std::string runtime_id;
 extern const std::string sampling_decider;
+extern const std::string w3c_parent_id;
 }  // namespace internal
 
 // Return whether the specified `tag_name` is reserved for use internal to this
 // library.
-bool is_internal(StringView tag_name);
+inline bool is_internal(StringView tag_name) {
+  return starts_with(tag_name, "_dd.");
+}
 
 }  // namespace tags
 }  // namespace tracing

src/datadog/trace_segment.cpp

@@ -418,10 +418,11 @@ bool TraceSegment::inject(DictWriter& writer, const SpanData& span,
         writer.set(
             "traceparent",
             encode_traceparent(span.trace_id, span.span_id, sampling_priority));
-        writer.set("tracestate",
-                   encode_tracestate(sampling_priority, origin_, trace_tags,
-                                     additional_datadog_w3c_tracestate_,
-                                     additional_w3c_tracestate_));
+        writer.set(
+            "tracestate",
+            encode_tracestate(span.span_id, sampling_priority, origin_,
+                              trace_tags, additional_datadog_w3c_tracestate_,
+                              additional_w3c_tracestate_));
         break;
       default:
         assert(style == PropagationStyle::NONE);

src/datadog/tracer.cpp

@@ -175,7 +175,7 @@ Expected<Span> Tracer::extract_span(const DictReader& reader,
   }
 
   auto [trace_id, parent_id, origin, trace_tags, delegate_sampling_decision,
-        sampling_priority, additional_w3c_tracestate,
+        sampling_priority, datadog_w3c_parent_id, additional_w3c_tracestate,
         additional_datadog_w3c_tracestate, style, headers_examined] =
       merge(extracted_contexts);
 
@@ -277,6 +277,10 @@ Expected<Span> Tracer::extract_span(const DictReader& reader,
     }
   }
 
+  if (datadog_w3c_parent_id) {
+    span_data->tags[tags::internal::w3c_parent_id] = *datadog_w3c_parent_id;
+  }
+
   Optional<SamplingDecision> sampling_decision;
   if (sampling_priority) {
     SamplingDecision decision;

src/datadog/w3c_propagation.cpp

@@ -221,6 +221,14 @@ void parse_datadog_tracestate(ExtractedData& result, StringView datadog_value) {
           (*result.sampling_priority > 0) == (priority > 0)) {
         result.sampling_priority = priority;
       }
+    } else if (key == "p") {
+      if (value.size() != 16) {
+        // chaff!
+        pair_begin = pair_end == end ? end : pair_end + 1;
+        continue;
+      }
+
+      result.datadog_w3c_parent_id = std::string(value);
     } else if (starts_with(key, "t.")) {
       // The part of the key that follows "t." is the name of a trace tag,
       // except without the "_dd.p." prefix.
@@ -300,6 +308,7 @@ Expected<ExtractedData> extract_w3c(
     return result;
   }
 
+  result.datadog_w3c_parent_id = "0000000000000000";
   extract_tracestate(result, headers);
 
   return result;
@@ -326,11 +335,14 @@ std::string encode_traceparent(TraceID trace_id, std::uint64_t span_id,
 }
 
 std::string encode_datadog_tracestate(
-    int sampling_priority, const Optional<std::string>& origin,
+    uint64_t span_id, int sampling_priority,
+    const Optional<std::string>& origin,
     const std::vector<std::pair<std::string, std::string>>& trace_tags,
     const Optional<std::string>& additional_datadog_w3c_tracestate) {
   std::string result = "dd=s:";
   result += std::to_string(sampling_priority);
+  result += ";p:";
+  result += hex_padded(span_id);
 
   if (origin) {
     result += ";o:";
@@ -382,12 +394,14 @@ std::string encode_datadog_tracestate(
 }
 
 std::string encode_tracestate(
-    int sampling_priority, const Optional<std::string>& origin,
+    uint64_t span_id, int sampling_priority,
+    const Optional<std::string>& origin,
     const std::vector<std::pair<std::string, std::string>>& trace_tags,
     const Optional<std::string>& additional_datadog_w3c_tracestate,
     const Optional<std::string>& additional_w3c_tracestate) {
-  std::string result = encode_datadog_tracestate(
-      sampling_priority, origin, trace_tags, additional_datadog_w3c_tracestate);
+  std::string result =
+      encode_datadog_tracestate(span_id, sampling_priority, origin, trace_tags,
+                                additional_datadog_w3c_tracestate);
 
   if (additional_w3c_tracestate) {
     result += ',';

src/datadog/w3c_propagation.h

@@ -37,7 +37,8 @@ std::string encode_traceparent(TraceID trace_id, std::uint64_t span_id,
 
 // Return a value for the "tracestate" header containing the specified fields.
 std::string encode_tracestate(
-    int sampling_priority, const Optional<std::string>& origin,
+    uint64_t span_id, int sampling_priority,
+    const Optional<std::string>& origin,
     const std::vector<std::pair<std::string, std::string>>& trace_tags,
     const Optional<std::string>& additional_datadog_w3c_tracestate,
     const Optional<std::string>& additional_w3c_tracestate);

test/test_glob.cpp

@@ -8,7 +8,7 @@
 
 using namespace datadog::tracing;
 
-TEST_CASE("glob") {
+TEST_CASE("glob", "[glob]") {
   struct TestCase {
     StringView pattern;
     StringView subject;
@@ -42,7 +42,13 @@ TEST_CASE("glob") {
     {"", "", true},
     {"", "a", false},
     {"*", "", true},
-    {"?", "", false}
+    {"?", "", false},
+
+    // case sensitivity
+    {"true", "TRUE", true},
+    {"true", "True", true},
+    {"true", "tRue", true},
+    {"false", "FALSE", true}
   }));
   // clang-format on