opentelemetry-instrumentation-sidekiq 0.20.1 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2b9c0e5fb9dfbda2920f90784bd7642eec3280fdf4e50bf1e8b6296f8fc8938
-  data.tar.gz: 9ca05b15faae6187ef51a426c5c4d05ffa70899d69e890e51d308ae96c28d798
+  metadata.gz: 1cc83ff362f5090ca035b572e3676cf85e592a8c90a91cde8d9a61aa02d0f408
+  data.tar.gz: 6c7a097d13e35658a95554455e479b12ae8089ab32569739c6a68d1eed773a19
 SHA512:
-  metadata.gz: 5528414fa31f301c0a774a1d91a112ba565ace9c8655d8cb78e65759698473e41cefd6f560c69361ae2dd47c1c0dd540300cd6259168702928e3d97a043bc567
-  data.tar.gz: b49da2359fc294292abc23dc52f495c385ebe031f7962c6a62926bd78215c18778c404899108fe5ad7bef55fdf89dc6dae3b9588bdc2d8109f3526ce0455d226
+  metadata.gz: 1c8fa0bd57e19628d70e5b0e818e37aa6f1368900cbad30407506e02e0674ca20164a65e0e393e39f583a5085691b0716c25678253b9ebeba3673acb7762aa61
+  data.tar.gz: 88de2296bf1c878158456f56e0e22f8e68c186c31128ba35e9a867d9b2237e67ed6561f2ba8a3f166f2367477f48ebca5908000bb58c0659d2277b029ff2af21

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Release History: opentelemetry-instrumentation-sidekiq
 
+### v0.21.1 / 2022-06-09
+
+* FIXED: Broken test file requirements 
+* FIXED: Make sidekiq instrumentation compatible with sidekiq 6.5.0 
+
+### v0.21.0 / 2022-05-02
+
+* ADDED: Validate Using Enums 
+* FIXED: RubyGems Fallback 
+
+### v0.20.2 / 2021-12-02
+
+* (No significant changes)
+
 ### v0.20.1 / 2021-09-29
 
 * (No significant changes)

data/lib/opentelemetry/instrumentation/sidekiq/instrumentation.rb

@@ -27,8 +27,8 @@ module OpenTelemetry
           gem_version >= MINIMUM_VERSION
         end
 
-        option :span_naming,                 default: :queue, validate: ->(opt) { %I[job_class queue].include?(opt) }
-        option :propagation_style,           default: :link,  validate: ->(opt) { %i[link child none].include?(opt) }
+        option :span_naming,                 default: :queue, validate: %I[job_class queue]
+        option :propagation_style,           default: :link,  validate: %i[link child none]
         option :trace_launcher_heartbeat,    default: false, validate: :boolean
         option :trace_poller_enqueue,        default: false, validate: :boolean
         option :trace_poller_wait,           default: false, validate: :boolean
@@ -38,7 +38,7 @@ module OpenTelemetry
         private
 
         def gem_version
-          Gem.loaded_specs['sidekiq'].version
+          Gem::Version.new(::Sidekiq::VERSION)
         end
 
         def require_dependencies

data/lib/opentelemetry/instrumentation/sidekiq/middlewares/client/tracer_middleware.rb

@@ -20,9 +20,9 @@ module OpenTelemetry
                 'messaging.destination' => job['queue'],
                 'messaging.destination_kind' => 'queue'
               }
-              attributes['peer.service'] = config[:peer_service] if config[:peer_service]
+              attributes['peer.service'] = instrumentation_config[:peer_service] if instrumentation_config[:peer_service]
 
-              span_name = case config[:span_naming]
+              span_name = case instrumentation_config[:span_naming]
                           when :job_class then "#{job['wrapped']&.to_s || job['class']} send"
                           else "#{job['queue']} send"
                           end
@@ -36,7 +36,7 @@ module OpenTelemetry
 
             private
 
-            def config
+            def instrumentation_config
               Sidekiq::Instrumentation.instance.config
             end
 

data/lib/opentelemetry/instrumentation/sidekiq/middlewares/server/tracer_middleware.rb

@@ -18,18 +18,19 @@ module OpenTelemetry
                 'messaging.sidekiq.job_class' => msg['wrapped']&.to_s || msg['class'],
                 'messaging.message_id' => msg['jid'],
                 'messaging.destination' => msg['queue'],
-                'messaging.destination_kind' => 'queue'
+                'messaging.destination_kind' => 'queue',
+                'messaging.operation' => 'process'
               }
-              attributes['peer.service'] = config[:peer_service] if config[:peer_service]
+              attributes['peer.service'] = instrumentation_config[:peer_service] if instrumentation_config[:peer_service]
 
-              span_name = case config[:span_naming]
+              span_name = case instrumentation_config[:span_naming]
                           when :job_class then "#{msg['wrapped']&.to_s || msg['class']} process"
                           else "#{msg['queue']} process"
                           end
 
               extracted_context = OpenTelemetry.propagation.extract(msg)
               OpenTelemetry::Context.with_current(extracted_context) do
