diff --git a/lib/datadog/statsd/serialization/tag_serializer.rb b/lib/datadog/statsd/serialization/tag_serializer.rb index 95860df5..e464bdad 100644 --- a/lib/datadog/statsd/serialization/tag_serializer.rb +++ b/lib/datadog/statsd/serialization/tag_serializer.rb @@ -59,7 +59,7 @@ def to_tags_list(tags) case tags when Hash tags.map do |name, value| - if value + if !value.nil? && !value.to_s.nil? escape_tag_content("#{name}:#{value}") else escape_tag_content(name) diff --git a/spec/statsd/serialization/tag_serializer_spec.rb b/spec/statsd/serialization/tag_serializer_spec.rb index d45be5f4..a07b27b0 100644 --- a/spec/statsd/serialization/tag_serializer_spec.rb +++ b/spec/statsd/serialization/tag_serializer_spec.rb @@ -139,6 +139,20 @@ expect(subject.format([tag])).to eq 'node:storage' end + it 'ignores nil values and formats all other falsy values correctly' do + message_tags_hash = { + empty_array: [], + missing: nil, + 'empty_hash' => {}, + blank: '', + :false_value => false, + 'results in blank': double('some tag', to_s: ''), + 'results in nil': double('some tag', to_s: nil), + } + + expect(subject.format(message_tags_hash)).to eq 'empty_array:[],missing,empty_hash:{},blank:,false_value:false,results in blank:,results in nil' + end + it 'formats frozen tags correctly' do expect(subject.format(['name:foobarfoo'.freeze])).to eq 'name:foobarfoo' end