Add DD_TAGS colon edge case test (#248)

jybp · dgoffredo · web-flow · commit 515c445964eb · 2022-10-04T12:17:12.000-04:00
* Add colon edge case

* teach catch2 how to print a pair of strings

* the first key/value separator is skipped, but no subsequent ones

* flat is better than nested

Co-authored-by: David Goffredo &lt;david.goffredo@datadoghq.com&gt;
diff --git a/src/tracer_options.cpp b/src/tracer_options.cpp
@@ -68,7 +68,7 @@ std::map<std::string, std::string> keyvalues(std::string text, char itemsep, cha
       keyfound = false;
       continue;
     }
-    if (ch == itemsep) {
+    if (ch == itemsep && !keyfound) {
       keyfound = true;
       continue;
     }
diff --git a/test/tracer_options_test.cpp b/test/tracer_options_test.cpp
@@ -21,6 +21,15 @@ std::ostream &operator<<(std::ostream &stream,
 }  // namespace opentracing
 }  // namespace datadog
 
+namespace std {
+
+std::ostream &operator<<(std::ostream &stream,
+                         const std::pair<const std::string, std::string> &key_value) {
+  return stream << key_value.first << " → " << key_value.second;
+}
+
+}  // namespace std
+
 void requireTracerOptionsResultsMatch(const ot::expected<TracerOptions, std::string> &lhs,
                                       const ot::expected<TracerOptions, std::string> &rhs) {
   // One is an error, the other not.
@@ -78,7 +87,7 @@ TEST_CASE("tracer options from environment variables") {
         {"DD_TRACE_REPORT_HOSTNAME", "true"},
         {"DD_TRACE_ANALYTICS_ENABLED", "true"},
         {"DD_TRACE_ANALYTICS_SAMPLE_RATE", "0.5"},
-        {"DD_TAGS", "host:my-host-name,region:us-east-1,datacenter:us,partition:5"},
+        {"DD_TAGS", "host:my-host-name,region:us-east-1,datacenter:us,a.b_c:a:b,partition:5"},
         {"DD_TRACE_RATE_LIMIT", "200"},
         {"DD_TRACE_SAMPLE_RATE", "0.7"}},
        TracerOptions{
@@ -101,6 +110,7 @@ TEST_CASE("tracer options from environment variables") {
                {"host", "my-host-name"},
                {"region", "us-east-1"},
                {"datacenter", "us"},
+               {"a.b_c", "a:b"},
                {"partition", "5"},
            },                                 // tags
            "test-version v0.0.1",             // version

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ std::map<std::string, std::string> keyvalues(std::string text, char itemsep, cha`
`68`	`68`	`keyfound = false;`
`69`	`69`	`continue;`
`70`	`70`	`}`
`71`		`- if (ch == itemsep) {`
	`71`	`+ if (ch == itemsep && !keyfound) {`
`72`	`72`	`keyfound = true;`
`73`	`73`	`continue;`
`74`	`74`	`}`