dogstatsd-ruby 5.6.1 → 5.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8069234fd7b43382f85606fa53a858c502025937168c275347a0ec5552f566fc
-  data.tar.gz: 81945812b5810033cc2f511364d3a962a1c932e771d4faa2a4366391fe447414
+  metadata.gz: fb5fc01f7ac477b0d99986331aba69b1556b2160246ff379a60f394be8fb0968
+  data.tar.gz: fc254d901ec1071acbef8fa724e30f54b0fd4c65592a726e68805ea484c54811
 SHA512:
-  metadata.gz: 5b589a6f599dc547f980587c8902eed4012b4d627fd6abe28c21829f299ee695e33f38f2fe386fb3d9f7828327134f69831f0365ee4ff16d84b7de3830178081
-  data.tar.gz: 05cb95baf12dbe3b2f17c835c8278f32198ce21d2d66ca14b4714aa90a12dd6a4976c48e9d9f326ca51cc66d95c83dd269e55aa6fe6e08409c61cec8866a9798
+  metadata.gz: 719c9f76ce1cc501fddff67f3e563eec94d612c40b8b29aa93bed1c270bc4d6d785eed088d5f4df513034f4eff38b1c1e67f2538c86372b07f353f29f6f0a18c
+  data.tar.gz: 7b2812a927a160ec0452e3366ed0eed9166ec95ecf88dc8ab325726d18e60d683d8bfb75845608f1e025a6af80871acd8a6e4d16a08c4d21c749731b1d327643

data/README.md

@@ -226,7 +226,7 @@ As much as possible, we will add a "future deprecation" message in the minor rel
 
 ## Ruby Versions
 
-This gem supports and is tested on Ruby minor versions 2.1 through 3.1.
+This gem supports and is tested on Ruby minor versions 2.1 through 3.3.
 Support for Ruby 2.0 was dropped in version 5.4.0.
 
 ## Credits

data/lib/datadog/statsd/message_buffer.rb

@@ -28,7 +28,8 @@ module Datadog
         # Serializes the message if it hasn't been already. Part of the
         # delay_serialization feature.
         if message.is_a?(Array)
-          message = @serializer.to_stat(*message[0], **message[1])
+          stat, delta, type, tags, sample_rate = message
+          message = @serializer.to_stat(stat, delta, type, tags: tags, sample_rate: sample_rate)
         end
 
         message_size = message.bytesize

data/lib/datadog/statsd/serialization/stat_serializer.rb

@@ -10,20 +10,20 @@ module Datadog
           @tag_serializer = TagSerializer.new(global_tags)
         end
 
-        def format(name, delta, type, tags: [], sample_rate: 1)
-          name = formated_name(name)
+        def format(metric_name, delta, type, tags: [], sample_rate: 1)
+          metric_name = formatted_metric_name(metric_name)
 
           if sample_rate != 1
             if tags_list = tag_serializer.format(tags)
-              "#{@prefix_str}#{name}:#{delta}|#{type}|@#{sample_rate}|##{tags_list}"
+              "#{@prefix_str}#{metric_name}:#{delta}|#{type}|@#{sample_rate}|##{tags_list}"
             else
-              "#{@prefix_str}#{name}:#{delta}|#{type}|@#{sample_rate}"
+              "#{@prefix_str}#{metric_name}:#{delta}|#{type}|@#{sample_rate}"
             end
           else
             if tags_list = tag_serializer.format(tags)
-              "#{@prefix_str}#{name}:#{delta}|#{type}|##{tags_list}"
+              "#{@prefix_str}#{metric_name}:#{delta}|#{type}|##{tags_list}"
             else
-              "#{@prefix_str}#{name}:#{delta}|#{type}"
+              "#{@prefix_str}#{metric_name}:#{delta}|#{type}"
             end
           end
         end
@@ -37,17 +37,18 @@ module Datadog
         attr_reader :prefix
         attr_reader :tag_serializer
 
-        def formated_name(name)
-          if name.is_a?(String)
-            # DEV: gsub is faster than dup.gsub!
-            formated = name.gsub('::', '.')
+        def formatted_metric_name(metric_name)
+          formatted = Symbol === metric_name ? metric_name.name : metric_name.to_s
+
+          if formatted.include?('::')
+            formatted = formatted.gsub('::', '.')
+            formatted.tr!(':|@', '_')
+            formatted
+          elsif formatted.include?(':') || formatted.include?('@') || formatted.include?('|')
+            formatted.tr(':|@', '_')
           else
-            formated = name.to_s
-            formated.gsub!('::', '.')
+            formatted
           end
-
-          formated.tr!(':|@', '_')
-          formated
         end
       end
     end

data/lib/datadog/statsd/serialization/tag_serializer.rb

@@ -73,7 +73,9 @@ module Datadog
         end
 
         def escape_tag_content(tag)
-          tag.to_s.delete('|,')
+          tag = tag.to_s
+          return tag unless tag.include?('|')
+          tag.delete('|,')        
         end
 
         def dd_tags(env = ENV)

data/lib/datadog/statsd/version.rb

@@ -4,6 +4,6 @@ require_relative 'connection'
 
 module Datadog
   class Statsd
-    VERSION = '5.6.1'
+    VERSION = '5.6.2'
   end
 end

data/lib/datadog/statsd.rb

@@ -431,7 +431,7 @@ module Datadog
       if sample_rate == 1 || opts[:pre_sampled] || rand <= sample_rate
         full_stat =
           if @delay_serialization
-            [[stat, delta, type], {tags: opts[:tags], sample_rate: sample_rate}]
+            [stat, delta, type, opts[:tags], sample_rate]
           else
             serializer.to_stat(stat, delta, type, tags: opts[:tags], sample_rate: sample_rate)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dogstatsd-ruby
 version: !ruby/object:Gem::Version
-  version: 5.6.1
+  version: 5.6.2
 platform: ruby
 authors:
 - Rein Henrichs
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2024-09-20 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby DogStatsd client
 email: code@datadoghq.com
@@ -44,9 +44,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/DataDog/dogstatsd-ruby/issues
-  changelog_uri: https://github.com/DataDog/dogstatsd-ruby/blob/v5.6.1/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/dogstatsd-ruby/5.6.1
-  source_code_uri: https://github.com/DataDog/dogstatsd-ruby/tree/v5.6.1
+  changelog_uri: https://github.com/DataDog/dogstatsd-ruby/blob/v5.6.2/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/dogstatsd-ruby/5.6.2
+  source_code_uri: https://github.com/DataDog/dogstatsd-ruby/tree/v5.6.2
 post_install_message: |2+
 
   If you are upgrading from v4.x of the dogstatsd-ruby library, note the major change to the threading model:
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A Ruby DogStatsd client