opentelemetry-instrumentation-resque 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef796cb15879b9402a9011bb7dcc141749218e5be48cb2a8f4738566cf2197aa
-  data.tar.gz: 69bad550cf1f1aa2599b14fcc35006081a5d4a8d7f781eb2267a487941e2af0f
+  metadata.gz: 746b7a4e96c5fd50366102226381d61002b6a3ead260a20fd4e914753c6c47f4
+  data.tar.gz: e04f3c654a08fbcf38b8f9b0bf51dfd31ab2308ec6d6b743877a1850f9e9db18
 SHA512:
-  metadata.gz: bcdf36e15622c47911fda2a55943986379c4be855f5223df6a02132eb8562535a1e3765c636c7eb2327d88684b8e749d141d896689d14b598a4c3c9a35a4329d
-  data.tar.gz: c4984d73ad916d4b9361eda5be9ae860204189a2660ce4a98f13480a0bc25d40453dfc1bbf9fc431419836fc9f8b16bb7b6f27c221881f32e00d4ea0ea8c6c9e
+  metadata.gz: 972fcff396d70a3f204858ec12137d9235e87490d3a4b5768c47885e660b0ccf77ae47cd543c1584eb04f6e4ab42cdc67c085ba83f04b4ecf88e206ebc317112
+  data.tar.gz: 30609d820c45d2e1cde550f5be22e943df55a0b67cca5fa2765e8b43dd3d59bedd27a31118f481212795cf155d7fc539b3a56e6e15c84de8b91c6a874616d9b2

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release History: opentelemetry-instrumentation-resque
 
+### v0.4.1 / 2023-06-05
+
+* FIXED: Base config options 
+
+### v0.4.0 / 2023-04-17
+
+* BREAKING CHANGE: Drop support for EoL Ruby 2.7 
+
+* ADDED: Drop support for EoL Ruby 2.7 
+* ADDED: Add :force_flush option to Resque instrumentation 
+* FIXED: Fix flaky tests for resque. 
+
 ### v0.3.1 / 2023-01-14
 
 * DOCS: Fix gem homepage 

data/lib/opentelemetry/instrumentation/resque/instrumentation.rb

@@ -18,8 +18,33 @@ module OpenTelemetry
           defined?(::Resque)
         end
 
-        option :span_naming,       default: :queue, validate: %I[job_class queue]
-        option :propagation_style, default: :link,  validate: %i[link child none]
+        ## Supported configuration keys for the install config hash:
+        #
+        # force_flush: controls if spans are forcibly flushed upon job completion
+        #   - :ask_the_job (default) - if `Resque::Worker#fork_per_job?` is set,
+        #     all completed spans will be synchronously flushed at the end of a
+        #     job's execution
+        #   - :always - all completed spans will be synchronously flushed at the
+        #     end of a job's execution
+        #   - :never - the job will not intervene with the processing of spans
+        #
+        # span_naming: when `:job_class`, the span names will be set to
+        #   '<job class name> <operation>'. When `:queue`, the span names
+        #   will be set to '<destination / queue name> <operation>'
+        #
+        # propagation_style: controls how the job's execution is traced and related
+        #   to the trace where the job was enqueued. Can be one of:
+        #   - :link (default) - the job will be executed in a separate trace. The
+        #     initial span of the execution trace will be linked to the span that
+        #     enqueued the job, via a Span Link.
+        #   - :child - the job will be executed in the same logical trace, as a direct
+        #     child of the span that enqueued the job.
+        #   - :none - the job's execution will not be explicitly linked to the span that
+        #     enqueued the job.
+
+        option :force_flush,       default: :ask_the_job, validate: %I[ask_the_job always never]
+        option :span_naming,       default: :queue,       validate: %I[job_class queue]
+        option :propagation_style, default: :link,        validate: %i[link child none]
 
         private
 

data/lib/opentelemetry/instrumentation/resque/patches/resque_job.rb

@@ -54,6 +54,11 @@ module OpenTelemetry
                 end
               end
             end
+          ensure
+            if (config[:force_flush] == :ask_the_job && worker&.fork_per_job?) ||
+               config[:force_flush] == :always
+              OpenTelemetry.tracer_provider.force_flush
+            end
           end
 
           private

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Resque
-      VERSION = '0.3.1'
+      VERSION = '0.4.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-resque
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-14 00:00:00.000000000 Z
+date: 2023-06-05 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.21.0
+        version: 0.22.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.1
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: opentelemetry-test-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.41.1
+        version: 1.50.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.41.1
+        version: 1.50.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -228,10 +228,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-resque/0.3.1/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-resque/0.4.1/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/resque
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-resque/0.3.1
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-resque/0.4.1
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -240,14 +240,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Resque instrumentation for the OpenTelemetry framework