opentelemetry-instrumentation-active_job 0.1.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b014d1f37a55288b8b529fa5c6cd79b4fd81202d40b07d99defcf4eb15fa8296
-  data.tar.gz: 9f84b67271cb784270e037c8e1b33340873fa9e5fb0a14d34c3b4beb8d17da1a
+  metadata.gz: 8e1e9794b086e48e52136a217c91defe4fc158d09b330d9307a1f0fad5a2f3f6
+  data.tar.gz: f6c4d7e4c4f4aea2b29df2735430756c649a534b3195b6c114dfe7bf47980bde
 SHA512:
-  metadata.gz: 35ab58159d1b3836bdf500625be88f512f672a5a6f299684cfcad436c854cbdf5f0d51824ae68891aa27fffc6ccf6fb0ae2413dad59243242a430a82dcb4a7a7
-  data.tar.gz: 884b16b4c12fefd56466b76e49cfeeb26314e2e76909a2fff29b59c43e5f5a6ba49264575af536fb3860ad982ec773e2123d5b0f84464b9843836aaff84bed52
+  metadata.gz: c176c6461a7af9fdde516b99d1038eae28cebedfd7d8ba64e4447654c496bed0e5b5a0270befe712e49128b2253c820caaa057e5ce1e3aee5550f18ad37a1bef
+  data.tar.gz: 9384415b42d18d14caf9cf4a00f6cd05b3e0047332de4ed8fc9116a70df22d7313df375d4f3ca8a92ce41687a313a47491004705f5cb55d19e66af0a83712312

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Release History: opentelemetry-instrumentation-active_job
 
+### v0.3.0 / 2022-06-09
+
+* Upgrading Base dependency version
+* FIXED: Broken test file requirements 
+
+### v0.2.0 / 2022-05-02
+
+* ADDED: Validate Using Enums 
+* ADDED: Make the context available in ActiveJob notifications 
+* FIXED: Fix deserialization of jobs that are missing metadata 
+* FIXED: RubyGems Fallback 
+
+### v0.1.5 / 2021-12-02
+
+* (No significant changes)
+
 ### v0.1.4 / 2021-09-29
 
 * (No significant changes)

data/lib/opentelemetry/instrumentation/active_job/instrumentation.rb

@@ -21,7 +21,7 @@ module OpenTelemetry
         end
 
         compatible do
-          Gem.loaded_specs['activejob'].version >= MINIMUM_VERSION
+          gem_version >= MINIMUM_VERSION
         end
 
         ## Supported configuration keys for the install config hash:
@@ -52,12 +52,16 @@ module OpenTelemetry
         # spans will always be children of the enqueueing spans. This is due to the way
         # ActiveJob immediately executes jobs during the process of "enqueueing" jobs when
         # using the `:inline` adapter.
-        option :propagation_style, default: :link, validate: ->(opt) { %i[link child none].include?(opt) }
+        option :propagation_style, default: :link, validate: %i[link child none]
         option :force_flush, default: false, validate: :boolean
-        option :span_naming, default: :queue, validate: ->(opt) { %i[job_class queue].include?(opt) }
+        option :span_naming, default: :queue, validate: %i[job_class queue]
 
         private
 
+        def gem_version
+          ::ActiveJob.version
+        end
+
         def require_dependencies
           require_relative 'patches/base'
           require_relative 'patches/active_job_callbacks'

data/lib/opentelemetry/instrumentation/active_job/patches/active_job_callbacks.rb

@@ -10,8 +10,8 @@ module OpenTelemetry
       module Patches
         # Module to prepend to ActiveJob::Base for instrumentation.
         module ActiveJobCallbacks
-          def self.prepended(base) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-            base.class_eval do # rubocop:disable Metrics/BlockLength
+          def self.prepended(base)
+            base.class_eval do
               around_enqueue do |job, block|
                 span_kind = job.class.queue_adapter_name == 'inline' ? :client : :producer
                 span_name = "#{otel_config[:span_naming] == :job_class ? job.class : job.queue_name} send"
@@ -21,45 +21,46 @@ module OpenTelemetry
                   block.call
                 end
               end
+            end
+          end
 
-              around_perform do |job, block| # rubocop:disable Metrics/BlockLength
-                span_kind = job.class.queue_adapter_name == 'inline' ? :server : :consumer
-                span_name = "#{otel_config[:span_naming] == :job_class ? job.class : job.queue_name} process"
-                span_attributes = job_attributes(job).merge('messaging.operation' => 'process')
+          def perform_now # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+            span_kind = self.class.queue_adapter_name == 'inline' ? :server : :consumer
+            span_name = "#{otel_config[:span_naming] == :job_class ? self.class : queue_name} process"
+            span_attributes = job_attributes(self).merge('messaging.operation' => 'process')
+            executions_count = (executions || 0) + 1 # because we run before the count is incremented in ActiveJob::Execution
 
-                extracted_context = OpenTelemetry.propagation.extract(job.metadata)
-                OpenTelemetry::Context.with_current(extracted_context) do
-                  if otel_config[:propagation_style] == :child
-                    otel_tracer.in_span(span_name, attributes: span_attributes, kind: span_kind) do |span|
-                      span.set_attribute('messaging.active_job.executions', job.executions)
-                      block.call
-                    end
-                  else
-                    span_links = []
-                    if otel_config[:propagation_style] == :link
-                      span_context = OpenTelemetry::Trace.current_span(extracted_context).context
-                      span_links << OpenTelemetry::Trace::Link.new(span_context) if span_context.valid?
-                    end
+            extracted_context = OpenTelemetry.propagation.extract(metadata)
+            OpenTelemetry::Context.with_current(extracted_context) do
+              if otel_config[:propagation_style] == :child
+                otel_tracer.in_span(span_name, attributes: span_attributes, kind: span_kind) do |span|
+                  span.set_attribute('messaging.active_job.executions', executions_count)
+                  super
+                end
+              else
+                span_links = []
+                if otel_config[:propagation_style] == :link
+                  span_context = OpenTelemetry::Trace.current_span(extracted_context).context
+                  span_links << OpenTelemetry::Trace::Link.new(span_context) if span_context.valid?
+                end
 
-                    root_span = otel_tracer.start_root_span(span_name, attributes: span_attributes, links: span_links, kind: span_kind)
-                    OpenTelemetry::Trace.with_span(root_span) do |span|
-                      span.set_attribute('messaging.active_job.executions', job.executions)
-                      block.call
-                    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
-                      root_span.finish
-                    end
-                  end
+                root_span = otel_tracer.start_root_span(span_name, attributes: span_attributes, links: span_links, kind: span_kind)
+                OpenTelemetry::Trace.with_span(root_span) do |span|
+                  span.set_attribute('messaging.active_job.executions', executions_count)
+                  super
+                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
+                  root_span.finish
                 end
-              ensure
-                # We may be in a job system (eg: resque) that forks and kills worker processes often.
-                # We don't want to lose spans by not flushing any span processors, so we optionally force it here.
-                OpenTelemetry.tracer_provider.force_flush if otel_config[:force_flush]
               end
             end
+          ensure
+            # We may be in a job system (eg: resque) that forks and kills worker processes often.
+            # We don't want to lose spans by not flushing any span processors, so we optionally force it here.
+            OpenTelemetry.tracer_provider.force_flush if otel_config[:force_flush]
           end
 
           private

data/lib/opentelemetry/instrumentation/active_job/patches/base.rb

@@ -27,7 +27,7 @@ module OpenTelemetry
           end
 
           def deserialize(job_data)
-            self.metadata = (deserialize_arguments(job_data['metadata']) || []).to_h
+            self.metadata = deserialize_arguments(job_data['metadata'] || []).to_h
             super
           end
         end

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActiveJob
-      VERSION = '0.1.4'
+      VERSION = '0.3.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-active_job
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.3.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.3
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.3
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-test-helpers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -228,10 +242,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-active_job/v0.1.4/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-active_job/v0.3.0/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/active_job
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-active_job/v0.1.4
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-active_job/v0.3.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -240,7 +254,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="