epsagon 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9067624373427de33a82ba42e8b58bcf6d102ed85b8aaf24c69f511e628f2329
-  data.tar.gz: 2532583c2fb18426b046df27fca70adeff280c9ca6178e5188b905e6e17caa06
+  metadata.gz: 4f90417afae2709a9a4dbc88f2edab85cea49ff77577048808401f981cba0a96
+  data.tar.gz: '0811d976ea61bce684d2da4322fb2493b37b58af0c269b1ff785cdede6b5fad2'
 SHA512:
-  metadata.gz: e1b93087e00032717588067013467eacc613418e20792aa86c36d2840d6fc13052971793d34bf4c8c47a83e677a174adfd2d6f45e150de058910214e19596799
-  data.tar.gz: 2711a7e340eb7bc768970de0cb88112dd743ecbc843285c1d3daaf4e437b6cec30550dea24f8232dce008209d78a9d05ed42b9cc2f70eca8eb3315011ce48f9f
+  metadata.gz: 560b2ea93192ed4502f261433728983544f3696378c846df19734602187335f6a155b52bbbaf7c424aca161727b09b37477b7f5a25b2d0711045a9a6c61b40dd
+  data.tar.gz: 5f3a848235508e9adc51555d6ebf2c107dcedde0aba4a0da37d961e37fa143064968cceca46170e9bdd92fc3bcbd8f980f4b7cbf9d7503eb2b77659e98d976fe

data/lib/epsagon.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
-
+require 'json'
 require 'rubygems'
 require 'net/http'
 require 'bundler/setup'
 require 'opentelemetry/sdk'
 require 'opentelemetry/exporter/otlp'
+require 'opentelemetry/instrumentation/sidekiq'
 
 require_relative 'instrumentation/sinatra'
 require_relative 'instrumentation/net_http'
@@ -55,8 +56,7 @@ module Epsagon
     configurator.use 'EpsagonFaradayInstrumentation', { epsagon: @@epsagon_config }
     configurator.use 'EpsagonAwsSdkInstrumentation', { epsagon: @@epsagon_config }
     configurator.use 'EpsagonRailsInstrumentation', { epsagon: @@epsagon_config }
-    # configurator.use 'OpenTelemetry::Instrumentation::Sidekiq'
-
+    configurator.use 'OpenTelemetry::Instrumentation::Sidekiq', { epsagon: @@epsagon_config }
 
     if @@epsagon_config[:debug]
       configurator.add_span_processor OpenTelemetry::SDK::Trace::Export::SimpleSpanProcessor.new(
@@ -105,7 +105,69 @@ module SpanExtension
   end
 end
 
+module SidekiqClientMiddlewareExtension
+
+  def call(_worker_class, job, _queue, _redis_pool)
+    config = OpenTelemetry::Instrumentation::Sidekiq::Instrumentation.instance.config[:epsagon] || {}
+    attributes = {
+      'operation' => job['at'] ? 'perform_at' : 'perform_async',
+      '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',
+      'messaging.sidekiq.redis_url' => Sidekiq.options['url'] || Util.redis_default_url
+    }
+    unless config[:metadata_only]
+      attributes.merge!({
+        'messaging.sidekiq.args' => JSON.dump(job['args'])
+      })
+    end
+    tracer.in_span(
+      job['queue'],
+      attributes: attributes,
+      kind: :producer
+    ) do |span|
+      OpenTelemetry.propagation.text.inject(job)
+      span.add_event('created_at', timestamp: job['created_at'])
+      Util.untraced {yield}
+    end
+  end
+end
+
+module SidekiqServerMiddlewareExtension
+  def call(_worker, msg, _queue)
+    config = OpenTelemetry::Instrumentation::Sidekiq::Instrumentation.instance.config[:epsagon] || {}
+    parent_context = OpenTelemetry.propagation.text.extract(msg)
+    attributes = {
+        'operation' => 'perform',
+        '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',
+        'messaging.sidekiq.redis_url' => Sidekiq.options['url'] || Util.redis_default_url
+    }
+    unless config[:metadata_only]
+      attributes.merge!({
+        'messaging.sidekiq.args' => JSON.dump(msg['args'])
+      })
+    end
+    tracer.in_span(
+      msg['queue'],
+      attributes: attributes,
+      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
+end
+
 # monkey patch to include epsagon confs
+
 module OpenTelemetry
   # monkey patch inner SDK module
   module SDK
@@ -122,4 +184,35 @@ module OpenTelemetry
       end
     end
   end
+  module Instrumentation
+    module Sidekiq
+      class Instrumentation
+        def add_server_middleware
+          ::Sidekiq.configure_server do |config|
+            config.server_middleware do |chain|
+              chain.add Middlewares::Server::TracerMiddleware
+            end
+          end
+
+          if defined?(::Sidekiq::Testing) # rubocop:disable Style/GuardClause
+            ::Sidekiq::Testing.server_middleware do |chain|
+              chain.add Middlewares::Server::TracerMiddleware
+            end
+          end
+        end
+      end
+      module Middlewares
+        module Client
+          class TracerMiddleware
+            prepend SidekiqClientMiddlewareExtension
+          end
+        end
+        module Server
+          class TracerMiddleware
+            prepend SidekiqServerMiddlewareExtension
+          end
+        end
+      end
+    end
+  end
 end

data/lib/epsagon_constants.rb

@@ -1,3 +1,3 @@
 module EpsagonConstants
-	VERSION = '0.0.23'
+	VERSION = '0.0.24'
 end

data/lib/util.rb

@@ -30,4 +30,13 @@ module Util
   		value
   	end
   end
+
+  def self.redis_default_url
+    @@redis_default_url ||= "#{Redis::Client::DEFAULTS[:scheme]}://#{Redis::Client::DEFAULTS[:host]}:#{Redis::Client::DEFAULTS[:port]}/#{Redis::Client::DEFAULTS[:db]}"
+  end
+
+  def self.untraced(&block)
+	  OpenTelemetry::Trace.with_span(OpenTelemetry::Trace::Span.new, &block)
+	end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epsagon
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Epsagon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -100,6 +100,7 @@ files:
 - lib/instrumentation/net_http.rb
 - lib/instrumentation/rails.rb
 - lib/instrumentation/sinatra.rb
+- lib/instrumentation/version.rb
 - lib/util.rb
 homepage: https://github.com/epsagon/epsagon-ruby
 licenses: