opentelemetry-instrumentation-que 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b002b6a18b6060dc91cba7a07ef363a876a8f80aae2b7158acc13aaea5eeb1e9
-  data.tar.gz: 6d2b621b3a0b71de59474773ace767aa0edb88ced8c73b25a5246b0184721953
+  metadata.gz: b2bbbba5e64be2adb78788b8b170b8ac9c62f8f67a191d8bf6e3e1e5748f7804
+  data.tar.gz: 0db850fef370111e2a2bd9dc3ab8e9c1f7f147d35404f80dbdd5a6eab6167777
 SHA512:
-  metadata.gz: a7e4fe04be57b7e7a107ec61b621628b86f9099c44b2b57d8841b9f59852841dae8924919e5d04a6504c6b9aecda3f4d598a91434de9527a78e50ff54d1c753b
-  data.tar.gz: b669ba2147651707f2067a7416aa0a773dbdd487bc3bd545a15ffd45d2c91ae13c398c9cd089153cba7534b93102f20d91493680311ae3ec484778c389ab9234
+  metadata.gz: 1a84213f2bddd3cf9737d47b7595c5e227f6fb574d2e64b6d29555b51257ed7955393ba3933c8c3a29d85c0cf877106e3b290657eef4dbf450befefc7eb7830d
+  data.tar.gz: 67e09a8daab3bf1bc4654404d83f56e57681c78b56bca85e27ce656719916dfbbe76ccddbcf65849956e87d3aff89c2deb8259472464fa10f9cee34386cae660

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-que
 
+### v0.7.0 / 2023-09-07
+
+* FIXED: Align messaging instrumentation operation names
+
+### v0.6.2 / 2023-08-07
+
+* FIXED: Correctly set bulk_enqueue job options
+
 ### v0.6.1 / 2023-06-05
 
 * FIXED: Base config options 

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

@@ -22,7 +22,7 @@ module OpenTelemetry
               tracer = Que::Instrumentation.instance.tracer
               otel_config = Que::Instrumentation.instance.config
 
-              tracer.in_span('send', kind: :producer) do |span|
+              tracer.in_span('publish', kind: :producer) do |span|
                 # Que doesn't have a good place to store metadata. There are
                 # basically two options: the job payload and the job tags.
                 #
@@ -46,7 +46,10 @@ module OpenTelemetry
                 # 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] = job_options.merge(tags: tags)
+                  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
@@ -54,7 +57,7 @@ module OpenTelemetry
                   job_attrs = job.que_attrs
                 end
 
-                span.name = "#{job_attrs[:job_class]} send"
+                span.name = "#{job_attrs[:job_class]} publish"
                 span.add_attributes(QueJob.job_attributes(job_attrs))
 
                 job
@@ -70,7 +73,7 @@ module OpenTelemetry
             attributes = {
               'messaging.system' => 'que',
               'messaging.destination_kind' => 'queue',
-              'messaging.operation' => 'send',
+              'messaging.operation' => 'publish',
               'messaging.destination' => job_attrs[:queue] || 'default',
               'messaging.que.job_class' => job_attrs[:job_class],
               'messaging.que.priority' => job_attrs[:priority] || 100

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Que
-      VERSION = '0.6.1'
+      VERSION = '0.7.0'
     end
   end
 end

data/lib/opentelemetry/instrumentation/que.rb

@@ -15,5 +15,5 @@ module OpenTelemetry
   end
 end
 
-require_relative './que/instrumentation'
-require_relative './que/version'
+require_relative 'que/instrumentation'
+require_relative 'que/version'

data/lib/opentelemetry/instrumentation.rb

@@ -19,4 +19,4 @@ module OpenTelemetry
   end
 end
 
-require_relative './instrumentation/que'
+require_relative 'instrumentation/que'

data/lib/opentelemetry-instrumentation-que.rb

@@ -4,4 +4,4 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require_relative './opentelemetry/instrumentation'
+require_relative 'opentelemetry/instrumentation'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-que
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.50.2
+        version: 1.56.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.50.2
+        version: 1.56.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: yard-doctest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.6
 description: Que instrumentation for the OpenTelemetry framework
 email:
 - cncf-opentelemetry-contributors@lists.cncf.io
@@ -258,10 +244,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.6.1/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-que/0.7.0/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.6.1
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-que/0.7.0
 post_install_message: 
 rdoc_options: []
 require_paths: