opentelemetry-instrumentation-sidekiq 0.16.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d779ad028fa986d96d8fedbb6581e7ad2063825be89ef787eea19619391ea146
-  data.tar.gz: 6164415d7a74c9b0434bda0c62884ccd44bdd84cdc6ea0cf91f4f38d51631b30
+  metadata.gz: 25750e9750af614c5ea01314b28883f55b2aeb80c75fc528b78edcdde4a2a52a
+  data.tar.gz: 7fbccb9f9f65e70cc8ce58d82de2d782aaa530f981b926b36d6c9a152b3be257
 SHA512:
-  metadata.gz: 3591cffe3495f539bf38010579f91ee9b37489e5ea14b77d20dc0c173653c2eb25db14143ea47b2a0cd25e315296f67cad3d02469a91cb3eeefec0e969814c2a
-  data.tar.gz: a4c8b87b71de42f7588fcf947c4b27671060ba9046879ee4ba4be193b2ef10ea65bfec9374df6744f8d01e8d000306517a6774d5ebfbaf14bda376a8d3762bb9
+  metadata.gz: 04bcc7073435d289e77a730078b6efd8e5f2b253ffeffd5cca98ea59f3b253e94b545245e693c691d7fdf5f5e124563b9baaee3e674d7cf3ded3ba2a91b183c2
+  data.tar.gz: 0abaf82efeb93446100a6682af61dfb26f018b31b100c4a36016356714cc49992f08f7926c7b5858906915d2adfa720353ce0b417b28061d878ea95eef1f3488

data/CHANGELOG.md

@@ -1,25 +1,52 @@
 # Release History: opentelemetry-instrumentation-sidekiq
 
+### v0.19.1 / 2021-08-12
+
+* (No significant changes)
+
+### v0.19.0 / 2021-06-23
+
+* BREAKING CHANGE: Sidekiq propagation config 
+  - Config option enable_job_class_span_names renamed to span_naming and now expects a symbol of value :job_class, or :queue
+  - The default behaviour is no longer to have one continuous trace for the enqueue and process spans, using links is the new default.  To maintain the previous behaviour the config option propagation_style must be set to :child.
+* BREAKING CHANGE: Total order constraint on span.status= 
+
+* FIXED: Sidekiq propagation config 
+* FIXED: Total order constraint on span.status= 
+
+### v0.18.0 / 2021-05-21
+
+* ADDED: Updated API depedency for 1.0.0.rc1
+* TEST: update test for redis instrumentation refactor [#760](https://github.com/open-telemetry/opentelemetry-ruby/pull/760)
+* BREAKING CHANGE: Remove optional parent_context from in_span
+
+* FIXED: Remove optional parent_context from in_span
+* FIXED: Instrument Redis more thoroughly by patching Client#process.
+
+### v0.17.0 / 2021-04-22
+
+* ADDED: Accept config for sidekiq peer service attribute
+
 ### v0.16.0 / 2021-03-17
 
-* FIXED: Example scripts now reference local common lib 
-* DOCS: Replace Gitter with GitHub Discussions 
+* FIXED: Example scripts now reference local common lib
+* DOCS: Replace Gitter with GitHub Discussions
 
 ### v0.15.0 / 2021-02-18
 
-* ADDED: Add instrumentation config validation 
+* ADDED: Add instrumentation config validation
 
 ### v0.14.0 / 2021-02-03
 
-* BREAKING CHANGE: Replace getter and setter callables and remove rack specific propagators 
+* BREAKING CHANGE: Replace getter and setter callables and remove rack specific propagators
 
-* ADDED: Replace getter and setter callables and remove rack specific propagators 
+* ADDED: Replace getter and setter callables and remove rack specific propagators
 
 ### v0.13.0 / 2021-01-29
 
-* ADDED: Instrument sidekiq background work 
-* FIXED: Adjust Sidekiq middlewares to match semantic conventions 
-* FIXED: Set minimum compatible version and use untraced helper 
+* ADDED: Instrument sidekiq background work
+* FIXED: Adjust Sidekiq middlewares to match semantic conventions
+* FIXED: Set minimum compatible version and use untraced helper
 
 ### v0.12.0 / 2020-12-24
 
@@ -27,7 +54,7 @@
 
 ### v0.11.0 / 2020-12-11
 
-* FIXED: Copyright comments to not reference year 
+* FIXED: Copyright comments to not reference year
 
 ### v0.10.0 / 2020-12-03
 
@@ -35,9 +62,9 @@
 
 ### v0.9.0 / 2020-11-27
 
-* BREAKING CHANGE: Add timeout for force_flush and shutdown 
+* BREAKING CHANGE: Add timeout for force_flush and shutdown
 
-* ADDED: Add timeout for force_flush and shutdown 
+* ADDED: Add timeout for force_flush and shutdown
 
 ### v0.8.0 / 2020-10-27
 
@@ -45,9 +72,9 @@
 
 ### v0.7.0 / 2020-10-07
 
-* DOCS: Adding README for Sidekiq instrumentation 
-* DOCS: Remove duplicate reference in Sidekiq README 
-* DOCS: Standardize toplevel docs structure and readme 
+* DOCS: Adding README for Sidekiq instrumentation
+* DOCS: Remove duplicate reference in Sidekiq README
+* DOCS: Standardize toplevel docs structure and readme
 
 ### v0.6.0 / 2020-09-10
 

data/README.md

@@ -33,7 +33,16 @@ end
 
 Example usage can be seen in the `./example/sidekiq.rb` file [here](https://github.com/open-telemetry/opentelemetry-ruby/blob/main/instrumentation/sidekiq/example/sidekiq.rb)
 
-## How can I get invovled?
+## Development
+
+You'll need Redis installed locally to run the test suite. Once you've
+installed it, it will start and stop automatically when you run `rake`.
+
+```
+redis-server test/redis.conf
+```
+
+## How can I get involved?
 
 The `opentelemetry-instrumentation-sidekiq` gem source is [on github][repo-github], along with related gems including `opentelemetry-api` and `opentelemetry-sdk`.
 

data/lib/opentelemetry/instrumentation/sidekiq.rb

@@ -5,6 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 require 'opentelemetry'
+require 'opentelemetry-instrumentation-base'
 
 module OpenTelemetry
   module Instrumentation

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

@@ -27,11 +27,13 @@ module OpenTelemetry
           gem_version >= MINIMUM_VERSION
         end
 
-        option :enable_job_class_span_names, default: false, validate: :boolean
+        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 :trace_launcher_heartbeat,    default: false, validate: :boolean
         option :trace_poller_enqueue,        default: false, validate: :boolean
         option :trace_poller_wait,           default: false, validate: :boolean
         option :trace_processor_process_one, default: false, validate: :boolean
+        option :peer_service,                default: nil,   validate: :string
 
         private
 

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

@@ -12,18 +12,22 @@ module OpenTelemetry
           # TracerMiddleware propagates context and instruments Sidekiq client
           # by way of its middleware system
           class TracerMiddleware
-            def call(_worker_class, job, _queue, _redis_pool)
-              tracer.in_span(
-                span_name(job),
-                attributes: {
-                  'messaging.system' => 'sidekiq',
-                  'messaging.sidekiq.job_class' => job['wrapped']&.to_s || job['class'],
-                  'messaging.message_id' => job['jid'],
-                  'messaging.destination' => job['queue'],
-                  'messaging.destination_kind' => 'queue'
-                },
-                kind: :producer
-              ) do |span|
+            def call(_worker_class, job, _queue, _redis_pool) # rubocop:disable Metrics/AbcSize
+              attributes = {
+                'messaging.system' => 'sidekiq',
+                'messaging.sidekiq.job_class' => job['wrapped']&.to_s || job['class'],
+                'messaging.message_id' => job['jid'],
+                'messaging.destination' => job['queue'],
+                'messaging.destination_kind' => 'queue'
+              }
+              attributes['peer.service'] = config[:peer_service] if config[:peer_service]
+
+              span_name = case config[:span_naming]
+                          when :job_class then "#{job['wrapped']&.to_s || job['class']} send"
+                          else "#{job['queue']} send"
+                          end
+
+              tracer.in_span(span_name, attributes: attributes, kind: :producer) do |span|
                 OpenTelemetry.propagation.inject(job)
                 span.add_event('created_at', timestamp: job['created_at'])
                 yield
@@ -32,14 +36,6 @@ module OpenTelemetry
 
             private
 
-            def span_name(job)
-              if config[:enable_job_class_span_names]
-                "#{job['wrapped']&.to_s || job['class']} enqueue"
-              else
-                "#{job['queue']} send"
-              end
-            end
-
             def config
               Sidekiq::Instrumentation.instance.config
             end

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

@@ -12,36 +12,51 @@ module OpenTelemetry
           # TracerMiddleware propagates context and instruments Sidekiq requests
           # by way of its middleware system
           class TracerMiddleware
-            def call(_worker, msg, _queue)
-              parent_context = OpenTelemetry.propagation.extract(msg)
-              tracer.in_span(
-                span_name(msg),
-                attributes: {
-                  'messaging.system' => 'sidekiq',
-                  'messaging.sidekiq.job_class' => msg['wrapped']&.to_s || msg['class'],
-                  'messaging.message_id' => msg['jid'],
-                  'messaging.destination' => msg['queue'],
-                  'messaging.destination_kind' => 'queue'
-                },
-                with_parent: parent_context,
-                kind: :consumer
-              ) do |span|
-                span.add_event('created_at', timestamp: msg['created_at'])
-                span.add_event('enqueued_at', timestamp: msg['enqueued_at'])
-                yield
-              end
-            end
+            def call(_worker, msg, _queue) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+              attributes = {
+                'messaging.system' => 'sidekiq',
+                'messaging.sidekiq.job_class' => msg['wrapped']&.to_s || msg['class'],
+                'messaging.message_id' => msg['jid'],
+                'messaging.destination' => msg['queue'],
+                'messaging.destination_kind' => 'queue'
+              }
+              attributes['peer.service'] = config[:peer_service] if config[:peer_service]
 
-            private
+              span_name = case config[:span_naming]
+                          when :job_class then "#{msg['wrapped']&.to_s || msg['class']} process"
+                          else "#{msg['queue']} process"
+                          end
 
-            def span_name(msg)
-              if config[:enable_job_class_span_names]
-                "#{msg['wrapped']&.to_s || msg['class']} process"
-              else
-                "#{msg['queue']} process"
+              extracted_context = OpenTelemetry.propagation.extract(msg)
+              OpenTelemetry::Context.with_current(extracted_context) do
+                if 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'])
+                    yield
+                  end
+                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?
+                  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'])
+                    span.add_event('enqueued_at', timestamp: msg['enqueued_at'])
+                    yield
+                  rescue Exception => e # rubocop:disable Lint/RescueException
+                    span.record_exception(e)
+                    span.status = OpenTelemetry::Trace::Status.error("Unhandled exception of type: #{e.class}")
+                    raise e
+                  ensure
+                    span.finish
+                  end
+                end
               end
             end
 
+            private
+
             def config
               Sidekiq::Instrumentation.instance.config
             end

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

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

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

@@ -12,7 +12,9 @@ module OpenTelemetry
         module Poller
           def enqueue
             if config[:trace_poller_enqueue]
-              tracer.in_span('Sidekiq::Scheduled::Poller#enqueue') { super }
+              attributes = {}
+              attributes['peer.service'] = config[:peer_service] if config[:peer_service]
+              tracer.in_span('Sidekiq::Scheduled::Poller#enqueue', attributes: attributes) { super }
             else
               OpenTelemetry::Common::Utilities.untraced { super }
             end

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

@@ -8,13 +8,15 @@ module OpenTelemetry
   module Instrumentation
     module Sidekiq
       module Patches
-        # The Processor module contains the insturmentation for the process_one method
+        # The Processor module contains the instrumentation for the process_one method
         module Processor
           private
 
           def process_one
             if config[:trace_processor_process_one]
-              tracer.in_span('Sidekiq::Processor#process_one') { super }
+              attributes = {}
+              attributes['peer.service'] = config[:peer_service] if config[:peer_service]
+              tracer.in_span('Sidekiq::Processor#process_one', attributes: attributes) { super }
             else
               OpenTelemetry::Common::Utilities.untraced { super }
             end

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Sidekiq
-      VERSION = '0.16.0'
+      VERSION = '0.19.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.19.1
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 1.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 1.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: opentelemetry-common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-base
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 1.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -189,10 +203,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.16.0/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sidekiq/v0.19.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.16.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sidekiq/v0.19.1
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -208,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Sidekiq instrumentation for the OpenTelemetry framework