stackify-ruby-apm 1.13.2 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1ee1b9b91d78729820e74b7fbc014310af4037390de6c0982cb0169cba50a8a
-  data.tar.gz: 3a7dfe377099f033779e85d591e8ec973039ee4a4b59f20175e57afdd967819a
+  metadata.gz: 76953d4e093b082edd18b9b64c80f282cef005ca138ded983b5bc88b1545db96
+  data.tar.gz: 3c1fba2fa393369d38de568f91dbec9d1708a963c5f3802719f285c2e99edefa
 SHA512:
-  metadata.gz: 143b1fba17994c286ad71dc020d731247079b28a75fda11ee742ed8d49c023557a731e16c0ae8715153d6f5c98dbbb7dbbdaa10a225d4ad8f5f0750aedb7a739
-  data.tar.gz: 28be6a1c40fa6dab5fc5a35f2c56e99984c579d4e5f84e5481ffa6e5c9b9fa9c615a0425c1af81d5a3d1d7d4088df1b4f777250fde816b48a2049f320a1df1c4
+  metadata.gz: d1b9b23f4c1b473fc45850f996701cc33703de8a6937297638d84603a4ce816b2e00cb318d73eca407e073f1f41403d82b9d1bc7305cf4623b47a53965d8b576
+  data.tar.gz: 517edbe2b9f8ff7e1c5c8ecb381f93fc39a28af406de5c6ec45b5ff3c99a113bd4833482f38f7944f1c542e2a027e2c581c5d36df45d8b1749aefcdc752050df

data/lib/stackify_apm/normalizers/active_record.rb

@@ -29,9 +29,13 @@ module StackifyRubyAPM
         private
 
         def query_variables(payload)
+          adapter_config = lookup_adapter_config
           props = get_common_db_properties
           props[:PROVIDER] = get_profiler(lookup_adapter)
           props[:SQL] = payload[:sql]
+          if adapter_config
+            props[:URL] = "#{adapter_config[:host]}:#{adapter_config[:port]}"
+          end
           props
         end
 
@@ -42,6 +46,13 @@ module StackifyRubyAPM
           nil
         end
 
+        def lookup_adapter_config
+          ::ActiveRecord::Base.connection_config.to_h
+        rescue StandardError => error
+          debug '[SqlNormalizer] lookup_adapter_config err: ' + error.inspect.to_s
+          nil
+        end
+
         def check_prepared_stmt(statement, payload)
           if StackifyRubyAPM.agent.config.prefix_enabled
             case get_profiler(lookup_adapter)

data/lib/stackify_apm/spies/dynamo_db.rb

@@ -25,6 +25,7 @@ module StackifyRubyAPM
                   CATEGORY: 'Database',
                   SUBCATEGORY: 'DynamoDB',
                   ACTION: operation_name,
+                  URL: self.config.endpoint,
                 )
               rescue Exception => e
                 StackifyRubyAPM.agent.error "[DynamoDBSpy] Error: creating span context."

data/lib/stackify_apm/spies/mongo.rb

@@ -55,7 +55,9 @@ module StackifyRubyAPM
           #
           ctx = Span::Context.new(
             CATEGORY: 'MongoDB',
-            MONGODB_COLLECTION: col
+            MONGODB_COLLECTION: col,
+            OPERATION: event.command_name.to_s,
+            URL: event.address.to_s
           )
 
           # Creates new span from Mongo event

data/lib/stackify_apm/spies/redis.rb

@@ -18,11 +18,13 @@ module StackifyRubyAPM
               name = command[0].upcase.to_s
               type = 'db.redis'
               redis_details = command[1].is_a?(String) ? command[1].split(':') : []
-              redis_nspace = !redis_details.blank? ? redis_details[0] : ''
+              # use length instead of .blank?
+              # reason: will throw error if activesupport missing
+              redis_nspace = redis_details.length ? redis_details[0] : ''
               redis_key = ''
 
               # Checks CACHEKEY value
-              if !redis_details.blank? && redis_details[1]
+              if redis_details.length && redis_details[1]
                 # Initially sets the CACHEKEY value
                 args = redis_details[1].split('/')
                 redis_key = args[0]
@@ -43,7 +45,8 @@ module StackifyRubyAPM
                 COMPONENT_CATEGORY: 'Cache',
                 COMPONENT_DETAIL: 'Execute',
                 THREAD_ID: Thread.current.object_id,
-                OPERATION: name
+                OPERATION: name,
+                URL: "#{self.options[:host]}:#{self.options[:port]}"
               }.tap do |hash|
                 hash[:CACHEKEY] = redis_key unless redis_key.empty?
                 hash[:CACHENAME] = redis_nspace unless redis_nspace.empty?

data/lib/stackify_apm/spies/sinatra_activerecord/mysql_adapter.rb

@@ -10,6 +10,7 @@ module StackifyRubyAPM
     # @api private
     class MysqlAdapterSpy
       TYPE = 'db.sinatra_active_record.sql'.freeze
+      DEFAULT_PORT = 3306
       if ActiveRecord::VERSION::MAJOR.to_i >= 5
         def install
           ActiveRecord::ConnectionAdapters::MySQL::DatabaseStatements.class_eval do
@@ -79,6 +80,7 @@ module StackifyRubyAPM
               props = get_common_db_properties
               props[:PROVIDER] = 'mysql'
               props[:SQL] = payload[:sql]
+              props[:URL] = get_host unless !get_host
               props
             end
 
@@ -87,6 +89,13 @@ module StackifyRubyAPM
                 check_prepared_stmt_by_placeholder(payload[:sql].include?('?'), statement, payload)
               end
             end
+
+            def get_host
+              query_options = self.raw_connection.query_options.to_h
+              "#{query_options[:host]}:#{query_options[:port] || DEFAULT_PORT}"
+            rescue StandardError => error
+              nil
+            end
           end
         end
       else
@@ -112,6 +121,7 @@ module StackifyRubyAPM
                 SQL: sql,
                 PROVIDER: 'mysql'
               )
+              ctx[:URL] = get_host unless !get_host
 
               result = exec_query_without_apm(sql, name, binds)
 
@@ -135,6 +145,7 @@ module StackifyRubyAPM
                 SQL: sql,
                 PROVIDER: 'mysql'
               )
+              ctx[:URL] = get_host unless !get_host
 
               result = exec_delete_without_apm(sql, name, binds)
 
@@ -158,6 +169,7 @@ module StackifyRubyAPM
                 SQL: sql,
                 PROVIDER: 'mysql'
               )
+              ctx[:URL] = get_host unless !get_host
 
               result = exec_update_without_apm(sql, name, binds)
 
@@ -181,6 +193,7 @@ module StackifyRubyAPM
                 SQL: sql,
                 PROVIDER: 'mysql'
               )
+              ctx[:URL] = get_host unless !get_host
 
               result = exec_insert_without_apm(sql, name, binds, _pk = nil, _sequence_name = nil)
 
@@ -188,6 +201,14 @@ module StackifyRubyAPM
                 return result
               end
             end
+
+            def get_host
+              config = self.config.to_h
+              "#{config[:host]}:#{config[:port] || DEFAULT_PORT}"
+            rescue StandardError => error
+              nil
+            end
+
           end
         end
       end

data/lib/stackify_apm/spies/sinatra_activerecord/postgresql_adapter.rb

@@ -80,6 +80,7 @@ module StackifyRubyAPM
             props = get_common_db_properties
             props[:PROVIDER] = 'postgresql'
             props[:SQL] = payload[:sql]
+            props[:URL] = get_host unless !get_host
             props
           end
 
@@ -88,6 +89,13 @@ module StackifyRubyAPM
               check_prepared_stmt_by_placeholder(!!payload[:sql].match(/\$\d/), statement, payload)
             end
           end
+
+          def get_host
+            connection = self.raw_connection
+            "#{connection.host}:#{connection.port}"
+          rescue StandardError => error
+            nil
+          end
         end
       end
     end

data/lib/stackify_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.14.0
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails