bc-lightstep-ruby 2.4.1 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dea96b1f8199a7f6f69a07e76849d5d1fffaa6a2875abb428766cd34717e230b
-  data.tar.gz: e3f42dcd9d466d5cb20b3aefe7d0a63fb18fc4e9004d534214e1cc8a67533454
+  metadata.gz: 601c8290786658777472d7b16c8012b8758c4dcc2e4853cf5cdc3bf205133d50
+  data.tar.gz: 3f37e614a404c05d1677dff48f322b60e3cdbb4c4aba9d14b7da6f88e4b453a0
 SHA512:
-  metadata.gz: c6a1267f116201b2f1f40d115c0fec8cd38b5b9b954a364bb21f73aa5651b1eee1734e1a00fd3543d6b933b7a90206f1f88e90786dd60c15c1e2862e4edd8d0b
-  data.tar.gz: dc9124a5acfa9872af9fa5208fc858dee5041737e8c9c8c898ea618363f8f23c74d6507ffe17421fb9327734f687c2403136b30bc2afad7fccefca8b57f6e517
+  metadata.gz: fb660259c8196c8b053e0170bd6a86e09e0447151dd5e95188f5469456efeac647f05169d07bcd58cae5f6daa082c908db20f9d5dcb58b5fe8be725f2f91f1d2
+  data.tar.gz: ac9b91ec6d91becbd2fc564914f10db4d649b34f67558c9d77559e8f160531b399572abb8d4063c2b96128834133388c07a413f3d802e0537f637d2294815f3e

data/CHANGELOG.md

@@ -2,6 +2,20 @@ Changelog for the bc-lightstep-ruby gem.
 
 ### Pending Release
 
+### 2.6.1
+
+* Supports hook for controllers to specify additional span tags
+
+### 2.6.0
+
+* Add support for Rails/ActiveRecord 7
+* Add test coverage for Ruby 3.2
+
+### 2.5.0
+
+* Drop support for Ruby 2
+* Remove unused NullLogger dev dependency
+
 ### 2.4.1
 
 * Support positional argument methods when using the `Traceable` trace method

data/bc-lightstep-ruby.gemspec

@@ -31,22 +31,20 @@ Gem::Specification.new do |spec|
 
   spec.files         = Dir['README.md', 'CHANGELOG.md', 'CODE_OF_CONDUCT.md', 'lib/**/*', 'bc-lightstep-ruby.gemspec']
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.0'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.add_development_dependency 'activerecord', '> 4'
   spec.add_development_dependency 'bundler-audit', '~> 0.6'
   spec.add_development_dependency 'rake', '>= 12.0'
-  spec.add_development_dependency 'rspec', '~> 3.8'
+  spec.add_development_dependency 'redis', '~> 4'
+  spec.add_development_dependency 'rspec', '>= 3.8'
   spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4'
-  spec.add_development_dependency 'rubocop', '~> 1.0'
+  spec.add_development_dependency 'rubocop', '>= 1.0'
   spec.add_development_dependency 'rubocop-performance', '>= 1.5'
   spec.add_development_dependency 'simplecov', '~> 0.15'
   spec.add_development_dependency 'pry', '>= 0.12'
 
-  spec.add_development_dependency 'null-logger', '~> 0.1'
-  spec.add_development_dependency 'redis', '~> 4'
-
   spec.add_runtime_dependency 'activesupport', '>= 4'
   spec.add_runtime_dependency 'lightstep', '~> 0.17.0'
   spec.add_runtime_dependency 'faraday', ['>= 0.8', '< 2']

data/lib/bigcommerce/lightstep/active_record/adapter.rb

@@ -36,12 +36,21 @@ module Bigcommerce
         end
 
         ##
-        # Note: we only support patching mysql2 gem at this point
+        # Note: we only support patching mysql2 gem at this point.
         #
         # @return [Boolean]
         #
         def self.enabled?
-          defined?(::ActiveRecord) && ::Bigcommerce::Lightstep.active_record && ::ActiveRecord::Base.connection_config[:adapter].to_s.casecmp('mysql2').zero?
+          return false unless defined?(::ActiveRecord) && ::Bigcommerce::Lightstep.active_record
+
+          adapter_name = if ::ActiveRecord::Base.respond_to?(:connection_config) # rails 6
+                           ::ActiveRecord::Base.connection_config[:adapter].to_s
+                         elsif ::ActiveRecord::Base.respond_to?(:connection_db_config) # rails 7
+                           ::ActiveRecord::Base.connection_db_config.configuration_hash[:adapter].to_s
+                         else
+                           'unknown'
+                         end
+          adapter_name.casecmp('mysql2')&.zero? == true
         rescue StandardError => e
           ::Bigcommerce::Lightstep.logger&.warn "Failed to determine ActiveRecord database adapter in bc-lightstep-ruby initializer: #{e.message}"
           false
@@ -51,9 +60,9 @@ module Bigcommerce
         # @param [String] sql The raw sql query
         # @param [String] name The type of sql query
         #
-        def execute_with_inst(sql, name = 'SQL')
+        def execute_with_inst(sql, name = 'SQL', async: false)
           # bail out early if not enabled. This should not get here, but is provided as a failsafe.
-          return execute_without_inst(sql, name) unless ::Bigcommerce::Lightstep.active_record
+          return execute_without_inst(sql, name, async: async) unless ::Bigcommerce::Lightstep.active_record
 
           sanitized_sql = lightstep_sanitize_sql(sql)
           name = 'QUERY' if name.to_s.strip.empty?

data/lib/bigcommerce/lightstep/rails_controller_instrumentation.rb

@@ -30,6 +30,10 @@ module Bigcommerce
           span.set_tag('http.content_type', request.format)
           span.set_tag('http.host', request.host)
           span.set_tag('span.kind', 'server')
+
+          # provide a hook for controllers to provide additional span tags
+          lightstep_additional_span_tags.each { |tag_name, value| span.set_tag(tag_name.to_s, value.to_s) }
+
           begin
             resp = yield
           rescue StandardError => _e
@@ -48,6 +52,15 @@ module Bigcommerce
         result
       end
 
+      ##
+      # Get list of additional span tags
+      #
+      # @return [Hash]
+      #
+      def lightstep_additional_span_tags
+        {}
+      end
+
       ##
       # Get only the open tracing headers
       #

data/lib/bigcommerce/lightstep/version.rb

@@ -17,6 +17,6 @@
 #
 module Bigcommerce
   module Lightstep
-    VERSION = '2.4.1'
+    VERSION = '2.6.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bc-lightstep-ruby
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.6.1
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2023-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -53,17 +53,31 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
@@ -84,14 +98,14 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -136,34 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.12'
-- !ruby/object:Gem::Dependency
-  name: null-logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -269,14 +255,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Gem for lightstep distributed tracing