opentelemetry-instrumentation-trilogy 0.59.1 → 0.59.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1df4ada92030e68e3c0e9f757c6d659286ed0cadc3f66837f2a832f17ad53ba2
-  data.tar.gz: 47e1e02d207c36d2104d24e1a9ebc1551c31c1e80c3c7ae12d1c9e0db7c9583a
+  metadata.gz: c58c35f732e1edbc765b0de5afa96c7be76a5d260e110ce8ff40a638a1245cef
+  data.tar.gz: 103b0b742b05ce46e67037ff56015c9bf92e3af53ed08ad4786727faa44bacce
 SHA512:
-  metadata.gz: 72679d7b82f83224086e3aa0405de4fb2ff6a25f97a510514949babe97fda97f51de2478ec05b676ed5eca5095b4e7d598745ad32276435ce8015ed1ebb36d18
-  data.tar.gz: 6da6b91ee971a34a0f6daa0af358e17450687df613f04cd0c8df4dc88d6f8c491a5a51ab35e59a1ed0269f9ccf7c8cdf74de7133ea762ceaf26232618546fcab
+  metadata.gz: caa14fa99c27628dea3e56f07152a51898e97d8e45d0b0b140f2af816d4f03e61a06b2c5f2ba90eae5034f5fcb6a59702790a7894580603a6ba629f995821994
+  data.tar.gz: ed6e2f671f0091ce0ba2ee8b27c68a32728d124103f7e85f6cc42fca08507678b44a16a655ceb8ae661e12090e7a5590f34082d8316bc0fe084f015921b775df

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-trilogy
 
+### v0.59.3 / 2024-04-30
+
+* FIXED: Bundler conflict warnings
+
+### v0.59.2 / 2024-02-20
+
+* FIXED: Dup string if frozen in trilogy query
+
 ### v0.59.1 / 2024-02-08
 
 * FIXED: Add missing requires for sql-helpers to mysql, pg, and trilogy instrumentation

data/lib/opentelemetry/instrumentation/trilogy/instrumentation.rb

@@ -7,22 +7,6 @@
 module OpenTelemetry
   module Instrumentation
     module Trilogy
-      # @api private
-      class NoopPropagator
-        EMPTY_LIST = [].freeze
-        private_constant(:EMPTY_LIST)
-
-        def inject(carrier, context: Context.current, setter: nil); end
-
-        def extract(carrier, context: Context.current, getter: nil)
-          context
-        end
-
-        def fields
-          EMPTY_LIST
-        end
-      end
-
       # The Instrumentation class contains logic to detect and install the Trilogy instrumentation
       class Instrumentation < OpenTelemetry::Instrumentation::Base
         install do |config|
@@ -61,10 +45,9 @@ module OpenTelemetry
           propagator = config[:propagator]
           @propagator = case propagator
                         when 'vitess' then fetch_propagator(propagator, 'OpenTelemetry::Propagator::Vitess')
-                        when 'none', nil then NoopPropagator.new
+                        when 'none', nil then nil
                         else
                           OpenTelemetry.logger.warn "The #{propagator} propagator is unknown and cannot be configured"
-                          NoopPropagator.new
                         end
         end
 

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

@@ -50,7 +50,14 @@ module OpenTelemetry
               ),
               kind: :client
             ) do |_span, context|
-              propagator.inject(sql, context: context)
+              if propagator && sql.frozen?
+                sql = +sql
+                propagator.inject(sql, context: context)
+                sql.freeze
+              elsif propagator
+                propagator.inject(sql, context: context)
+              end
+
               super(sql)
             end
           end

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Trilogy
-      VERSION = '0.59.1'
+      VERSION = '0.59.3'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-trilogy
 version: !ruby/object:Gem::Version
-  version: 0.59.1
+  version: 0.59.3
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.60.1
+        version: '1.62'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.60.1
+        version: '1.62'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -262,26 +262,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.17.1
-- !ruby/object:Gem::Dependency
-  name: trilogy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -317,10 +297,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.59.1/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.59.3/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/trilogy
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.59.1
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.59.3
 post_install_message: 
 rdoc_options: []
 require_paths: