Merge pull request #4530 from DataDog/munir/update-ddtags

fix(global_tags): update ddtags to align with other sdks

Author: mabdinur

lib/datadog/core/configuration/settings.rb

@@ -619,38 +619,31 @@ def initialize(*_)
           o.type :hash, nilable: true
           o.env [Core::Environment::Ext::ENV_TAGS, Core::Environment::Ext::ENV_OTEL_RESOURCE_ATTRIBUTES]
           o.env_parser do |env_value|
-            values = if env_value.include?(',')
-                       env_value.split(',')
-                     else
-                       env_value.split(' ') # rubocop:disable Style/RedundantArgument
-                     end
-            values.map! do |v|
-              v.gsub!(/\A[\s,]*|[\s,]*\Z/, '')
-
-              v.empty? ? nil : v
-            end
-
-            values.compact!
-            values.each_with_object({}) do |tag, tags|
-              key, value = tag.split(':', 2)
-              if value.nil?
-                # support tags/attributes delimited by the OpenTelemetry separator (`=`)
-                key, value = tag.split('=', 2)
-              end
-              next if value.nil? || value.empty?
-
-              # maps OpenTelemetry semantic attributes to Datadog tags
-              case key.downcase
-              when 'deployment.environment'
-                tags['env'] = value
-              when 'service.version'
-                tags['version'] = value
-              when 'service.name'
-                tags['service'] = value
-              else
-                tags[key] = value
+            # Parses a string containing key-value pairs and returns a hash.
+            # Key-value pairs are delimited by ':' OR `=`, and pairs are separated by whitespace, comma, OR BOTH.
+            result = {}
+            unless env_value.nil? || env_value.empty?
+              # falling back to comma as separator
+              sep = env_value.include?(',') ? ',' : ' '
+              # split by separator
+              env_value.split(sep).each do |tag|
+                tag.strip!
+                next if tag.empty?
+
+                # tag by : or = (for OpenTelemetry)
+                key, val = tag.split(/[:=]/, 2).map(&:strip)
+                val ||= ''
+                # maps OpenTelemetry semantic attributes to Datadog tags
+                key = case key.downcase
+                      when 'deployment.environment' then 'env'
+                      when 'service.version' then 'version'
+                      when 'service.name' then 'service'
+                      else key
+                      end
+                result[key] = val unless key.empty?
               end
             end
+            result
           end
           o.setter do |new_value, old_value|
             raw_tags = new_value || {}

spec/datadog/core/configuration/settings_spec.rb

@@ -1095,7 +1095,7 @@
         it { is_expected.to include('a' => '1', 'b' => '2') }
 
         context 'with an invalid tag' do
-          ['', 'a', ':', ',', 'a:'].each do |invalid_tag|
+          ['', ':', ','].each do |invalid_tag|
             context "when tag is #{invalid_tag.inspect}" do
               let(:env_tags) { invalid_tag }
 
@@ -1104,6 +1104,15 @@
           end
         end
 
+        context 'with no seperator' do
+          ['key', 'key:', 'key: '].each do |tag|
+            context "when tag is #{tag.inspect}" do
+              let(:env_tags) { tag }
+              it { is_expected.to eq({ 'key' => '' }) }
+            end
+          end
+        end
+
         context 'with multiple colons' do
           let(:env_tags) { 'key:va:lue' }