stackify-ruby-apm 1.0.1 → 1.1.0

data/lib/{stackify → stackify_apm}/naively_hashable.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-#
+
 # This module converts its result to a hash.
-#
 
 module StackifyRubyAPM
   # @api private
@@ -12,7 +11,6 @@ module StackifyRubyAPM
 
     def to_h
       instance_variables.each_with_object({}) do |name, h|
-
         key = name.to_s.delete('@').to_sym
         value = instance_variable_get(name)
         is_hashable =

data/lib/{stackify → stackify_apm}/normalizers.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 #
-# Collects and registers existing events and classes 
+# Collects and registers existing events and classes
 #
 
 module StackifyRubyAPM # :nodoc:
@@ -65,6 +66,6 @@ module StackifyRubyAPM # :nodoc:
     action_view
     active_record
   ].each do |lib|
-    require "stackify/normalizers/#{lib}"
+    require "stackify_apm/normalizers/#{lib}"
   end
 end

data/lib/{stackify → stackify_apm}/normalizers/active_record.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'stackify_apm/helper/database_helper'
+
 module StackifyRubyAPM
   module Normalizers
     module ActiveRecord
@@ -25,33 +27,9 @@ module StackifyRubyAPM
 
         private
 
-        # return back valid PROVIDER based on driver name passed in
-        def get_profiler(driver)
-          if driver.to_s.empty?
-            "generic"
-          elsif driver.include? "mysql"
-            "mysql"
-          elsif driver.include? "pg"
-            "postgresql"
-          elsif driver.include? "oci8"
-            "oracle"
-          elsif driver.include? "db2"
-            "db2"
-          elsif driver.include? "sqlite"
-            "sqlite"
-          end
-        end
-
         def query_variables(payload)
-          debug "[SqlNormalizer] query_variables payload:"
+          debug '[SqlNormalizer] query_variables payload:'
           debug payload.inspect
-
-          if payload[:type_casted_binds]
-            row_id = payload[:type_casted_binds][0]
-          else
-            row_id = []
-          end
-
           {
             CATEGORY: 'Database',
             SUBCATEGORY: 'Execute',

data/lib/{stackify → stackify_apm}/railtie.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 #
 # This class loads the specified config of the Rails app and starts the Agent.
 #
-# APM Config setting is done at stackify/config.rb
+# APM Config setting is done at stackify_apm/config.rb
 #
 # After the Agent has been started:
 #   -> the enabled Spies (libraries) are registered
@@ -10,13 +11,12 @@
 #   -> the Middleware is then inserted
 #
 
-require 'stackify/subscriber'
+require 'stackify_apm/subscriber'
 
 module StackifyRubyAPM
   # @api private
   # Railtie - core of the Rails framework and provides several hooks to modify the initialization process.
   class Railtie < Rails::Railtie
-
     config.stackify = ActiveSupport::OrderedOptions.new
 
     Config::DEFAULTS.each { |option, value| config.stackify[option] = value }
@@ -26,9 +26,7 @@ module StackifyRubyAPM
     initializer 'stackify_apm.initialize' do |app|
       config = app.config.stackify.merge(app: app).tap do |c|
         # Prepend Rails.root to log_path if present
-        if c.log_path && !c.log_path.start_with?('/')
-          c.log_path = Rails.root.join(c.log_path)
-        end
+        c.log_path = Rails.root.join(c.log_path) if c.log_path && !c.log_path.start_with?('/')
       end
 
       begin
@@ -43,7 +41,7 @@ module StackifyRubyAPM
     end
 
     config.after_initialize do
-       require 'stackify/spies/action_dispatch'
+      require 'stackify_apm/spies/action_dispatch'
     end
   end
 end

data/lib/{stackify → stackify_apm}/root_info.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-#
+
 # This will format the root information of the Transaction.
-#
 
 module StackifyRubyAPM
   # @api private
@@ -11,13 +10,11 @@ module StackifyRubyAPM
       @config = config
     end
 
-    # rubocop:disable Metrics/MethodLength
-    # rubocop:disable Style/StringLiterals
     def build
       # get process id
       pid = $PID || Process.pid
 
-      base = {
+      {
         CATEGORY: 'Ruby',
         APPLICATION_PATH: '/',
         APPLICATION_FILESYSTEM_PATH: @config.root_path,
@@ -38,7 +35,6 @@ module StackifyRubyAPM
         TRACE_VERSION: '2.0'
       }
     end
-    # rubocop:enable Metrics/MethodLength
 
     def self.build(config, transaction)
       new(config, transaction).build

data/lib/{stackify → stackify_apm}/serializers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'json'
 # After the spans are being build it will serialize or rebuild or reformat the spans created into json format
 module StackifyRubyAPM
@@ -23,5 +24,5 @@ module StackifyRubyAPM
   end
 end
 
-require 'stackify/serializers/transactions'
-require 'stackify/serializers/errors'
+require 'stackify_apm/serializers/transactions'
+require 'stackify_apm/serializers/errors'

data/lib/{stackify → stackify_apm}/serializers/errors.rb

@@ -1,30 +1,27 @@
 # frozen_string_literal: true
-#
+
 # This module gathers the built Errors and Exceptions into hash formats
-#
+
 module StackifyRubyAPM
   module Serializers
     # @api private
     class Errors < Serializer
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def build(error)
-
         if (exception = error.exception)
           current_timestamp = error.timestamp
 
           base = {
-            CaughtBy: exception.module,  
+            CaughtBy: exception.module,
             Exception: exception.type,
             Message: exception.message,
-            Timestamp: "#{current_timestamp.round}",
-            Frames: exception.stacktrace.to_a, 
+            Timestamp: current_timestamp.round.to_s,
+            Frames: exception.stacktrace.to_a
           }
-         
+
         end
 
         base
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       def build_all(errors)
         { exceptions: Array(errors).map(&method(:build)) }
@@ -43,4 +40,4 @@ module StackifyRubyAPM
       end
     end
   end
-end
+end

data/lib/{stackify → stackify_apm}/serializers/transactions.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
-#
+
 # This class builds and reformats all the gathered spans within the transaction.
-#
 
 module StackifyRubyAPM
   module Serializers
     # @api private
-
     class Transactions < Serializer
       include Log
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      def build(config, transaction)
 
+      def build(config, transaction)
         root_span_json = {
           id: -1,
           call: transaction.name,
@@ -24,7 +21,7 @@ module StackifyRubyAPM
 
         # serialize all the spans
         children_spans_json = []
-        transaction.spans.each  do |span|
+        transaction.spans.each do |span|
           children_spans_json.push(build_span(span))
         end
 
@@ -37,20 +34,18 @@ module StackifyRubyAPM
       # Add Children Spans to span_json
       def add_children_spans(span_json, children_spans_json)
         id = span_json[:id]
-        children_spans_json.each  do |child_span_json|
+        children_spans_json.each do |child_span_json|
           parent_id = child_span_json[:parent_id]
-          if parent_id == id
-            child_span_copy = child_span_json.dup
-            add_children_spans(child_span_copy, children_spans_json)
-            if span_json[:stacks].nil?
-              span_json[:stacks] = []
-            end
-            span_json[:stacks].push(child_span_copy)
-          end
+
+          next unless parent_id == id
+
+          child_span_copy = child_span_json.dup
+          add_children_spans(child_span_copy, children_spans_json)
+          span_json[:stacks] = [] if span_json[:stacks].nil?
+          span_json[:stacks].push(child_span_copy)
         end
       end
 
-      # rubocop:disable Metrics/AbcSize
       def build_span(span)
         span_type = span.type
         span_context = span.context && span.context.to_h
@@ -65,8 +60,6 @@ module StackifyRubyAPM
           stacks: []
         }
       end
-
-      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/lib/{stackify → stackify_apm}/span.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 #
 # This modules creates and initializes new Span
 #
 
 require 'securerandom'
-require 'stackify/span/context'
+require 'stackify_apm/span/context'
 module StackifyRubyAPM
   # @api private
   class Span
@@ -36,21 +37,22 @@ module StackifyRubyAPM
     attr_reader :id, :context, :stacktrace, :duration, :parent_id, :relative_start, :relative_end
 
     def start
-      @relative_start = (Time.now).to_f * 1000
+      @relative_start = Time.now.to_f * 1000
 
       self
     end
 
     def done
-      @relative_end = (Time.now).to_f * 1000
-      @duration = (Time.now).to_f * 1000
+      @relative_end = Time.now.to_f * 1000
+      @duration = Time.now.to_f * 1000
       self.original_backtrace = nil # release it
 
       self
     end
 
     def done?
-      !!duration
+      # !!duration
+      !duration.nil?
     end
 
     def running?
@@ -63,8 +65,5 @@ module StackifyRubyAPM
         " type:#{type.inspect}" \
         '>'
     end
-
-    private
-
   end
-end
+end

data/lib/{stackify → stackify_apm}/span/context.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module StackifyRubyAPM
   class Span
     # @api private
@@ -24,7 +25,8 @@ module StackifyRubyAPM
                     :OPERATION,
                     :CACHEKEY,
                     :CACHENAME,
-                    :THREAD_ID
+                    :THREAD_ID,
+                    :ID
     end
   end
 end

data/lib/{stackify → stackify_apm}/spies.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 #
 # This module communicates and registers the additional or enabled outside library method
 #
 
 require 'forwardable'
-require 'stackify/util/inflector'
+require 'stackify_apm/util/inflector'
 
 module StackifyRubyAPM
   # @api private
@@ -78,7 +79,7 @@ module Kernel
 
     begin
       StackifyRubyAPM::Spies.hook_into(path)
-    rescue ::Exception => e
+    rescue StandardError => e
       puts "Failed hooking into '#{path}'. Please report this at " \
         'git@bitbucket.org:stackify/stackify-ruby-apm.git'
       puts e.backtrace.join("\n")

data/lib/{stackify → stackify_apm}/spies/action_dispatch.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-#
+
 # Monkey patch for the ActionDispatch::ShowExceptions class which handles exception events.
-#
 
 module StackifyRubyAPM
   # @api private
@@ -10,7 +9,7 @@ module StackifyRubyAPM
     class ActionDispatchSpy
       def install
         ::ActionDispatch::ShowExceptions.class_eval do
-          alias render_exception_without_apm render_exception
+          alias_method 'render_exception_without_apm', 'render_exception'
 
           def render_exception(env, exception)
             # Creates exception log report
@@ -22,7 +21,7 @@ module StackifyRubyAPM
       end
     end
 
-    # Registers ActionDispatch spy, go to: /stackify/spies.rb
+    # Registers ActionDispatch spy, go to: /stackify_apm/spies.rb
     #
     register(
       'ActionDispatch::ShowExceptions',

data/lib/stackify_apm/spies/curb.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+# Monkey patch for the CurbSpy class for sending & receiving Curb responses.
+#
+module StackifyRubyAPM
+  # @api private
+  module Spies
+    # @api private
+    class CurbSpy
+      def install
+        Curl.module_eval do
+          singleton_class.send(:alias_method, :http_without_apm, :http)
+          def self.http(verb, url, _post_body = nil, _put_data = nil, &block)
+            req = nil
+            return http_without_apm(verb, url, _post_body = nil, _put_data = nil, &block) unless StackifyRubyAPM.current_transaction
+            # Data configuration
+            #
+            method = verb
+            uri = url.strip
+            name = "#{method} #{uri}"
+            type = "ext.Curb.#{method}"
+            # Submits HTTP request
+            #
+            req = http_without_apm(verb, url, _post_body = nil, _put_data = nil, &block)
+            # Builds span context
+            #
+            status_code = req.status.gsub(/^0-9/, '').to_i
+
+            ctx = Span::Context.new(
+              CATEGORY: 'Web External',
+              SUBCATEGORY: 'Execute',
+              URL: uri,
+              STATUS: status_code,
+              METHOD: method
+            )
+            # Creates new span from HTTP result
+            #
+            StackifyRubyAPM.span name, type, context: ctx do
+              req
+            end
+          end
+        end
+      end
+    end
+    # Registers CurbSpy spy, go to: /stackify/spies.rb
+    #
+    register 'Curl', 'curb', CurbSpy.new
+  end
+end