opentelemetry-instrumentation-que 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 540fe598d76b48500dee1e87d08fea0893669f5f4ff129f963638fe40eaf0c0f
-  data.tar.gz: 92756ec6a1b077eddb1adf8346d23b968419ba85a3354417cd307a246b5f51d3
+  metadata.gz: d086b86cf7e9b0ff32ad2b29bceb0de4ff488de6d656a744474f192f9bbe58c4
+  data.tar.gz: 0b393f71c91b59c6315d5f31070b8340ad2d91de23c7bdadd86e304937a42a78
 SHA512:
-  metadata.gz: f98a22743c5cf95a3b65decbf567d123d0783a3e067549dcb26974611126fd40f688c6548ccf3f7245e4fc4d61020ad9a8b0a6922b4a8508f65c548545490d4f
-  data.tar.gz: 465564fd061d8149dc7ea772f9b5386d38ed5738f82538e2e7d66eaa43a8d9542c80ce9ebc57025783496cc34cc2352bfc716cf26a5b73c032da98a056cc6505
+  metadata.gz: 2411caa844782fddce419ab227f2aa56be8db3a82d267bae8a24892ac97cdb367cdbb3e4c265d6219e640c929979bbe13984f31bcd5632752ddaa98c0a87d27b
+  data.tar.gz: 73d2fde3b9d7cfff4d76a1a930679af47abf2b3a957fcf649d242380d80cc6c749ed1c757240194cd3968a2138d5d45f16513a88e3493c914cfba8594e88e569

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-que
 
+### v0.8.4 / 2024-10-08
+
+* FIXED: Fix bulk_enqueue when enqueuing more than 5 jobs
+
 ### v0.8.3 / 2024-07-23
 
 * DOCS: Add cspell to CI

data/README.md

@@ -6,7 +6,7 @@ The Que instrumentation is a community-maintained instrumentation for the [Que][
 
 Install the gem using:
 
-```
+```console
 gem install opentelemetry-instrumentation-que
 ```
 
@@ -63,25 +63,25 @@ end
 
 The `opentelemetry-instrumentation-que` gem source is [on github][repo-github], along with related gems including `opentelemetry-api` and `opentelemetry-sdk`.
 
-The OpenTelemetry Ruby gems are maintained by the OpenTelemetry-Ruby special interest group (SIG). You can get involved by joining us in [GitHub Discussions][discussions-url] or attending our weekly meeting. See the [meeting calendar][community-meetings] for dates and times. For more information on this and other language SIGs, see the OpenTelemetry [community page][ruby-sig].
+The OpenTelemetry Ruby gems are maintained by the OpenTelemetry Ruby special interest group (SIG). You can get involved by joining us on our [GitHub Discussions][discussions-url], [Slack Channel][slack-channel] or attending our weekly meeting. See the [meeting calendar][community-meetings] for dates and times. For more information on this and other language SIGs, see the OpenTelemetry [community page][ruby-sig].
 
 ## Testing the gem locally
 
 To install test dependencies run:
 
-```
+```console
 bundle exec appraisal
 ```
 
 To run tests on all appraised Que versions, run:
 
-```
+```console
 bundle exec appraisal rake test
 ```
 
 To run tests with a specific Que version, run:
 
-```
+```console
 bundle exec appraisal [que-version] rake test
 ```
 
@@ -97,5 +97,6 @@ The `opentelemetry-instrumentation-que` gem is distributed under the Apache 2.0
 [license-github]: https://github.com/open-telemetry/opentelemetry-ruby-contrib/blob/main/LICENSE
 [ruby-sig]: https://github.com/open-telemetry/community#ruby-sig
 [community-meetings]: https://github.com/open-telemetry/community#community-meetings
+[slack-channel]: https://cloud-native.slack.com/archives/C01NWKKMKMY
 [discussions-url]: https://github.com/open-telemetry/opentelemetry-ruby/discussions
 [appraisal-file]: https://github.com/open-telemetry/opentelemetry-ruby-contrib/blob/main/instrumentation/que/Appraisals

data/lib/opentelemetry/instrumentation/que/patches/que_job.rb

@@ -19,6 +19,10 @@ module OpenTelemetry
           # Module to prepend to Que singleton class
           module ClassMethods
             def enqueue(*args, job_options: {}, **arg_opts)
+              # In Que version 2.1.0 `bulk_enqueue` was introduced.
+              # In that case, the span is created inside the `bulk_enqueue` method.
+              return super(*args, **arg_opts) if gem_version >= Gem::Version.new('2.1.0') && Thread.current[:que_jobs_to_bulk_insert]
+
               tracer = Que::Instrumentation.instance.tracer
               otel_config = Que::Instrumentation.instance.config
 
@@ -43,19 +47,8 @@ module OpenTelemetry
                   OpenTelemetry.propagation.inject(tags, setter: TagSetter)
                 end
 
-                # In Que version 2.1.0 `bulk_enqueue` was introduced and in order
-                # for it to work, we must pass `job_options` to `bulk_enqueue` instead of enqueue.
-                if gem_version >= Gem::Version.new('2.1.0') && Thread.current[:que_jobs_to_bulk_insert]
-                  Thread.current[:que_jobs_to_bulk_insert][:job_options] = Thread.current[:que_jobs_to_bulk_insert][:job_options]&.merge(tags: tags) do |_, a, b|
-                    a.is_a?(Array) && b.is_a?(Array) ? a.concat(b) : b
-                  end
-
-                  job = super(*args, **arg_opts)
-                  job_attrs = Thread.current[:que_jobs_to_bulk_insert][:jobs_attrs].last
-                else
-                  job = super(*args, job_options: job_options.merge(tags: tags), **arg_opts)
-                  job_attrs = job.que_attrs
-                end
+                job = super(*args, job_options: job_options.merge(tags: tags), **arg_opts)
+                job_attrs = job.que_attrs
 
                 span.name = "#{job_attrs[:job_class]} publish"
                 span.add_attributes(QueJob.job_attributes(job_attrs))
@@ -67,6 +60,32 @@ module OpenTelemetry
             def gem_version
               @gem_version ||= Gem.loaded_specs['que'].version
             end
+
+            if Gem.loaded_specs['que'].version >= Gem::Version.new('2.1.0')
+              def bulk_enqueue(**_kwargs, &block)
+                tracer = Que::Instrumentation.instance.tracer
+                otel_config = Que::Instrumentation.instance.config
+
+                tracer.in_span('publish', kind: :producer) do |span|
+                  super do
+                    yield
+
+                    job_attrs = Thread.current[:que_jobs_to_bulk_insert][:jobs_attrs]
+
+                    unless job_attrs.empty?
+                      span.name = "#{job_attrs.first[:job_class]} publish"
+                      span.add_attributes(QueJob.job_attributes(job_attrs.first))
+                    end
+
+                    if otel_config[:propagation_style] != :none
+                      job_options = Thread.current[:que_jobs_to_bulk_insert][:job_options]
+                      job_options[:tags] ||= []
+                      OpenTelemetry.propagation.inject(job_options[:tags], setter: TagSetter)
+                    end
+                  end
+                end
+              end
+            end
           end
 
           def self.job_attributes(job_attrs)

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Que
-      VERSION = '0.8.3'
+      VERSION = '0.8.4'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-que
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-24 00:00:00.000000000 Z
+date: 2024-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.65.0
+        version: 1.66.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.65.0
+        version: 1.66.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: 1.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: 1.22.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -202,10 +202,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-que/0.8.3/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-que/0.8.4/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/que
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-que/0.8.3
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-que/0.8.4
 post_install_message: 
 rdoc_options: []
 require_paths: