opentelemetry-instrumentation-ruby_kafka 0.18.3 → 0.18.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c197d8f9658380579166a37e44625baeece12899ed428cf9f82c4e451fc2edf
-  data.tar.gz: 201ecc2e0eb0c5856b390f7dd4099ae7ce0089be871f15bd0418fff12f6609bc
+  metadata.gz: 3ce0035e7b4e1ad13b91ab90c157529e073fcfe85214f63042965cdec193449f
+  data.tar.gz: 5c0d6aede5d7e84702a399161109574eb1219dc5fca46f53dec218591ed2f7eb
 SHA512:
-  metadata.gz: 573936f80cf6ff98ad603bb73d86e1a96581c922b1b32195d40168a8fd9b2a9d82984afb2fb0d471673c613f1560d13f1b0f98959f17989f65e2d5c1728721e2
-  data.tar.gz: adf455e7acfb9712be7e6fc1db17657bd7aa3dccf489b9af7c155a2733bfc70c011fd80ad60360081b1d8ab1035ad881f06624dc4d475e4a3f1c43b31f09f529
+  metadata.gz: 2a568b807a7e2ff0f40ed40c2d06a576ee7bbc7442d2ca2d0fc9f3387ac13b91ee23bc047bbd040ec9e51e5151668fd42ddb48d27b7c442b5648da9b024d45b6
+  data.tar.gz: adf70c5f23b35199dd05c084555f1da8c8cf7c566a44e50cc5b7a388cc49d4d9e8adf941e117bbe15ede57ff91fc95eee3bb24cecb481c40065b05ae20cddd06

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release History: opentelemetry-instrumentation-ruby_kafka
 
+### 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)
+
 ### v0.18.3 / 2021-09-29
 
 * FIXED: Use Kafka::VERSION fallback for compatibility 

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.3'
+      VERSION = '0.18.6'
     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.3
+  version: 0.18.6
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-base
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -196,15 +196,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.3/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-ruby_kafka/v0.18.6/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.3
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-ruby_kafka/v0.18.6
 post_install_message: 
 rdoc_options: []
 require_paths: