opentelemetry-instrumentation-sidekiq 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 716d469116c3607a34fcfe5dcafcbf137e93e46605453a99ec230da3406fe289
-  data.tar.gz: 74dee616eb89a34fe64dd1c3afa5420b257a169ab223b535a7c9768db891597b
+  metadata.gz: 06105b13c70190b459d650fff91f1f3052cb1e655cd744100aeee6475bbb5b8f
+  data.tar.gz: 4b7142a06febd442ac3184270c0e73562a47ec252d5b7dc829d12d9863d7009f
 SHA512:
-  metadata.gz: f80ddb2310202e502eff0e41110618607d64635ed5c72c38a6bdd8f1b75c1b61f44b1a76fa2de458767e6968ffeb2db69be199ffe89701786ca31fbe37aff3b7
-  data.tar.gz: 9286e78ff1002456c3470a02457bcbdf59ac94fda195d3a418f5946aede6f9d606072615900e44ef81bc0f2266b9ac25060bcc1dee2efcf8070905314a40a043
+  metadata.gz: c5efbba5397bff170c7f8c1cf8deee5d3c7ecdd9e6b2fde14e8fffe6cff0f88f777c91b5dfed4bd96895af188015d4e18a581376f7cc52851a9ec7ab22821d21
+  data.tar.gz: 422779d862bee296be58b695c11614bf5778648b9b009495ff9a3aea5f4b37e214f092b2a6d53072f6a89f2397dc069decc35031a4a18c55ce7fcd4690e20775

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History: opentelemetry-instrumentation-sidekiq
 
+### 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 
+
 ### v0.12.0 / 2020-12-24
 
 * (No significant changes)

data/README.md

@@ -31,7 +31,7 @@ end
 ```
 ## Examples
 
-Example usage can be seen in the `./example/sidekiq.rb` file [here](https://github.com/open-telemetry/opentelemetry-ruby/blob/master/instrumentation/sidekiq/example/sidekiq.rb)
+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?
 
@@ -46,7 +46,7 @@ The `opentelemetry-instrumentation-sidekiq` gem is distributed under the Apache
 [sidekiq-home]: https://github.com/mperham/sidekiq
 [bundler-home]: https://bundler.io
 [repo-github]: https://github.com/open-telemetry/opentelemetry-ruby
-[license-github]: https://github.com/open-telemetry/opentelemetry-ruby/blob/master/LICENSE
+[license-github]: https://github.com/open-telemetry/opentelemetry-ruby/blob/main/LICENSE
 [ruby-sig]: https://github.com/open-telemetry/community#ruby-sig
 [community-meetings]: https://github.com/open-telemetry/community#community-meetings
 [ruby-gitter]: https://gitter.im/open-telemetry/opentelemetry-ruby

data/lib/opentelemetry/instrumentation/sidekiq.rb

@@ -16,3 +16,4 @@ end
 
 require_relative './sidekiq/instrumentation'
 require_relative './sidekiq/version'
+require 'opentelemetry/common'

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

@@ -10,21 +10,46 @@ module OpenTelemetry
       # The Instrumentation class contains logic to detect and install the Sidekiq
       # instrumentation
       class Instrumentation < OpenTelemetry::Instrumentation::Base
+        MINIMUM_VERSION = Gem::Version.new('4.2.10')
+
         install do |_config|
           require_dependencies
           add_client_middleware
           add_server_middleware
+          patch_on_startup
         end
 
         present do
           defined?(::Sidekiq)
         end
 
+        compatible do
+          gem_version >= MINIMUM_VERSION
+        end
+
         private
 
+        def gem_version
+          Gem.loaded_specs['sidekiq'].version
+        end
+
         def require_dependencies
           require_relative 'middlewares/client/tracer_middleware'
           require_relative 'middlewares/server/tracer_middleware'
+
+          require_relative 'patches/processor'
+          require_relative 'patches/launcher'
+          require_relative 'patches/poller'
+        end
+
+        def patch_on_startup
+          ::Sidekiq.configure_server do |config|
+            config.on(:startup) do
+              ::Sidekiq::Processor.prepend(Patches::Processor)
+              ::Sidekiq::Launcher.prepend(Patches::Launcher)
+              ::Sidekiq::Scheduled::Poller.prepend(Patches::Poller)
+            end
+          end
         end
 
         def add_client_middleware

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

@@ -14,10 +14,13 @@ module OpenTelemetry
           class TracerMiddleware
             def call(_worker_class, job, _queue, _redis_pool)
               tracer.in_span(
-                job['wrapped']&.to_s || job['class'],
+                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' => job['queue'],
+                  'messaging.destination_kind' => 'queue'
                 },
                 kind: :producer
               ) do |span|
@@ -29,6 +32,18 @@ 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
+
             def tracer
               Sidekiq::Instrumentation.instance.tracer
             end

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

@@ -15,10 +15,13 @@ module OpenTelemetry
             def call(_worker, msg, _queue)
               parent_context = OpenTelemetry.propagation.text.extract(msg)
               tracer.in_span(
-                msg['wrapped']&.to_s || msg['class'],
+                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' => msg['queue'],
+                  'messaging.destination_kind' => 'queue'
                 },
                 with_parent: parent_context,
                 kind: :consumer
@@ -31,6 +34,18 @@ module OpenTelemetry
 
             private
 
+            def span_name(msg)
+              if config[:enable_job_class_span_names]
+                "#{msg['wrapped']&.to_s || msg['class']} process"
+              else
+                "#{msg['queue']} process"
+              end
+            end
+
+            def config
+              Sidekiq::Instrumentation.instance.config
+            end
+
             def tracer
               Sidekiq::Instrumentation.instance.tracer
             end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module Sidekiq
+      module Patches
+        # The Launcher module contains the instrumentation for the Sidekiq heartbeat
+        module Launcher
+          private
+
+          def ❤ # rubocop:disable Naming/MethodName
+            if config[:trace_launcher_heartbeat]
+              tracer.in_span('Sidekiq::Launcher#heartbeat') { super }
+            else
+              OpenTelemetry::Common::Utilities.untraced { super }
+            end
+          end
+
+          def tracer
+            Sidekiq::Instrumentation.instance.tracer
+          end
+
+          def config
+            Sidekiq::Instrumentation.instance.config
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module Sidekiq
+      module Patches
+        # The Poller module contains instrumentation for the enqueue and wait methods
+        module Poller
+          def enqueue
+            if config[:trace_poller_enqueue]
+              tracer.in_span('Sidekiq::Scheduled::Poller#enqueue') { super }
+            else
+              OpenTelemetry::Common::Utilities.untraced { super }
+            end
+          end
+
+          private
+
+          def wait
+            if config[:trace_poller_wait]
+              tracer.in_span('Sidekiq::Scheduled::Poller#wait') { super }
+            else
+              OpenTelemetry::Common::Utilities.untraced { super }
+            end
+          end
+
+          def tracer
+            Sidekiq::Instrumentation.instance.tracer
+          end
+
+          def config
+            Sidekiq::Instrumentation.instance.config
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module Sidekiq
+      module Patches
+        # The Processor module contains the insturmentation 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 }
+            else
+              OpenTelemetry::Common::Utilities.untraced { super }
+            end
+          end
+
+          def tracer
+            Sidekiq::Instrumentation.instance.tracer
+          end
+
+          def config
+            Sidekiq::Instrumentation.instance.config
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Sidekiq
-      VERSION = '0.12.0'
+      VERSION = '0.13.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -167,15 +181,18 @@ files:
 - lib/opentelemetry/instrumentation/sidekiq/instrumentation.rb
 - lib/opentelemetry/instrumentation/sidekiq/middlewares/client/tracer_middleware.rb
 - lib/opentelemetry/instrumentation/sidekiq/middlewares/server/tracer_middleware.rb
+- lib/opentelemetry/instrumentation/sidekiq/patches/launcher.rb
+- lib/opentelemetry/instrumentation/sidekiq/patches/poller.rb
+- lib/opentelemetry/instrumentation/sidekiq/patches/processor.rb
 - lib/opentelemetry/instrumentation/sidekiq/version.rb
 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.12.0/file.CHANGELOG.html
-  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/master/instrumentation/sidekiq
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sidekiq/v0.13.0/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.12.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-sidekiq/v0.13.0
 post_install_message: 
 rdoc_options: []
 require_paths: