fix timeout issue for older redises

Author: zvkemp

instrumentation/sidekiq/Appraisals

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 {
-  'sidekiq-7' => [['sidekiq', '~> 7.0']],
+  'sidekiq-7.0' => [['sidekiq', '~> 7.0']],
   'sidekiq-6.5' => [['sidekiq', '>= 6.5', '< 7.0']],
   'sidekiq-6.0' => [
     ['sidekiq', '>= 6.0', '< 6.5'],

instrumentation/sidekiq/lib/opentelemetry/instrumentation/sidekiq/middlewares/common.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module Sidekiq
+      module Middlewares
+        module Common
+          private
+
+          def instrumentation
+            Sidekiq::Instrumentation.instance
+          end
+
+          def instrumentation_config
+            Sidekiq::Instrumentation.instance.config
+          end
+
+          # Bypasses _all_ enclosed logic unless metrics are enabled
+          def with_meter(&block)
+            instrumentation.with_meter(&block)
+          end
+
+          # time an inner block and yield the duration to the given callback
+          def timed(callback)
+            return yield unless metrics_enabled?
+
+            t0 = monotonic_now
+
+            yield.tap do
+              callback.call(monotonic_now - t0)
+            end
+          end
+
+          # FIXME: is this a util somewhere
+          def realtime_now
+            Process.clock_gettime(Process::CLOCK_REALTIME)
+          end
+
+          def monotonic_now
+            Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          end
+
+          def tracer
+            instrumentation.tracer
+          end
+
+          def metrics_enabled?
+            instrumentation.metrics_enabled?
+          end
+        end
+      end
+    end
+  end
+end

instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'appraisal', '~> 2.5'
   spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rspec-mocks'

instrumentation/sidekiq/test/test_helper.rb

@@ -10,9 +10,12 @@
 require 'active_job'
 
 require 'minitest/autorun'
+require 'minitest/reporters'
 require 'rspec/mocks/minitest_integration'
 require 'sidekiq/testing'
 
+Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+
 if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('7.0.0')
   require 'helpers/mock_loader_for_7.0'
 elsif Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('6.5.0')
@@ -21,6 +24,14 @@
   require 'helpers/mock_loader'
 end
 
+# speed up tests that rely on empty queues
+Sidekiq::BasicFetch::TIMEOUT = if Gem.loaded_specs['sidekiq'].version < Gem::Version.new('6.5.0')
+                                 # Redis 4.8 has trouble with float timeouts given as positional arguments
+                                 1
+                               else
+                                 0.1
+                               end
+
 # OpenTelemetry SDK config for testing
 EXPORTER = OpenTelemetry::SDK::Trace::Export::InMemorySpanExporter.new
 span_processor = OpenTelemetry::SDK::Trace::Export::SimpleSpanProcessor.new(EXPORTER)