stackify-ruby-apm 1.10.0 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d62649a9bf57a77665b23b7e42ffe0d19395853a9b0b79e128197691e5bfb62
-  data.tar.gz: '0216963cac56d043591eb797ab64cce012a479de25d9a5fbe202eb6f3d73929a'
+  metadata.gz: ec496ca2f97d6531e0e5059845fb078d60e194f0b2896a5148cc570f8de66c13
+  data.tar.gz: 5dbc4a02c01e54b3d1276932f5d7528da2751d734a15926517595528b00dd0a8
 SHA512:
-  metadata.gz: 5c6c501b6eac9dbad6378a03cf1234468c84480fe15b977e44187d331452c39f6a76d19348b9141616791e564ccc436c48f8d27900796ca06104a67863c5a02f
-  data.tar.gz: 89edd6496518ed877c65e87320a8bbf543f60a34b7e9023e0546b011854077d1c31f656bccbf1947229831b21f1fdf4f352c984cf11931dd3dc1b8e15e17e102
+  metadata.gz: 76c13b39665912b23fa8bd42cb75af0cfa455e83735814f167c768f380b96f411f4267670b8708f15d0aa6de9698d58055fba04ba6f8286dfb1efe51fb724361
+  data.tar.gz: 2aa04cf139250db11e987a38ad213863a0d4dab9427561a1a2f63240a42005b37ab1dd9e8ae62df54159d6a05f9d7039df116fa41eea71f00ed69adfc173ebc3

data/lib/stackify_apm/agent.rb

@@ -101,8 +101,6 @@ module StackifyRubyAPM
       info '[Agent] start()'
       info '[Agent] transport type: ' + @config.transport
       spies_name = ''
-      # If the rake task is detected as being ran then we don't load the spies
-      StackifyRubyAPM::Util.apm_disabled_in_rake
       return false unless @config.instrument
       config.enabled_spies.each do |lib|
         spies_name = spies_name + ', ' + lib.inspect.to_s

data/lib/stackify_apm/config.rb

@@ -26,7 +26,7 @@ module StackifyRubyAPM
       environment_name: ENV['RAILS_ENV'] || ENV['RACK_ENV'],
       already_instrumented_flag: false,
       rum_auto_injection: false,
-      rum_enabled: false,
+      rum_enabled: true,
       rum_cookie_path: '/',
       rum_cookie_name: '.Stackify.Rum',
       transport: StackifyRubyAPM::TRACE_LOG,
@@ -70,7 +70,8 @@ module StackifyRubyAPM
       transport_http_endpoint: 'https://localhost:10601',
 
       queue: true,
-      lambda_handler: ''
+      lambda_handler: '',
+      prefix_enabled: false
     }.freeze
 
     ENV_TO_KEY = {
@@ -97,7 +98,8 @@ module StackifyRubyAPM
       'STACKIFY_FLUSH_INTERVAL' => 'flush_interval_seconds',
       'STACKIFY_DISABLED_SPIES' => [:list, 'disabled_spies'],
       'STACKIFY_QUEUE' => [:bool, 'queue'],
-      'STACKIFY_LAMBDA_HANDLER' => 'lambda_handler'
+      'STACKIFY_LAMBDA_HANDLER' => 'lambda_handler',
+      'STACKIFY_PREFIX_ENABLED' => [:bool, 'prefix_enabled']
     }.freeze
 
     def initialize(options = {})
@@ -105,6 +107,7 @@ module StackifyRubyAPM
       set_from_args(options)
       set_from_config_file
       set_from_env
+      set_prefix_paths if @prefix_enabled
       yield self if block_given?
       debug_logger
       StackifyRubyAPM::Util.host_os == 'WINDOWS' ? load_stackify_props_windows : load_stackify_props_linux
@@ -170,6 +173,7 @@ module StackifyRubyAPM
 
     attr_accessor :queue
     attr_accessor :lambda_handler
+    attr_accessor :prefix_enabled
 
     attr_reader :client_id
     attr_reader :device_id
@@ -210,6 +214,17 @@ module StackifyRubyAPM
         httparty
         stackify_logger
         sidekiq
+        delayed_job
+      ]
+    end
+
+    def prefix_spies
+      return [] unless @prefix_enabled
+      %w[
+        logger
+        logging
+        log4r
+        yell
       ]
     end
 
@@ -232,7 +247,7 @@ module StackifyRubyAPM
                               available_spies
                             end
 
-      new_available_spies - disabled_spies
+      new_available_spies + prefix_spies - disabled_spies
     end
 
     # Default Transport
@@ -253,7 +268,11 @@ module StackifyRubyAPM
 
     def assign(options)
       options.each do |key, value|
-        send("#{key}=", value)
+        begin
+          send("#{key}=", value)
+        rescue Exception => e
+          info "[Config] Key: '#{key}' doesn't exist."
+        end
       end
     end
 
@@ -294,6 +313,14 @@ module StackifyRubyAPM
       assign(YAML.load_file(config_file) || {})
     end
 
+    # set log paths to prefix path if prefix_enabled is true
+    def set_prefix_paths
+      all_user_profile = ENV['ALLUSERSPROFILE'] || "C:\\ProgramData"
+
+      @log_path = StackifyRubyAPM::Util.host_os == 'WINDOWS' ? "#{all_user_profile}\\Stackify\\Agent\\debug\\stackify-ruby-apm-1.log" : "/usr/local/prefix/debug/stackify-ruby-apm-1.log"
+      @log_trace_path = StackifyRubyAPM::Util.host_os == 'WINDOWS' ? "#{all_user_profile}\\Stackify\\Agent\\log\\" : '/usr/local/prefix/log/'
+    end
+
     # rubocop:disable Naming/AccessorMethodName
     def set_rails(app)
       self.application_name ||= format_name(application_name || app.class.parent_name).strip
@@ -381,6 +408,7 @@ module StackifyRubyAPM
       info '[Config] environment_name must be String type.' unless @environment_name.is_a?(String) && defined?(@environment_name)
       info '[Config] transport must be String type.' unless @transport.is_a?(String) && defined?(@transport)
       info '[Config] Transport should be one of these values: [agent_socket, default, agent_http]. Should be a String.' if defined?(@transport) && !%w[agent_socket default agent_http].include?(@transport.downcase)
+      info '[Config] prefix_enabled must be Boolean type: true/false.' unless [TrueClass, FalseClass].include?(@prefix_enabled.class) && defined?(@prefix_enabled)
     end
     # rubocop:enable Metrics/CyclomaticComplexity
     # rubocop:enable Metrics/PerceivedComplexity

data/lib/stackify_apm/context.rb

@@ -2,7 +2,9 @@
 
 # This class initializes the parameters and variables for the context of Transaction/Span
 
+require 'stackify_apm/context/prefix'
 require 'stackify_apm/context/request'
+require 'stackify_apm/context/request/headers'
 require 'stackify_apm/context/request/socket'
 require 'stackify_apm/context/request/url'
 require 'stackify_apm/context/response'
@@ -12,12 +14,13 @@ module StackifyRubyAPM
   class Context
     include NaivelyHashable
 
-    attr_accessor :request, :response, :aws
+    attr_accessor :request, :response, :aws, :category, :prefix
     attr_reader :custom, :tags
 
     def initialize
       @custom = {}
       @tags = {}
+      @prefix = Context::Prefix.new
     end
 
     # add aws context to context instance

data/lib/stackify_apm/context/prefix.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module StackifyRubyAPM
+  class Context
+    # @api private
+    class Prefix
+      include NaivelyHashable
+
+      attr_accessor :response_body, :request_body
+      attr_reader :response_headers, :request_headers
+
+      def request_headers=(headers)
+        @request_headers = to_json_list(headers)
+      end
+
+      def response_headers=(headers)
+        @response_headers = to_json_list(headers)
+      end
+
+      private
+      def to_json_list(header)
+        list_header = []
+        header.each do |key, value|
+          list_header << {key => value}
+        end
+        list_header.to_json
+      end
+    end
+  end
+end

data/lib/stackify_apm/context/request/headers.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module StackifyRubyAPM
+  # @api private
+  class Context
+    # @api private
+    class Request
+      # @api private
+      class Headers
+        include NaivelyHashable
+
+        def initialize(req)
+          @values = build_headers req
+        end
+
+        attr_reader :values
+
+        def build_headers req
+          env = req.env
+          headers = Hash[*env.select {|k,v| k.start_with? 'HTTP_'}
+            .collect {|k,v| [k.sub(/^HTTP_/, ''), v]}
+            .collect {|k,v| [k.split('_').collect(&:capitalize).join('-'), v]}
+            .sort
+            .flatten]
+          return headers
+        end
+      end
+    end
+  end
+end

data/lib/stackify_apm/context_builder.rb

@@ -27,6 +27,7 @@ module StackifyRubyAPM
       request.method = req.request_method
       request.url = Context::Request::Url.new(req).to_h
       request.body = get_body(req)
+      request.headers = Context::Request::Headers.new(req).values
 
       context
     end

data/lib/stackify_apm/helper/database_helper.rb

@@ -18,10 +18,48 @@ module DatabaseHelper
     elsif driver.include? 'db2'
       'db2'
     elsif driver.include? 'sqlite'
-      'generic'
+      'sqlite'
     end
   end
   # rubocop:enable Metrics/CyclomaticComplexity
   # rubocop:enable Metrics/PerceivedComplexity
+
+  # Check the prepared statement by placeholder if its valid
+  # placeholder - contains the prepared statement pattern.
+  #               Placeholder for mysql, sqlite, jdbc oracle, db2 is ?, example "SELECT * FROM posts WHERE author = ? and id = ?"
+  #               Placeholder for postgres is $1, $2,...$n, example "SELECT * FROM posts WHERE author = $1 and id = $2"
+  # statement   - contains the db properties such as SQL, PROVIDER, etc.
+  #               So if there's payload value we append SQL_PARAMETERS to the existing object properties.
+  # payload     - contains the payload[:binds] which is the payload value/data of the placeholder.
+  #               Example payload: {:sql=>"SELECT * FROM posts WHERE author = ? and id = ?", :db_adapter=>"mysql2::client", :binds=>["J.K. Rowling", 1]}
+  def check_prepared_stmt_by_placeholder(placeholder, statement, payload)
+    sqlParam = []
+    unless payload[:binds].nil?
+      payload[:binds].each_with_index do |record, idx|
+        if record && defined?(record.value)
+          StackifyRubyAPM::Util.pushToAryIndex(sqlParam, idx, record.value)
+        elsif ((record && record.instance_of?(Array)) && defined?(record[1]))
+          StackifyRubyAPM::Util.pushToAryIndex(sqlParam, idx, record[1])
+        else
+          StackifyRubyAPM::Util.pushToAryIndex(sqlParam, idx, record)
+        end
+      end
+      statement[:SQL_PARAMETERS] = sqlParam.to_json if sqlParam.count > 0
+      true
+    else
+      false
+    end
+  end
+
+  # Common DB span properties shared to sequel, activerecord, etc.
+  def get_common_db_properties
+    {
+      CATEGORY: 'Database',
+      SUBCATEGORY: 'Execute',
+      COMPONENT_CATEGORY: 'DB Query',
+      COMPONENT_DETAIL: 'Execute SQL Query',
+      PROVIDER: 'generic'
+    }
+  end
 end
 include DatabaseHelper

data/lib/stackify_apm/instrumenter_helper.rb

@@ -90,9 +90,8 @@ module StackifyRubyAPM
                           )
                         end
 
-                  req = #{current_method_without}(*args, &block)
                   StackifyRubyAPM.span name, type, context: ctx do
-                    req
+                    #{current_method_without}(*args, &block)
                   end
                 else
                   return #{current_method_without}(*args, &block)
@@ -169,9 +168,9 @@ module StackifyRubyAPM
                             CATEGORY: 'Ruby'
                           )
                         end
-                  req = _self_without_apm_#{current_method}(*args, &block)
+
                   StackifyRubyAPM.span name, type, context: ctx do
-                    req
+                    _self_without_apm_#{current_method}(*args, &block)
                   end
                 else
                   return _self_without_apm_#{current_method}(*args, &block)
@@ -190,6 +189,93 @@ module StackifyRubyAPM
       @custom_class_info[current_class.to_s]['controller'] = true if class_path && class_path.include?('controllers')
       @custom_class_info[current_class.to_s]['model'] = true if class_path && class_path.include?('models')
     end
