opentelemetry-instrumentation-ruby_kafka 0.18.4 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c96f460c712257026eda354253cbe9ef59d8c86e90d22c1c6a70c459ba234765
-  data.tar.gz: b2a49c527bec89ba2147e3eac237b2a612b4ebc6590a44fe6a910fb300c3fce0
+  metadata.gz: c1fb7edf33409125e90f4fff35df9709adc03a59fcf279e5539716e5aea11109
+  data.tar.gz: d3618a72a5c3972ec3ab74d0fbdb4ccead8bab6284ebe3494a83fe27dd22be65
 SHA512:
-  metadata.gz: 89080545fb14a6f62f23575e8c70a8c47e108c8a1f6120816069006085a4b87ad32b450f827fc7a72c28505f67d7efa3600db1ca6cbb7d783ed64e9bd22ae56b
-  data.tar.gz: d5634c7b8e97de4600dfafd62b7aaf0a0c05c9b60017eed3f663a134ae76fd15eafac560d9f97d70f6719f022ca5d651431a93974ed74bcbdbdca9982ed8d39a
+  metadata.gz: a6056b4d5ca288b8b69a5a4898f86fa7f44907ddc7308df0a11abc028a68dda60e6ebc8740831e0500cf113e5601b0b6ab466f3bc4c7c1d37aa2d060eb01e411
+  data.tar.gz: a8e8d22d8400c607d0f998d33b1387e95ac889616b86c849f18a04bd877a7ca5ccc5eadea7837f8cb4e96876aaae19a641386d6baf3aad6137bf6cde8163c6cf

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Release History: opentelemetry-instrumentation-ruby_kafka
 
+### v0.19.0 / 2022-06-09
+
+* Upgrading Base dependency version
+* FIXED: Broken test file requirements 
+
+### v0.18.6 / 2022-05-02
+
+* FIXED: RubyGems Fallback 
+
+### v0.18.5 / 2021-12-02
+
+* (No significant changes)
+
 ### v0.18.4 / 2021-09-29
 
 * (No significant changes)

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

@@ -28,7 +28,7 @@ module OpenTelemetry
         private
 
         def gem_version
-          Gem.loaded_specs['ruby-kafka']&.version || Gem::Version.new(Kafka::VERSION)
+          Gem::Version.new(Kafka::VERSION)
         end
 
         def require_patches

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

@@ -4,6 +4,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require_relative '../utils'
+
 module OpenTelemetry
   module Instrumentation
     module RubyKafka
@@ -17,7 +19,9 @@ module OpenTelemetry
               'messaging.destination_kind' => 'topic'
             }
 
-            attributes['messaging.kafka.message_key'] = key if key
+            message_key = Utils.extract_message_key(key)
+            attributes['messaging.kafka.message_key'] = message_key if message_key
+
             attributes['messaging.kafka.partition'] = partition if partition
 
             tracer.in_span("#{topic} send", attributes: attributes, kind: :producer) do
@@ -35,7 +39,8 @@ module OpenTelemetry
                 'messaging.kafka.partition' => message.partition
               }
 
-              attributes['messaging.kafka.message_key'] = message.key if message.key
+              message_key = Utils.extract_message_key(message.key)
+              attributes['messaging.kafka.message_key'] = message_key if message_key
 
               parent_context = OpenTelemetry.propagation.extract(message.headers)
               OpenTelemetry::Context.with_current(parent_context) do

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

@@ -20,7 +20,8 @@ module OpenTelemetry
                 'messaging.kafka.offset' => message.offset
               }
 
-              attributes['messaging.kafka.message_key'] = message.key if message.key
+              message_key = Utils.extract_message_key(message.key)
+              attributes['messaging.kafka.message_key'] = message_key if message_key
 
               parent_context = OpenTelemetry.propagation.extract(message.headers)
               span_context = OpenTelemetry::Trace.current_span(parent_context).context

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module RubyKafka
+      # Utilities to help with instrumenting kafka
+      module Utils
+        module_function
+
+        def extract_message_key(key)
+          # skip encode if already valid utf8
+          return key if key.nil? || (key.encoding == Encoding::UTF_8 && key.valid_encoding?)
+
+          key.encode(Encoding::UTF_8)
+        rescue Encoding::UndefinedConversionError
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module RubyKafka
-      VERSION = '0.18.4'
+      VERSION = '0.19.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.18.4
+  version: 0.19.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2022-06-09 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.18.3
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.3
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-test-helpers
+  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: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -196,15 +210,16 @@ files:
 - lib/opentelemetry/instrumentation/ruby_kafka/patches/client.rb
 - lib/opentelemetry/instrumentation/ruby_kafka/patches/consumer.rb
 - lib/opentelemetry/instrumentation/ruby_kafka/patches/producer.rb
+- lib/opentelemetry/instrumentation/ruby_kafka/utils.rb
 - lib/opentelemetry/instrumentation/ruby_kafka/version.rb
 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.18.4/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-ruby_kafka/v0.19.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.18.4
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-ruby_kafka/v0.19.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -213,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="