opentelemetry-instrumentation-ruby_kafka 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1e4a1b9161c4b546f114ebb4dd245b31a65cb660e4bcb64269cd8b92400e53f
-  data.tar.gz: 7f66abaa92b4dc4ab0b41b26aa39dbc3818c2e9197223211243985d079d58cfd
+  metadata.gz: 133f65fac0ceb65bcee0a8999e31f5421b1d5bff31074700024207fdddd04db2
+  data.tar.gz: 2fed53fb52f1daa811262fd1b50e515b2edd4752ec54ff273ff52a4421a4edd9
 SHA512:
-  metadata.gz: 93d4f1c8552777108e38640241b0904733e2e7f50afe99d6fab1621567b91119462cb44c667a90034efe013930bfd9dfd3a69f88f2592ff405a13b7a99c63b82
-  data.tar.gz: 829d7321a191a7604a9c5b059bf11abec0748bbd5565c920c065d2b49e8dad32cdd26a8211e3d5481ba6c76235ede2fb781f0c21d5aaf798d6c1af34180c58a4
+  metadata.gz: 5056b08fd6bba75591875d2282faef9b7a05804edeb98654b5d576b1ceaaa5db20841abbd3531df1f1d209b240d3cd56f7309e85957cee88f068f6efd959da77
+  data.tar.gz: 6a4560d370ca069a1d08b8ba61c40469c50d8a32c7958aa47ccbe0893966ab07e2d3f410c210a834719d85ea327ce2060ccada199352b13188c10c9d6cd7d355

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History: opentelemetry-instrumentation-ruby_kafka
 
+### v0.13.0 / 2021-01-29
+
+* FIXED: Add minimum gem version for ruby-kafka 
+* FIXED: Ruby_kafka baggage propagation 
+* FIXED: Remove unused ruby-kafka events file 
+
 ### v0.12.0 / 2020-12-24
 
 * Initial release.

data/README.md

@@ -32,7 +32,7 @@ end
 
 ## Examples
 
-Example usage can be seen in the `./example/ruby_kafka.rb` file [here](https://github.com/open-telemetry/opentelemetry-ruby/blob/master/instrumentation/ruby_kafka/example/ruby_kafka.rb)
+Example usage can be seen in the `./example/ruby_kafka.rb` file [here](https://github.com/open-telemetry/opentelemetry-ruby/blob/main/instrumentation/ruby_kafka/example/ruby_kafka.rb)
 
 ## How can I get involved?
 
@@ -47,7 +47,7 @@ The `opentelemetry-instrumentation-ruby_kafka` gem is distributed under the Apac
 [ruby_kafka-home]: https://github.com/zendesk/ruby-kafka
 [bundler-home]: https://bundler.io
 [repo-github]: https://github.com/open-telemetry/opentelemetry-ruby
-[license-github]: https://github.com/open-telemetry/opentelemetry-ruby/blob/master/LICENSE
+[license-github]: https://github.com/open-telemetry/opentelemetry-ruby/blob/main/LICENSE
 [ruby-sig]: https://github.com/open-telemetry/community#ruby-sig
 [community-meetings]: https://github.com/open-telemetry/community#community-meetings
 [ruby-gitter]: https://gitter.im/open-telemetry/opentelemetry-ruby

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

@@ -10,17 +10,27 @@ module OpenTelemetry
       # The Instrumentation class contains logic to detect and install the
       # KafkaRuby instrumentation
       class Instrumentation < OpenTelemetry::Instrumentation::Base
+        MINIMUM_VERSION = Gem::Version.new('0.7.0')
+
         install do |_config|
           require_patches
           patch
         end
 
         present do
-          defined?(::Kafka)
+          !defined?(::Kafka).nil?
+        end
+
+        compatible do
+          gem_version >= MINIMUM_VERSION
         end
 
         private
 
+        def gem_version
+          Gem.loaded_specs['ruby-kafka'].version
+        end
+
         def require_patches
           require_relative 'patches/producer'
           require_relative 'patches/consumer'

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

@@ -38,8 +38,10 @@ module OpenTelemetry
               attributes['messaging.kafka.message_key'] = message.key if message.key
 
               parent_context = OpenTelemetry.propagation.text.extract(message.headers)
-              tracer.in_span("#{topic} process", with_parent: parent_context, attributes: attributes, kind: :consumer) do
-                yield message
+              OpenTelemetry::Context.with_current(parent_context) do
+                tracer.in_span("#{topic} process", attributes: attributes, kind: :consumer) do
+                  yield message
+                end
               end
             end
           end

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

@@ -22,12 +22,14 @@ module OpenTelemetry
 
               attributes['messaging.kafka.message_key'] = message.key if message.key
 
-              span_context = OpenTelemetry::Trace.current_span(OpenTelemetry.propagation.text.extract(message.headers)).context
-              link = OpenTelemetry::Trace::Link.new(span_context) if span_context.valid?
-              links = [link] if link
+              parent_context = OpenTelemetry.propagation.text.extract(message.headers)
+              span_context = OpenTelemetry::Trace.current_span(parent_context).context
+              links = [OpenTelemetry::Trace::Link.new(span_context)] if span_context.valid?
 
-              tracer.in_span("#{message.topic} process", links: links, attributes: attributes, kind: :consumer) do
-                yield message
+              OpenTelemetry::Context.with_current(parent_context) do
+                tracer.in_span("#{message.topic} process", links: links, attributes: attributes, kind: :consumer) do
+                  yield message
+                end
               end
             end
           end

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module RubyKafka
-      VERSION = '0.12.0'
+      VERSION = '0.13.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-ruby_kafka
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  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: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +178,6 @@ files:
 - lib/opentelemetry-instrumentation-ruby_kafka.rb
 - lib/opentelemetry/instrumentation.rb
 - lib/opentelemetry/instrumentation/ruby_kafka.rb
-- lib/opentelemetry/instrumentation/ruby_kafka/events.rb
 - lib/opentelemetry/instrumentation/ruby_kafka/instrumentation.rb
 - lib/opentelemetry/instrumentation/ruby_kafka/patches/client.rb
 - lib/opentelemetry/instrumentation/ruby_kafka/patches/consumer.rb
@@ -174,10 +187,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-ruby_kafka/v0.12.0/file.CHANGELOG.html
-  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/master/instrumentation/ruby_kafka
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-ruby_kafka/v0.13.0/file.CHANGELOG.html
+  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/ruby_kafka
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-ruby_kafka/v0.12.0
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-ruby_kafka/v0.13.0
 post_install_message: 
 rdoc_options: []
 require_paths:

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

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright The OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-require_relative 'events/connection/request'
-require_relative 'events/consumer_group/heartbeat'
-require_relative 'events/consumer_group/join_group'
-require_relative 'events/consumer_group/leave_group'
-require_relative 'events/consumer_group/sync_group'
-require_relative 'events/produce_operation/send_messages'
-require_relative 'events/producer/deliver_messages'
-
-module OpenTelemetry
-  module Instrumentation
-    module RubyKafka
-      module Events
-        ALL = [
-          Events::Connection::Request,
-          Events::ConsumerGroup::Heartbeat,
-          Events::ConsumerGroup::JoinGroup,
-          Events::ConsumerGroup::LeaveGroup,
-          Events::ConsumerGroup::SyncGroup,
-          Events::ProduceOperation::SendMessages,
-          Events::Producer::DeliverMessages
-        ].freeze
-      end
-    end
-  end
-end