+
+    # Monkey patch the single ruby module file.
+    #
+    # tracked_func - trackedFunction variable in stackify.json
+    # current_module - module variable in stackify.json
+    # class_path - file_path variable in stackify.json
+    # options - other options such as trackedFunctionName
+    def self.patched_module(tracked_func, current_module, class_path, **options)
+      current_method = options[:current_method] || nil
+      tracked_function_name = options[:tracked_function_name] || nil
+      transaction = options[:is_transaction] || nil
+      mod_spy = "#{current_module}Spy"
+
+      unless @custom_instrumented[current_module.to_s]
+        @custom_instrumented[current_module.to_s] = {}
+      end
+
+      unless @custom_instrumented[current_module.to_s][current_method.to_s]
+        @custom_instrumented[current_module.to_s][current_method.to_s] = false
+      end
+
+      unless @custom_class_info[current_module.to_s]
+        @custom_class_info[current_module.to_s] = {}
+      end
+
+      unless @custom_class_info[current_module.to_s]['controller']
+        @custom_class_info[current_module.to_s]['controller'] = false
+      end
+
+      unless @custom_class_info[current_module.to_s]['model']
+        @custom_class_info[current_module.to_s]['model'] = false
+      end
+
+      return unless @custom_instrumented[current_module.to_s][current_method.to_s] == false
+
+      eval <<-RUBY
+        module #{mod_spy}
+          def self.install
+            #{current_module}.class_eval do
+              class<< self
+                alias_method "#{current_method}_without_apm", "#{current_method}"
+
+                def #{current_method}(*args, &block)
+                  if StackifyRubyAPM.current_transaction.nil? && #{!transaction.nil?}
+                    t = StackifyRubyAPM.transaction("custom.#{current_module}.#{current_method}", TRACETYPE)
+                    begin
+                      req = #{current_method}_without_apm(*args, &block)
+                    rescue Exception => e
+                      StackifyRubyAPM.report(e)
+                      raise e
+                    ensure
+                      t.submit
+                    end
+                    return req
+                  elsif StackifyRubyAPM.current_transaction
+                    name = "Custom Instrument"
+                    type = "#{current_module}##{current_method}"
+                    ctx = if "#{tracked_func}" == 'true'
+                            Span::Context.new(
+                              CATEGORY: 'Ruby',
+                              TRACKED_FUNC: "#{tracked_function_name}"
+                            )
+                          else
+                            Span::Context.new(
+                              CATEGORY: 'Ruby'
+                            )
+                          end
+
+                    StackifyRubyAPM.span name, type, context: ctx do
+                      #{current_method}_without_apm(*args, &block)
+                    end
+                  else
+                    return #{current_method}_without_apm(*args, &block)
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        StackifyRubyAPM::Spies.register current_module.to_s, class_path.to_s, #{mod_spy}, true, "#{current_method}", "#{tracked_func}", "#{tracked_function_name}"
+      RUBY
+      @custom_instrumented[current_module.to_s][current_method.to_s] = true
+      @custom_class_info[current_module.to_s]['controller'] = true if class_path && class_path.include?('controllers')
+      @custom_class_info[current_module.to_s]['model'] = true if class_path && class_path.include?('models')
+    end
+
     # rubocop:enable Metrics/CyclomaticComplexity
     # rubocop:enable Metrics/PerceivedComplexity
     # rubocop:enable Lint/UselessAssignment

data/lib/stackify_apm/logger/log_device.rb

@@ -14,9 +14,6 @@ module StackifyRubyAPM
         if FileTest.exist?(@filename)
         else
           @dev = create_logfile(@filename)
-          File.chmod(0o777, @filename)
-
-          return @dev
         end
       end
       write_without_apm(message)
@@ -58,7 +55,6 @@ module StackifyRubyAPM
       temp_newfilename = "#{temp_filename}-#{filename_counter}.log"
       @filename = temp_newfilename
       @dev = create_logfile(@filename)
-      File.chmod(0o777, @filename)
 
       true
     end
@@ -80,10 +76,16 @@ module StackifyRubyAPM
       @dev.close rescue nil
       File.rename(@filename.to_s, age_file)
       @dev = create_logfile(@filename)
-      File.chmod(0o777, @filename)
 
       true
     end
+
+    # Override create_logfile of core LogDevice class where we set File.chmod to 0o777
+    def create_logfile(filename)
+      logdev = super
+      File.chmod(0o777, filename)
+      logdev
+    end
     # rubocop:enable Style/RescueModifier
     # rubocop:enable Lint/RescueWithoutErrorClass
   end

data/lib/stackify_apm/logger/logger_high_version.rb

@@ -29,7 +29,11 @@ module StackifyRubyAPM
           temp_filename = logdev.gsub('-1.log', '')
           new_logdev = temp_filename + '-1.log'
         end
-        @logdev = LogDevice.new(new_logdev, shift_size: shift_size)
+        begin
+          @logdev = LogDevice.new(new_logdev, shift_size: shift_size)
+        rescue StandardError => e
+          puts "Stackify Profiler unable to access [" + logdev + "]"
+        end
       end
     end
     require 'stackify_apm/logger/log_device'

data/lib/stackify_apm/logger/logger_lower_version.rb

@@ -20,7 +20,11 @@ module StackifyRubyAPM
           temp_filename = logdev.gsub('-1.log', '')
           new_logdev = temp_filename + '-1.log'
         end
-        @logdev = LogDevice.new(new_logdev, shift_size: shift_size)
+        begin
+          @logdev = LogDevice.new(new_logdev, shift_size: shift_size)
+        rescue StandardError => e
+          puts "Stackify Profiler unable to access [" + logdev + "]"
+        end
       end
     end