opentelemetry-instrumentation-sidekiq 0.24.3 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e989981d10264b34c23033edb9b77bf19ec0d03fc5ce6a80c574e826656a391a
-  data.tar.gz: f18779a5cff1a2a2806df5f2f6e5dc0a989bb8a89de3548ed6ac2fa68ba35dec
+  metadata.gz: 4821c5cb6ee46e964a0050c474d971356103b3db4b16475afee181fc54e30e2f
+  data.tar.gz: 917279144fe2883f62094ff2e968e5254879d8f07c201c0604a9f0ec82e4cc56
 SHA512:
-  metadata.gz: 5cba4f0641550ad45dab7a24bec3901d897cc01800f728b858c5d73b846a1de62927bd82ecdb047b12d65234e4c27cd8a8e32eb86a10ee5dff4c390f053c05e5
-  data.tar.gz: 21e81746c89967f31eca1814fec4348e1ed07f70f421b6593a529c6d70300caa303415854bac1e5b4dd589f834b6274879aa6e5599a0478d9d18e0f07445db80
+  metadata.gz: 89e5de5de2299788004e6ec4917751aa6d6c08092be69892fafe3d0b731a86dd72672e89149a590996288023bbf8dd2a57344313d8303849d3c9f7891dd79258
+  data.tar.gz: 6f2a81ac8712100dc5761a79b67021cc4247929f4fe8807d45c1e9b52e2d494e3191373898c2b9ea7bea1983cfe23fc3e4f2bc12a96d1e055743958569d67d95

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-sidekiq
 
+### v0.25.0 / 2023-09-07
+
+* FIXED: Align messaging instrumentation operation names
+
+### v0.24.4 / 2023-08-07
+
+* FIXED: Allow traces inside jobs while avoiding Redis noise
+
 ### v0.24.3 / 2023-08-03
 
 * FIXED: Remove inline linter rules

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

@@ -67,7 +67,7 @@ module OpenTelemetry
         def add_client_middleware
           ::Sidekiq.configure_client do |config|
             config.client_middleware do |chain|
-              chain.add Middlewares::Client::TracerMiddleware
+              chain.prepend Middlewares::Client::TracerMiddleware
             end
           end
         end
@@ -75,16 +75,16 @@ module OpenTelemetry
         def add_server_middleware
           ::Sidekiq.configure_server do |config|
             config.client_middleware do |chain|
-              chain.add Middlewares::Client::TracerMiddleware
+              chain.prepend Middlewares::Client::TracerMiddleware
             end
             config.server_middleware do |chain|
-              chain.add Middlewares::Server::TracerMiddleware
+              chain.prepend Middlewares::Server::TracerMiddleware
             end
           end
 
           if defined?(::Sidekiq::Testing) # rubocop:disable Style/GuardClause
             ::Sidekiq::Testing.server_middleware do |chain|
-              chain.add Middlewares::Server::TracerMiddleware
+              chain.prepend Middlewares::Server::TracerMiddleware
             end
           end
         end

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

@@ -12,6 +12,8 @@ module OpenTelemetry
           # TracerMiddleware propagates context and instruments Sidekiq client
           # by way of its middleware system
           class TracerMiddleware
+            include ::Sidekiq::ClientMiddleware if defined?(::Sidekiq::ClientMiddleware)
+
             def call(_worker_class, job, _queue, _redis_pool)
               attributes = {
                 SemanticConventions::Trace::MESSAGING_SYSTEM => 'sidekiq',
@@ -23,8 +25,8 @@ module OpenTelemetry
               attributes[SemanticConventions::Trace::PEER_SERVICE] = instrumentation_config[:peer_service] if instrumentation_config[:peer_service]
 
               span_name = case instrumentation_config[:span_naming]
-                          when :job_class then "#{job['wrapped']&.to_s || job['class']} send"
-                          else "#{job['queue']} send"
+                          when :job_class then "#{job['wrapped']&.to_s || job['class']} publish"
+                          else "#{job['queue']} publish"
                           end
 
               tracer.in_span(span_name, attributes: attributes, kind: :producer) do |span|

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

@@ -12,6 +12,8 @@ module OpenTelemetry
           # TracerMiddleware propagates context and instruments Sidekiq requests
           # by way of its middleware system
           class TracerMiddleware
+            include ::Sidekiq::ServerMiddleware if defined?(::Sidekiq::ServerMiddleware)
+
             def call(_worker, msg, _queue)
               attributes = {
                 SemanticConventions::Trace::MESSAGING_SYSTEM => 'sidekiq',

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

@@ -17,6 +17,14 @@ module OpenTelemetry
               attributes = {}
               attributes[SemanticConventions::Trace::PEER_SERVICE] = instrumentation_config[:peer_service] if instrumentation_config[:peer_service]
               tracer.in_span('Sidekiq::Processor#process_one', attributes: attributes) { super }
+            else
+              super
+            end
+          end
+
+          def fetch
+            if instrumentation_config[:trace_processor_process_one]
+              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.24.3'
+      VERSION = '0.25.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.24.3
+  version: 0.25.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-03 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.55.1
+        version: 1.56.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.55.1
+        version: 1.56.1
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +206,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: yard-doctest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.6
 description: Sidekiq instrumentation for the OpenTelemetry framework
 email:
 - cncf-opentelemetry-contributors@lists.cncf.io
@@ -245,10 +231,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-sidekiq/0.24.3/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-sidekiq/0.25.0/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/sidekiq
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-sidekiq/0.24.3
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-sidekiq/0.25.0
 post_install_message: 
 rdoc_options: []
 require_paths: