stackify-ruby-apm 1.10.2 → 1.13.2

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

@@ -2,6 +2,8 @@
 
 # Spies for active record when sinatra framework is used and active_record is being extended. (mysql adapter)
 
+require 'stackify_apm/helper/database_helper'
+
 module StackifyRubyAPM
   # @api private
   module Spies
@@ -22,14 +24,10 @@ module StackifyRubyAPM
                 exec_update_without_apm(sql, name, binds)
               end
 
-              ctx = Span::Context.new(
-                CATEGORY: 'Database',
-                SUBCATEGORY: 'Execute',
-                COMPONENT_CATEGORY: 'DB Query',
-                COMPONENT_DETAIL: 'Execute SQL Query',
-                SQL: sql,
-                PROVIDER: 'mysql'
-              )
+              payload = {sql: sql, binds: binds}
+              statement = query_variables(payload)
+              check_prepared_stmt(statement, payload)
+              ctx = Span::Context.new(statement)
 
               result = exec_update_without_apm(sql, name, binds)
 
@@ -45,14 +43,10 @@ module StackifyRubyAPM
                 exec_delete_without_apm(sql, name, binds)
               end
 
-              ctx = Span::Context.new(
-                CATEGORY: 'Database',
-                SUBCATEGORY: 'Execute',
-                COMPONENT_CATEGORY: 'DB Query',
-                COMPONENT_DETAIL: 'Execute SQL Query',
-                SQL: sql,
-                PROVIDER: 'mysql'
-              )
+              payload = {sql: sql, binds: binds}
+              statement = query_variables(payload)
+              check_prepared_stmt(statement, payload)
+              ctx = Span::Context.new(statement)
 
               result = exec_delete_without_apm(sql, name, binds)
 
@@ -69,22 +63,30 @@ module StackifyRubyAPM
                 exec_query_without_apm(sql, name, binds)
               end
 
-              ctx = Span::Context.new(
-                CATEGORY: 'Database',
-                SUBCATEGORY: 'Execute',
-                COMPONENT_CATEGORY: 'DB Query',
-                COMPONENT_DETAIL: 'Execute SQL Query',
-                SQL: sql,
-                PROVIDER: 'mysql'
-              )
+              payload = {sql: sql, binds: binds}
+              statement = query_variables(payload)
+              check_prepared_stmt(statement, payload)
+              ctx = Span::Context.new(statement)
 
               result = exec_query_without_apm(sql, name, binds)
-
               StackifyRubyAPM.span name, TYPE, context: ctx do
                 return result
               end
             end
             # rubocop:enable Lint/UnusedMethodArgument
+
+            def query_variables(payload)
+              props = get_common_db_properties
+              props[:PROVIDER] = 'mysql'
+              props[:SQL] = payload[:sql]
+              props
+            end
+
+            def check_prepared_stmt(statement, payload)
+              if StackifyRubyAPM.agent.config.prefix_enabled
+                check_prepared_stmt_by_placeholder(payload[:sql].include?('?'), statement, payload)
+              end
+            end
           end
         end
       else

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

@@ -2,6 +2,8 @@
 
 # Spies for active record when sinatra framework is used and active_record is being extended. (mysql adapter)
 
+require 'stackify_apm/helper/database_helper'
+
 module StackifyRubyAPM
   # @api private
   module Spies
@@ -22,15 +24,11 @@ module StackifyRubyAPM
               exec_update_without_apm(sql, name, binds)
             end
 
-            ctx = Span::Context.new(
-              CATEGORY: 'Database',
-              SUBCATEGORY: 'Execute',
-              COMPONENT_CATEGORY: 'DB Query',
-              COMPONENT_DETAIL: 'Execute SQL Query',
-              SQL: sql,
-              PROVIDER: 'postgresql'
-            )
+            payload = {sql: sql, binds: binds}
+            statement = query_variables(payload)
+            check_prepared_stmt(statement, payload)
 
+            ctx = Span::Context.new(statement)
             result = exec_update_without_apm(sql, name, binds)
 
             StackifyRubyAPM.span name, TYPE, context: ctx do
@@ -45,15 +43,11 @@ module StackifyRubyAPM
               exec_delete_without_apm(sql, name, binds)
             end
 
-            ctx = Span::Context.new(
-              CATEGORY: 'Database',
-              SUBCATEGORY: 'Execute',
-              COMPONENT_CATEGORY: 'DB Query',
-              COMPONENT_DETAIL: 'Execute SQL Query',
-              SQL: sql,
-              PROVIDER: 'postgresql'
-            )
+            payload = {sql: sql, binds: binds}
+            statement = query_variables(payload)
+            check_prepared_stmt(statement, payload)
 
+            ctx = Span::Context.new(statement)
             result = exec_delete_without_apm(sql, name, binds)
 
             StackifyRubyAPM.span name, TYPE, context: ctx do
@@ -69,15 +63,11 @@ module StackifyRubyAPM
               exec_query_without_apm(sql, name, binds)
             end
 
-            ctx = Span::Context.new(
-              CATEGORY: 'Database',
-              SUBCATEGORY: 'Execute',
-              COMPONENT_CATEGORY: 'DB Query',
-              COMPONENT_DETAIL: 'Execute SQL Query',
-              SQL: sql,
-              PROVIDER: 'postgresql'
-            )
+            payload = {sql: sql, binds: binds}
+            statement = query_variables(payload)
+            check_prepared_stmt(statement, payload)
 
+            ctx = Span::Context.new(statement)
             result = exec_query_without_apm(sql, name, binds)
 
             StackifyRubyAPM.span name, TYPE, context: ctx do
@@ -85,6 +75,19 @@ module StackifyRubyAPM
             end
           end
           # rubocop:enable Lint/UnusedMethodArgument
+
+          def query_variables(payload)
+            props = get_common_db_properties
+            props[:PROVIDER] = 'postgresql'
+            props[:SQL] = payload[:sql]
+            props
+          end
+
+          def check_prepared_stmt(statement, payload)
+            if StackifyRubyAPM.agent.config.prefix_enabled
+              check_prepared_stmt_by_placeholder(!!payload[:sql].match(/\$\d/), statement, payload)
+            end
+          end
         end
       end
     end

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

@@ -2,6 +2,8 @@
 
 # Spies for active record when sinatra framework is used and active_record is being extended. (mysql adapter)
 
+require 'stackify_apm/helper/database_helper'
+
 module StackifyRubyAPM
   # @api private
   module Spies
@@ -21,15 +23,11 @@ module StackifyRubyAPM
               exec_query_without_apm(sql, name, binds)
             end
 
-            ctx = Span::Context.new(
-              CATEGORY: 'Database',
-              SUBCATEGORY: 'Execute',
-              COMPONENT_CATEGORY: 'DB Query',
-              COMPONENT_DETAIL: 'Execute SQL Query',
-              SQL: sql,
-              PROVIDER: 'generic'
-            )
+            payload = {sql: sql, binds: binds}
+            statement = query_variables(payload)
+            check_prepared_stmt(statement, payload)
 
+            ctx = Span::Context.new(statement)
             result = exec_query_without_apm(sql, name, binds)
 
             StackifyRubyAPM.span name, TYPE, context: ctx do
@@ -37,6 +35,18 @@ module StackifyRubyAPM
             end
           end
           # rubocop:enable Lint/UnusedMethodArgument
+
+          def query_variables(payload)
+            props = get_common_db_properties
+            props[:SQL] = payload[:sql]
+            props
+          end
+
+          def check_prepared_stmt(statement, payload)
+            if StackifyRubyAPM.agent.config.prefix_enabled
+              check_prepared_stmt_by_placeholder(payload[:sql].include?('?'), statement, payload)
+            end
+          end
         end
       end
     end

data/lib/stackify_apm/spies/stackify_logger.rb

@@ -14,15 +14,21 @@ module StackifyRubyAPM
           def log_message_task(level, msg, call_trace)
             return log_message_task_without_apm(level, msg, call_trace) unless StackifyRubyAPM.current_transaction
 
-            trans_id = StackifyRubyAPM.current_transaction.id
-            log_uuid = SecureRandom.uuid
+            begin
+              trans_id = StackifyRubyAPM.current_transaction.id
+              log_uuid = SecureRandom.uuid
 
-            # build span context
-            ctx = Span::Context.new(
-              CATEGORY: 'Stackify',
-              SUBCATEGORY: 'Log',
-              ID: log_uuid # matching the MsgObject id
-            )
+              # build span context
+              ctx = Span::Context.new(
+                CATEGORY: 'Stackify',
+                SUBCATEGORY: 'Log',
+                ID: log_uuid # matching the MsgObject id
+              )
+            rescue Exception => e
+              StackifyRubyAPM.agent.error "[StackifyLoggerSpy] Error: creating span context."
+              StackifyRubyAPM.agent.error "[StackifyLoggerSpy] #{e.inspect}"
+              return log_message_task_without_apm(level, msg, call_trace)
+            end
 
             # create log span
             StackifyRubyAPM.span(msg, 'stackify.log', context: ctx) do
@@ -34,15 +40,21 @@ module StackifyRubyAPM
           def log_exception_task(level, ex)
             return log_exception_task_without_apm(level, ex) unless StackifyRubyAPM.current_transaction
 
-            trans_id = StackifyRubyAPM.agent.current_transaction.id
-            log_uuid = SecureRandom.uuid
+            begin
+              trans_id = StackifyRubyAPM.agent.current_transaction.id
+              log_uuid = SecureRandom.uuid
 
-            # build span context
-            ctx = Span::Context.new(
-              CATEGORY: 'Stackify',
-              SUBCATEGORY: 'Log',
-              ID: log_uuid # matching the MsgObject id
-            )
+              # build span context
+              ctx = Span::Context.new(
+                CATEGORY: 'Stackify',
+                SUBCATEGORY: 'Log',
+                ID: log_uuid # matching the MsgObject id
+              )
+            rescue Exception => e
+              StackifyRubyAPM.agent.error "[StackifyLoggerSpy] Error: creating span context."
+              StackifyRubyAPM.agent.error "[StackifyLoggerSpy] #{e.inspect}"
+              return log_exception_task_without_apm(level, ex)
+            end
 
             # create log span
             StackifyRubyAPM.span(ex.message, 'stackify.log', context: ctx) do

data/lib/stackify_apm/spies/sucker_punch.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# Monkey patch for the sucker_punch class for running async tasks.
+#
+
+module StackifyRubyAPM
+  # @api private
+  module Spies
+    # @api private
+    class SuckerPunchSpy
+      def install
+        SuckerPunch::Job::ClassMethods.class_eval do
+          alias_method '__run_perform_without_elastic_apm', '__run_perform'
+
+          def __run_perform(*args)
+            ret = nil
+            begin
+              name = "#{to_s}.perform"
+              ctx = StackifyRubyAPM::Context.new
+              ctx.category = 'SuckerPunch::Job'
+              transaction = StackifyRubyAPM.transaction name, 'TASK', context: ctx
+              ret = __run_perform_without_elastic_apm(*args)
+            rescue StackifyRubyAPM::InternalError
+              raise # Don't report StackifyRubyAPM errors
+            rescue StandardError => e
+              StackifyRubyAPM.report e
+              raise e
+            ensure
+              transaction.submit()
+            end
+            ret
+          end
+        end
+      end
+    end
+
+    register 'SuckerPunch', 'sucker_punch', SuckerPunchSpy.new
+  end
+end

data/lib/stackify_apm/spies/yell.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+# Monkey patch for the Yell::Logger class for logging log messages.
+#
+module StackifyRubyAPM
+  # @api private
+  module Spies
+    # @api private
+    class YellSpy
+      SEVERITIES = ['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL', 'UNKNOWN'].freeze
+
+      def install
+        Yell::Logger.module_eval do
+          alias_method 'add_without_apm', 'add'
+
+          # Log messages
+          def add(options, *messages, &block)
+            return add_without_apm(options, *messages, &block) unless StackifyRubyAPM.current_transaction
+
+            begin
+              name = 'yell;'
+              type = 'ext.yell'
+              log_message = []
+              exception = []
+
+              messages.each { |msg|
+                case msg
+                when ::String
+                  log_message.push(msg)
+                when ::Exception
+                  log_message.push(msg.message)
+                  exception.push("(#{ msg.class })\n#{ msg.backtrace.join("\n") if msg.backtrace }")
+                else
+                  log_message.push(msg.inspect)
+                end
+              }
+
+              ctx = Span::Context.new(
+                CATEGORY: 'Log',
+                SUBCATEGORY: 'Yell',
+                LEVEL: SEVERITIES[options.severity],
+                MESSAGE: log_message.to_s,
+                PREFIX: 'TRUE'
+              )
+
+              if exception.length > 0
+                ctx.EXCEPTION = exception.to_s
+              end
+            rescue Exception => e
+              StackifyRubyAPM.agent.error "[YellSpy] Error: creating span context."
+              StackifyRubyAPM.agent.error "[YellSpy] #{e.inspect}"
+              return add_without_apm(options, *messages, &block)
+            end
+
+            StackifyRubyAPM.span name, type, context: ctx do
+              add_without_apm(options, *messages, &block)
+            end
+          end
+        end
+      end
+    end
+
+    register 'Yell', 'yell', YellSpy.new
+  end
+end

data/lib/stackify_apm/util.rb

@@ -8,15 +8,6 @@ module StackifyRubyAPM
       target.to_i * 1_000_000 + target.usec
     end
 
-    #
-    # This method will check if there is any rake task is running.
-    # If rake task is detected we set instrument=false and don't load the spies.
-    #
-    def self.apm_disabled_in_rake
-      cmd_rake = ($PROGRAM_NAME =~ /rake$/)
-      StackifyRubyAPM.agent.config.instrument = false if cmd_rake
-    end
-
     def self.host_os
       host_os = RbConfig::CONFIG['host_os']
       case host_os
@@ -34,6 +25,16 @@ module StackifyRubyAPM
         "UNKNOWN #{host_os}"
       end
     end
+
+    # Push the element to existing array of object with incremented index(key/value pair)
+    # We get the prepared statement values ['J.K. Rowling', 'Harry Potter', ...] and restructure it.
+    # Example structured: [{'1': 'J.K. Rowling'},{'2': 'Harry Potter'}, ..., {n: 'other data'}]
+    def self.pushToAryIndex(ary, idx, val)
+      obj = {}
+      i = idx + 1
+      obj[i] = val.to_s
+      ary.push(obj)
+    end
   end
 end
 require 'stackify_apm/util/inspector'

data/lib/stackify_apm/version.rb

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

data/stackify-ruby-apm.gemspec

@@ -54,6 +54,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'to_bool'
   spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'delayed_job'
 
   spec.add_dependency('concurrent-ruby', '~> 1.0')
   spec.add_dependency('delegate_matcher', '~> 0.4')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.13.2
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -332,6 +332,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: delayed_job
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -419,7 +433,9 @@ files:
 - lib/stackify_apm/agent.rb
 - lib/stackify_apm/config.rb
 - lib/stackify_apm/context.rb
+- lib/stackify_apm/context/prefix.rb
 - lib/stackify_apm/context/request.rb
+- lib/stackify_apm/context/request/headers.rb
 - lib/stackify_apm/context/request/socket.rb
 - lib/stackify_apm/context/request/url.rb
 - lib/stackify_apm/context/response.rb
@@ -457,9 +473,15 @@ files:
 - lib/stackify_apm/spies/curb/easy.rb
 - lib/stackify_apm/spies/curb/multi.rb
 - lib/stackify_apm/spies/custom_instrumenter.rb
+- lib/stackify_apm/spies/delayed_job.rb
+- lib/stackify_apm/spies/dynamo_db.rb
+- lib/stackify_apm/spies/faraday.rb
 - lib/stackify_apm/spies/httparty.rb
 - lib/stackify_apm/spies/httpclient.rb
 - lib/stackify_apm/spies/httprb.rb
+- lib/stackify_apm/spies/log4r.rb
+- lib/stackify_apm/spies/logger.rb
+- lib/stackify_apm/spies/logging.rb
 - lib/stackify_apm/spies/mongo.rb
 - lib/stackify_apm/spies/net_http.rb
 - lib/stackify_apm/spies/redis.rb
@@ -470,7 +492,9 @@ files:
 - lib/stackify_apm/spies/sinatra_activerecord/postgresql_adapter.rb
 - lib/stackify_apm/spies/sinatra_activerecord/sqlite_adapter.rb
 - lib/stackify_apm/spies/stackify_logger.rb
+- lib/stackify_apm/spies/sucker_punch.rb
 - lib/stackify_apm/spies/tilt.rb
+- lib/stackify_apm/spies/yell.rb
 - lib/stackify_apm/stacktrace.rb
 - lib/stackify_apm/stacktrace/frame.rb
 - lib/stackify_apm/stacktrace_builder.rb