opentelemetry-instrumentation-ruby_kafka 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b7a6f767f7bc01631fb7c795420b641fe40a45985a37ffe02cf6f6bbe7e186c
-  data.tar.gz: ae102bd72261240ca875f18a824bf0d35180aa65d444c6c416fe4e9f1f926fd1
+  metadata.gz: 304cebb35fa179634d1ea9f3baf2559021ed69bdae1d2a1348dd4511b5df1260
+  data.tar.gz: c0273721ce9c27a4c9ce55e1d7d9647b743f85b9e141755f7001ee5258dc36ea
 SHA512:
-  metadata.gz: 12f07057792fad0e23b53e50259fca79aa36571b191ea2418f89d92704cb233d256bffa43c98a793c4bc2eec8d4ed1810ec7ae1deae3a66fa08d4df49d72a53c
-  data.tar.gz: f52ce0dadc1acfc3062f723379fae88dd9bde6fe2ccff6113f59b5c45831709bd5503ffb25399ce82484c976b877e8cc38819e1e8d59c5c67062762a7f9a9f91
+  metadata.gz: 53a19b2190a50b3ad22c4817af0867e5808d604c862f85e5ff0381de148d8282f64df5c65aee3c9e0ed70465caddd19498defb12a5a47d33266ad9b996ea0e66
+  data.tar.gz: 58f1e0e7e7131c87f9ec663d2c9b48192e4e98c106e7c2159ab2228aa61252489097e513509ea1add7f8f1204c846966c45dc7f25d843fed07462b7574f1ca27

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-ruby_kafka
 
+### v0.21.0 / 2023-09-07
+
+* FIXED: Align messaging instrumentation operation names
+
+### v0.20.2 / 2023-08-09
+
+* FIXED: propagate context from async producer
+
 ### v0.20.1 / 2023-06-05
 
 * FIXED: Base config options 

data/lib/opentelemetry/instrumentation/ruby_kafka/instrumentation.rb

@@ -32,12 +32,14 @@ module OpenTelemetry
         end
 
         def require_patches
+          require_relative 'patches/async_producer'
           require_relative 'patches/producer'
           require_relative 'patches/consumer'
           require_relative 'patches/client'
         end
 
         def patch
+          ::Kafka::AsyncProducer.prepend(Patches::AsyncProducer)
           ::Kafka::Producer.prepend(Patches::Producer)
           ::Kafka::Consumer.prepend(Patches::Consumer)
           ::Kafka::Client.prepend(Patches::Client)

data/lib/opentelemetry/instrumentation/ruby_kafka/patches/async_producer.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module OpenTelemetry
+  module Instrumentation
+    module RubyKafka
+      module Patches
+        # The AsyncProducer module contains the instrumentation patch the AsyncProducer#produce method
+        module AsyncProducer
+          def produce(value, topic:, **options)
+            options = __otel_merge_options!(**options)
+            super
+          end
+
+          def __otel_merge_options!(**options)
+            options ||= { headers: {} }
+            # The propagator mutates the carrier (first positional argument), so we need to set headers to empty hash so
+            # that there's something to mutate
+            options[:headers] = {} unless options[:headers]
+            OpenTelemetry.propagation.inject(options[:headers])
+            options
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opentelemetry/instrumentation/ruby_kafka/patches/client.rb

@@ -24,7 +24,7 @@ module OpenTelemetry
 
             attributes['messaging.kafka.partition'] = partition if partition
 
-            tracer.in_span("#{topic} send", attributes: attributes, kind: :producer) do
+            tracer.in_span("#{topic} publish", attributes: attributes, kind: :producer) do
               OpenTelemetry.propagation.inject(headers)
               super
             end

data/lib/opentelemetry/instrumentation/ruby_kafka/patches/producer.rb

@@ -17,9 +17,15 @@ module OpenTelemetry
               'messaging.destination_kind' => 'topic'
             }
 
-            tracer.in_span("#{topic} send", attributes: attributes, kind: :producer) do
-              OpenTelemetry.propagation.inject(headers)
-              super
+            # If trace context is present in headers, extract and use it as parent. If there is _no_ trace context key
+            # in the headers, OpenTelemetry.propagation.extract will return an unmodified copy of the the current
+            # Thread's context, so the next two lines preserve the correct Thread-local context.
+            ctx = OpenTelemetry.propagation.extract(headers)
+            OpenTelemetry::Context.with_current(ctx) do
+              tracer.in_span("#{topic} publish", attributes: attributes, kind: :producer) do
+                OpenTelemetry.propagation.inject(headers)
+                super
+              end
             end
           end
 

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module RubyKafka
-      VERSION = '0.20.1'
+      VERSION = '0.21.0'
     end
   end
 end

data/lib/opentelemetry/instrumentation/ruby_kafka.rb

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

data/lib/opentelemetry/instrumentation.rb

@@ -16,4 +16,4 @@ module OpenTelemetry
   end
 end
 
-require_relative './instrumentation/ruby_kafka'
+require_relative 'instrumentation/ruby_kafka'

data/lib/opentelemetry-instrumentation-ruby_kafka.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-ruby_kafka
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.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
@@ -44,14 +44,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
@@ -128,14 +128,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: ruby-kafka
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +178,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: RubyKafka instrumentation for the OpenTelemetry framework
 email:
 - cncf-opentelemetry-contributors@lists.cncf.io
@@ -207,6 +193,7 @@ files:
 - lib/opentelemetry/instrumentation.rb
 - lib/opentelemetry/instrumentation/ruby_kafka.rb
 - lib/opentelemetry/instrumentation/ruby_kafka/instrumentation.rb
+- lib/opentelemetry/instrumentation/ruby_kafka/patches/async_producer.rb
 - lib/opentelemetry/instrumentation/ruby_kafka/patches/client.rb
 - lib/opentelemetry/instrumentation/ruby_kafka/patches/consumer.rb
 - lib/opentelemetry/instrumentation/ruby_kafka/patches/producer.rb
@@ -216,10 +203,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-ruby_kafka/0.20.1/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-ruby_kafka/0.21.0/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/ruby_kafka
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-ruby_kafka/0.20.1
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-ruby_kafka/0.21.0
 post_install_message: 
 rdoc_options: []
 require_paths: