opentelemetry-instrumentation-dalli 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a03bb39395524af8921632daeed21a0b8f9683051a4c3ce26f828a9b90f218a2
-  data.tar.gz: 2f71e04fc5e8c8fe70b5cbec2271d27fe1b229e768e246167ab1b7aa2468dbfa
+  metadata.gz: adb6533b877bcebab4922d8bbe8f6bb83d2cef7ff703d1b7887da25750088da1
+  data.tar.gz: fa04f75d4a15e816aaa64e1dbc27d4bd5f5ffc1d95865b8e6cdf85eaae4e36cc
 SHA512:
-  metadata.gz: bab5523d76836212672a88df71a6b880fe4cd001413889d8ad7e6cd5d217b65023c01e854ce4a72a54079e4bc624520499a5fcc8aa34efb8caab7959068d5dcf
-  data.tar.gz: 0222dc555abaa399a720d5996317a3fd93a09e55d0991164e64d3fc03b99177738576d284cc88aba5efd823f31342b9549101a8f4f24a102dbdccdd9be3fb81c
+  metadata.gz: c2669bad540514cb631adc1ec46a22665934daa4ee62e1471eea1825e5855ac3a97112fdf6c56893ba5415d1ead3e9fd4cb17c4e983e0bb25929a7ea861d55be
+  data.tar.gz: e0c5e748e0b283ff787d0cd186d12449969a76cd1608cbd3bf252ba9caa52f790cfde31c2711414d28625f042f2328d28ec5c6467d3d5e1921646c53ce2751b0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release History: opentelemetry-instrumentation-dalli
 
+### v0.20.0 / 2021-12-01
+
+* ADDED: Add dalli obfuscation for db_statement 
+* FIXED: Resolve Dalli::Server deprecation in 3.0+ 
+
 ### v0.19.1 / 2021-09-29
 
 * (No significant changes)

data/lib/opentelemetry/instrumentation/dalli/instrumentation.rb

@@ -20,7 +20,7 @@ module OpenTelemetry
         end
 
         option :peer_service, default: nil, validate: :string
-        option :db_statement, default: :include, validate: ->(opt) { %I[omit include].include?(opt) }
+        option :db_statement, default: :include, validate: ->(opt) { %I[omit obfuscate include].include?(opt) }
 
         private
 
@@ -30,7 +30,11 @@ module OpenTelemetry
         end
 
         def add_patches
-          ::Dalli::Server.prepend(Patches::Server)
+          if Gem::Version.new(::Dalli::VERSION) < Gem::Version.new('3.0.0')
+            ::Dalli::Server.prepend(Patches::Server)
+          else
+            ::Dalli::Protocol::Binary.prepend(Patches::Server)
+          end
         end
       end
     end

data/lib/opentelemetry/instrumentation/dalli/patches/server.rb

@@ -8,7 +8,7 @@ module OpenTelemetry
   module Instrumentation
     module Dalli
       module Patches
-        # Module to prepend to Dalli::Server for instrumentation
+        # Module to prepend to Dalli::Server (or Dalli::Protocol::Binary in 3.0+) for instrumentation
         module Server
           def request(op, *args)
             operation = Utils.opname(op, multi?)
@@ -17,7 +17,12 @@ module OpenTelemetry
               'net.peer.name' => hostname,
               'net.peer.port' => port
             }
-            attributes['db.statement'] = Utils.format_command(operation, args) if config[:db_statement] == :include
+            if config[:db_statement] == :include
+              attributes['db.statement'] = Utils.format_command(operation, args)
+            elsif config[:db_statement] == :obfuscate
+              attributes['db.statement'] = "#{operation} ?"
+            end
+
             attributes['peer.service'] = config[:peer_service] if config[:peer_service]
             tracer.in_span(operation, attributes: attributes, kind: :client) do
               super

data/lib/opentelemetry/instrumentation/dalli/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Dalli
-      VERSION = '0.19.1'
+      VERSION = '0.20.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-dalli
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: 0.19.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: 0.19.3
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-base
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.3
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.3
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +84,14 @@ dependencies:
   name: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
@@ -200,10 +200,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-dalli/v0.19.1/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-dalli/v0.20.0/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/dalli
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-dalli/v0.19.1
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-dalli/v0.20.0
 post_install_message: 
 rdoc_options: []
 require_paths: