stackify-ruby-apm 1.14.7 → 1.14.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 881446a181c81d422cdd81f2de4b4ccef409989171d96a53833bbe425f8105c0
-  data.tar.gz: ed31e237779e881ab4a57d7db2c4dcc7936bbe01b6af256ac4f53d9ae4c96054
+  metadata.gz: 071d161a1f209e027f271d462fdc8cdf57c8d68197d8ae1ed6190cebe9e2114b
+  data.tar.gz: 815f90aaa08dcd15878bc93e7a18d71619a8cd1f55959ef18c0918267754a3df
 SHA512:
-  metadata.gz: 293677dce94cf22be5e9a45fb1e7d9b7090fcbbe76a4a1bb679da719896d3ced92c5e34bc6ef0315ef8c05c3ee8621bcd51bac552e6f02bfce635aa13205f23e
-  data.tar.gz: 581165dd6ee9b10a02d206a7f985b6980ee1ddb46a9a2de05e194a6a9578596114823eff12cd4dab96277e82e533bb9c742c0ee72e109de2a8e819405fb5f4ce
+  metadata.gz: 35d8996e6e1bdc270ba44a231e405275d7b090efd316daa590aeefe2875a0b586f19b8c280fdab16c8a8e5f9b482038c344b40c1893358528a9e4ffa2b5018d0
+  data.tar.gz: 1ce353e5bf442f5ae8c18a5f1c323f0aa177586dc46942f9082baf1fa1acfc1980b04f3b5745a538f5eab7271c7bfdd0a340e2455d97d1695eafac7c9522d17f

data/lib/stackify_apm/instrumenter_helper.rb

@@ -35,6 +35,8 @@ module StackifyRubyAPM
       classspyitem = "#{current_class}Spy"
       module_consget_spy = Module.const_get(current_class)
       current_method_without = "_without_apm_#{current_method}"
+      is_private_method = options[:is_private_method] || false
+      is_protected_method = options[:is_protected_method] || false
 
       unless @custom_instrumented[current_class.to_s]
         @custom_instrumented[current_class.to_s] = {}
@@ -63,7 +65,14 @@ module StackifyRubyAPM
           def install
             #{current_class}.class_eval do
               alias_method "#{current_method_without}", "#{current_method}"
-
+              
+              #{
+                if is_private_method
+                  then "private"
+                elsif is_protected_method
+                  then "protected"
+                end
+              }
               def #{current_method}(*args, &block)
                 if StackifyRubyAPM.current_transaction.nil? && #{!transaction.nil?}
                   t = StackifyRubyAPM.transaction("custom.#{current_class}.#{current_method}", TRACETYPE)

data/lib/stackify_apm/normalizers/active_record.rb

@@ -93,10 +93,14 @@ module StackifyRubyAPM
         end
 
         def lookup_adapter_config
+          config = nil
           if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new('6.1')
-            ::ActiveRecord::Base.connection_db_config.to_h
+            config = ::ActiveRecord::Base.connection_db_config
           else
-            ::ActiveRecord::Base.connection_config.to_h
+            config = ::ActiveRecord::Base.connection_config
+          end
+          if (config != nil && config.respond_to(:to_h))
+            config.to_h
           end
         rescue StandardError => error
           debug '[SqlNormalizer] lookup_adapter_config err: ' + error.inspect.to_s

data/lib/stackify_apm/spies/custom_instrumenter.rb

@@ -70,6 +70,8 @@ module StackifyRubyAPM
           mod_constant = Module.const_get(current_class.to_s)
           klass_method_flag = mod_constant.method_defined?(current_method.to_s)
           singleton_method_flag = mod_constant.respond_to?(current_method.to_s)
+          klass_private_method_flag = mod_constant.private_method_defined?(current_method.to_s)
+          klass_protected_method_flag = mod_constant.protected_method_defined?(current_method.to_s)
 
           class_location = mod_constant.instance_methods(false).map do |m|
             mod_constant.instance_method(m).source_location.first
@@ -77,8 +79,17 @@ module StackifyRubyAPM
 
           class_path = class_location.last
 
-          if klass_method_flag
-            StackifyRubyAPM::InstrumenterHelper.m_class(tracked_func, current_class, class_path, current_method: current_method, tracked_function_name: tracked_function_name, is_transaction: transaction)
+          if klass_method_flag || klass_private_method_flag
+            StackifyRubyAPM::InstrumenterHelper.m_class(
+              tracked_func,
+              current_class,
+              class_path,
+              current_method: current_method,
+              tracked_function_name: tracked_function_name,
+              is_transaction: transaction,
+              is_private_method: klass_private_method_flag,
+              is_protected_method: klass_protected_method_flag
+            )
           elsif singleton_method_flag
             StackifyRubyAPM::InstrumenterHelper.m_singleton(tracked_func, current_class, class_path, current_method: current_method, tracked_function_name: tracked_function_name, is_transaction: transaction)
           end

data/lib/stackify_apm/spies/faraday.rb

@@ -36,7 +36,7 @@ module StackifyRubyAPM
               ctx = Span::Context.new(
                 CATEGORY: 'Web External',
                 SUBCATEGORY: 'Execute',
-                URL: uri,
+                URL: uri.to_s,
                 STATUS: '',
                 METHOD: method_upcase
               )

data/lib/stackify_apm/transport/agent_http_client.rb

@@ -42,7 +42,7 @@ module StackifyRubyAPM
         message = get_json_message(transactions)
         conn = Faraday.new(ssl: { verify: false })
         response = conn.post do |req|
-          req.url URI(@config.transport_http_endpoint + @config.agent_traces_url)
+          req.url URI(@config.transport_http_endpoint + @config.agent_traces_url).to_s
           req.headers = get_json_headers
           req.body = message
         end

data/lib/stackify_apm/version.rb

@@ -2,5 +2,5 @@
 
 # Sets the version of the APM
 module StackifyRubyAPM
-  VERSION = '1.14.7'.freeze
+  VERSION = '1.14.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.14.7
+  version: 1.14.8
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails