opentelemetry-instrumentation-trilogy 0.59.0 → 0.59.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 659855aedd21b5e568de5d42caddb847da28ede64dde5ea1c1122d5417b6f7bf
-  data.tar.gz: 4bd835b5ece9052f67c598c5b55ee2290f1e27675c252a1bdaf6e54583f9b961
+  metadata.gz: 663fb1321f66da30c5c7e408c491f9034198d1a92bde31c998c16e4a466801b1
+  data.tar.gz: f662f92333f829ba76ed3c01c4a7e5656fb69eea0332a4f645fcd4728f970ac7
 SHA512:
-  metadata.gz: a4e179492feb03fd83a5040a7c26570c6184fe850232b7318668687b6f7092047c825b6a2fb852362a8b860b56b86216cac72927da78d1e0fc8463e33af32511
-  data.tar.gz: 2495228e827b77ee3bfec6ed3733124364da88ddc8ae459b0cea62fdc3e0ed56aca06b6d09a3514782feb65f645c0fcebefb2f45d00e14a8335784aa34c995e0
+  metadata.gz: a5835242ed0972f4e5fde94437cac7a23f9ca2e4110394a6a609565c4052ceef4b1c35f075c1b95d56dd3e5f12b7f29bfca764bda07f3bc3ba8a66e1d69b0a55
+  data.tar.gz: 8122b2878a76de0fbdc5371619e94b2ef5bc31282e8a17195938f9e9ddd9ac0bb40ab0b6bbf9c010b48bbdfe27f465458eb336d04ddd9dde0077eeaab15ed4bd

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-trilogy
 
+### 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
+
 ### v0.59.0 / 2024-02-08
 
 * BREAKING CHANGE: Move shared sql behavior to helper gems

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

@@ -4,6 +4,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'opentelemetry-helpers-mysql'
+require 'opentelemetry-helpers-sql-obfuscation'
+
 module OpenTelemetry
   module Instrumentation
     module Trilogy
@@ -47,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.0'
+      VERSION = '0.59.2'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-trilogy
 version: !ruby/object:Gem::Version
-  version: 0.59.0
+  version: 0.59.2
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -317,10 +317,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.0/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.59.2/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.0
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-trilogy/0.59.2
 post_install_message: 
 rdoc_options: []
 require_paths: