Merge pull request #2814 from DataDog/regex-fix

DataDog · Jul 25, 2023 · defd6bc · defd6bc
2 parents fa2d8a8 + 97390e5
commit defd6bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/datadog/core/utils/network.rb b/lib/datadog/core/utils/network.rb
@@ -101,7 +101,7 @@ def strip_zone_specifier(ipv6)
           end
 
           def strip_ipv6_port(ip)
-            if /\[(.*)\](?::\d+)?/ =~ ip
+            if /\[([^\]]*+)\](?::\d+)?/ =~ ip
               Regexp.last_match(1)
             else
               ip

diff --git a/lib/datadog/tracing/distributed/trace_context.rb b/lib/datadog/tracing/distributed/trace_context.rb
@@ -337,7 +337,7 @@ def parse_priority_sampling(sampled, sampling_priority)
         end
 
         def split_tracestate(tracestate)
-          tracestate.split(/[ \t]*,[ \t]*/)[0..31]
+          tracestate.split(/[ \t]*+,[ \t]*+/)[0..31]
         end
 
         # Version 0xFF is invalid as per spec