-                if config[:propagation_style] == :child
+                if instrumentation_config[:propagation_style] == :child
                   tracer.in_span(span_name, attributes: attributes, kind: :consumer) do |span|
                     span.add_event('created_at', timestamp: msg['created_at'])
                     span.add_event('enqueued_at', timestamp: msg['enqueued_at'])
@@ -38,7 +39,7 @@ module OpenTelemetry
                 else
                   links = []
                   span_context = OpenTelemetry::Trace.current_span(extracted_context).context
-                  links << OpenTelemetry::Trace::Link.new(span_context) if config[:propagation_style] == :link && span_context.valid?
+                  links << OpenTelemetry::Trace::Link.new(span_context) if instrumentation_config[:propagation_style] == :link && span_context.valid?
                   span = tracer.start_root_span(span_name, attributes: attributes, links: links, kind: :consumer)
                   OpenTelemetry::Trace.with_span(span) do
                     span.add_event('created_at', timestamp: msg['created_at'])
@@ -57,7 +58,7 @@ module OpenTelemetry
 
             private
 
-            def config
+            def instrumentation_config
               Sidekiq::Instrumentation.instance.config
             end
 

data/lib/opentelemetry/instrumentation/sidekiq/patches/launcher.rb

@@ -13,9 +13,9 @@ module OpenTelemetry
           private
 
           def ❤ # rubocop:disable Naming/MethodName
-            if config[:trace_launcher_heartbeat]
+            if instrumentation_config[:trace_launcher_heartbeat]
               attributes = {}
-              attributes['peer.service'] = config[:peer_service] if config[:peer_service]
+              attributes['peer.service'] = instrumentation_config[:peer_service] if instrumentation_config[:peer_service]
               tracer.in_span('Sidekiq::Launcher#heartbeat', attributes: attributes) { super }
             else
               OpenTelemetry::Common::Utilities.untraced { super }
@@ -26,7 +26,7 @@ module OpenTelemetry
             Sidekiq::Instrumentation.instance.tracer
           end
 
-          def config
+          def instrumentation_config
             Sidekiq::Instrumentation.instance.config
           end
         end

data/lib/opentelemetry/instrumentation/sidekiq/patches/poller.rb

@@ -11,9 +11,9 @@ module OpenTelemetry
         # The Poller module contains instrumentation for the enqueue and wait methods
         module Poller
           def enqueue
-            if config[:trace_poller_enqueue]
+            if instrumentation_config[:trace_poller_enqueue]
               attributes = {}
-              attributes['peer.service'] = config[:peer_service] if config[:peer_service]
+              attributes['peer.service'] = instrumentation_config[:peer_service] if instrumentation_config[:peer_service]
               tracer.in_span('Sidekiq::Scheduled::Poller#enqueue', attributes: attributes) { super }
             else
               OpenTelemetry::Common::Utilities.untraced { super }
@@ -23,7 +23,7 @@ module OpenTelemetry
           private
 
           def wait
-            if config[:trace_poller_wait]
+            if instrumentation_config[:trace_poller_wait]
               tracer.in_span('Sidekiq::Scheduled::Poller#wait') { super }
             else
               OpenTelemetry::Common::Utilities.untraced { super }
@@ -34,7 +34,7 @@ module OpenTelemetry
             Sidekiq::Instrumentation.instance.tracer
           end
 
-          def config
+          def instrumentation_config
             Sidekiq::Instrumentation.instance.config
           end
         end

data/lib/opentelemetry/instrumentation/sidekiq/patches/processor.rb

@@ -13,9 +13,9 @@ module OpenTelemetry
           private
 
           def process_one
-            if config[:trace_processor_process_one]
+            if instrumentation_config[:trace_processor_process_one]
               attributes = {}
-              attributes['peer.service'] = config[:peer_service] if config[:peer_service]
+              attributes['peer.service'] = instrumentation_config[:peer_service] if instrumentation_config[:peer_service]
               tracer.in_span('Sidekiq::Processor#process_one', attributes: attributes) { super }
             else
               OpenTelemetry::Common::Utilities.untraced { super }
@@ -26,7 +26,7 @@ module OpenTelemetry
             Sidekiq::Instrumentation.instance.tracer
           end
 
-          def config
+          def instrumentation_config
             Sidekiq::Instrumentation.instance.config
           end
         end

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Sidekiq
-      VERSION = '0.20.1'
+      VERSION = '0.21.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.1
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -30,28 +30,42 @@ 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.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.3
+        version: 0.21.0
+- !ruby/object:Gem::Dependency
+  name: activejob
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-test-helpers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -203,10 +245,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-sidekiq/v0.20.1/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sidekiq/v0.21.1/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/sidekiq
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sidekiq/v0.20.1
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sidekiq/v0.21.1
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -215,7 +257,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="