instana 1.193.3.pre1 → 1.193.3

data/lib/instana/frameworks/instrumentation/action_view.rb

@@ -1,39 +0,0 @@
-module Instana
-  module Instrumentation
-    module ActionViewRenderer
-      def render_partial(*args)
-        kv_payload = { :render => {} }
-        kv_payload[:render][:type] = :partial
-        kv_payload[:render][:name] = @options[:partial].to_s if @options.is_a?(Hash)
-
-        ::Instana.tracer.log_entry(:render, kv_payload)
-        super(*args)
-      rescue Exception => e
-        ::Instana.tracer.log_error(e)
-        raise
-      ensure
-        ::Instana.tracer.log_exit(:render)
-      end
-
-      def render_collection(*args)
-        puts 'called'
-        kv_payload = { :render => {} }
-        kv_payload[:render][:type] = :collection
-        kv_payload[:render][:name] = @path.to_s
-
-        ::Instana.tracer.log_entry(:render, kv_payload)
-        super(*args)
-      rescue Exception => e
-        ::Instana.tracer.log_error(e)
-        raise
-      ensure
-        ::Instana.tracer.log_exit(:render)
-      end
-    end
-  end
-end
-
-if defined?(::ActionView) && ::Instana.config[:action_view][:enabled] && ::ActionPack::VERSION::STRING >= '3.1'
-  ::Instana.logger.debug "Instrumenting ActionView"
-  ::ActionView::PartialRenderer.send(:prepend, ::Instana::Instrumentation::ActionViewRenderer)
-end

data/lib/instana/frameworks/instrumentation/active_record.rb

@@ -1,27 +0,0 @@
-
-require "instana/frameworks/instrumentation/mysql_adapter"
-require "instana/frameworks/instrumentation/abstract_mysql_adapter"
-require "instana/frameworks/instrumentation/mysql2_adapter"
-require "instana/frameworks/instrumentation/postgresql_adapter"
-
-if defined?(::ActiveRecord) && ::Instana.config[:active_record][:enabled]
-
-  # Mysql
-  if defined?(ActiveRecord::ConnectionAdapters::MysqlAdapter)
-    ::Instana.logger.debug "Instrumenting ActiveRecord (mysql)"
-    ActiveRecord::ConnectionAdapters::MysqlAdapter.send(:prepend, ::Instana::Instrumentation::MysqlAdapter)
-    ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.send(:prepend, ::Instana::Instrumentation::AbstractMysqlAdapter)
-  end
-
-  # Mysql2
-  if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
-    ::Instana.logger.debug "Instrumenting ActiveRecord (mysql2)"
-    ActiveRecord::ConnectionAdapters::Mysql2Adapter.send(:prepend, ::Instana::Instrumentation::Mysql2Adapter)
-  end
-
-  # Postgres
-  if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-    ::Instana.logger.debug "Instrumenting ActiveRecord (postgresql)"
-    ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:prepend, ::Instana::Instrumentation::PostgreSQLAdapter)
-  end
-end

data/lib/instana/frameworks/instrumentation/mysql2_adapter.rb

@@ -1,83 +0,0 @@
-module Instana
-  module Instrumentation
-    module Mysql2Adapter
-      IGNORED_PAYLOADS = %w(SCHEMA EXPLAIN CACHE).freeze
-      EXPLAINED_SQLS = /\A\s*(with|select|update|delete|insert)\b/i
-
-      # This module supports instrumenting ActiveRecord with the mysql2 adapter.
-      #
-      def self.prepended(klass)
-        # ActiveRecord 3.1 and up only (for now possibly)
-        if ActiveRecord::VERSION::STRING > '3.0'
-          @@sanitize_regexp = Regexp.new('(\'[\s\S][^\']*\'|\d*\.\d+|\d+|NULL)', Regexp::IGNORECASE)
-        end
-      end
-
-      # Collect up this DB connection info for reporting.
-      #
-      # @param sql [String]
-      # @return [Hash] Hash of collected KVs
-      #
-      def collect(sql)
-        payload = { :activerecord => {} }
-
-        if ::Instana.config[:sanitize_sql]
-          payload[:activerecord][:sql] = sql.gsub(@@sanitize_regexp, '?')
-        else
-          payload[:activerecord][:sql] = sql
-        end
-
-        payload[:activerecord][:adapter] = @config[:adapter]
-        payload[:activerecord][:host] = @config[:host]
-        payload[:activerecord][:db] = @config[:database]
-        payload[:activerecord][:username] = @config[:username]
-        payload
-      end
-
-      # In the spirit of ::ActiveRecord::ExplainSubscriber.ignore_payload?  There are
-      # only certain calls that we're interested in tracing.  e.g. No use to instrument
-      # framework caches.
-      #
-      # @param payload [String]
-      # @return [Boolean]
-      #
-      def ignore_payload?(name, sql)
-        IGNORED_PAYLOADS.include?(name) || sql !~ EXPLAINED_SQLS
-      end
-
-      def exec_delete(sql, name = nil, binds = [])
-        if !::Instana.tracer.tracing? || ignore_payload?(name, sql)
-          return super(sql, name, binds)
-        end
-
-        kv_payload = collect(sql)
-        ::Instana.tracer.trace(:activerecord, kv_payload) do
-          super(sql, name, binds)
-        end
-      end
-
-      def exec_insert(sql, name = 'SQL', binds = [], *args)
-        if !::Instana.tracer.tracing? || ignore_payload?(name, sql)
-          return super(sql, name, binds, *args)
-        end
-
-        kv_payload = collect(sql)
-        ::Instana.tracer.trace(:activerecord, kv_payload) do
-          super(sql, name, binds, *args)
-        end
-      end
-
-      def exec_query(sql, name = 'SQL', binds = [], *args)
-        if !::Instana.tracer.tracing? || ignore_payload?(name, sql) ||
-            ::Instana.tracer.current_span[:n] == :activerecord
-          return super(sql, name, binds, *args)
-        end
-
-        kv_payload = collect(sql)
-        ::Instana.tracer.trace(:activerecord, kv_payload) do
-          super(sql, name, binds, *args)
-        end
-      end
-    end
-  end
-end

data/lib/instana/frameworks/instrumentation/mysql_adapter.rb

@@ -1,60 +0,0 @@
-module Instana
-  module Instrumentation
-    module MysqlAdapter
-      IGNORED_PAYLOADS = %w(SCHEMA EXPLAIN CACHE).freeze
-      EXPLAINED_SQLS = /\A\s*(with|select|update|delete|insert)\b/i
-
-      # This module supports instrumenting ActiveRecord with the mysql2 adapter.
-      #
-      def self.prepended(klass)
-        if ActiveRecord::VERSION::STRING >= '3.2'
-          @@sanitize_regexp = Regexp.new('(\'[\s\S][^\']*\'|\d*\.\d+|\d+|NULL)', Regexp::IGNORECASE)
-        end
-      end
-
-      # Collect up this DB connection info for reporting.
-      #
-      # @param sql [String]
-      # @return [Hash] Hash of collected KVs
-      #
-      def collect(sql)
-        payload = { :activerecord => {} }
-
-        if ::Instana.config[:sanitize_sql]
-          payload[:activerecord][:sql] = sql.gsub(@@sanitize_regexp, '?')
-        else
-          payload[:activerecord][:sql] = sql
-        end
-
-        payload[:activerecord][:adapter] = @config[:adapter]
-        payload[:activerecord][:host] = @config[:host]
-        payload[:activerecord][:db] = @config[:database]
-        payload[:activerecord][:username] = @config[:username]
-        payload
-      end
-
-      # In the spirit of ::ActiveRecord::ExplainSubscriber.ignore_payload?  There are
-      # only certain calls that we're interested in tracing.  e.g. No use to instrument
-      # framework caches.
-      #
-      # @param payload [String]
-      # @return [Boolean]
-      #
-      def ignore_payload?(name, sql)
-        IGNORED_PAYLOADS.include?(name) || sql !~ EXPLAINED_SQLS
-      end
-
-      def exec_query(sql, name = 'SQL', binds = [], *args)
-        if !::Instana.tracer.tracing? || ignore_payload?(name, sql) ||
-            ::Instana.tracer.current_span[:n] == :activerecord
-          return super(sql, name, binds, *args)
-        end
-
-        kv_payload = collect(sql)
-        ::Instana.tracer.trace(:activerecord, kv_payload) do
-          super(sql, name, binds, *args)
-        end
-      end
-    end
-  end
-end

data/lib/instana/frameworks/instrumentation/postgresql_adapter.rb

@@ -1,99 +0,0 @@
-module Instana
-  module Instrumentation
-    module PostgreSQLAdapter
-      IGNORED_PAYLOADS = %w(SCHEMA EXPLAIN CACHE).freeze
-      IGNORED_SQL = %w(BEGIN COMMIT)
-      EXPLAINED_SQLS = /\A\s*(with|select|update|delete|insert)\b/i
-
-      # This module supports instrumenting ActiveRecord with the postgresql adapter.  Only
-      # versions >= 3.1 are supported.
-      #
-      def self.prepended(klass)
-        if (::ActiveRecord::VERSION::MAJOR == 3 && ::ActiveRecord::VERSION::MINOR > 0) ||
-             ::ActiveRecord::VERSION::MAJOR >= 4
-
-          # ActiveRecord 3.1 and up
-          @@sanitize_regexp = Regexp.new('(\'[\s\S][^\']*\'|\d*\.\d+|\d+|NULL)', Regexp::IGNORECASE)
-        end
-      end
-
-      # Collect up this DB connection info for reporting.
-      #
-      # @param sql [String]
-      # @return [Hash] Hash of collected KVs
-      #
-      def collect(sql, binds = nil)
-        payload = { :activerecord => {} }
-
-        payload[:activerecord][:adapter] = @config[:adapter]
-        payload[:activerecord][:host] = @config[:host]
-        payload[:activerecord][:db] = @config[:database]
-        payload[:activerecord][:username] = @config[:username]
-
-        if ::Instana.config[:sanitize_sql]
-          payload[:activerecord][:sql] = sql.gsub(@@sanitize_regexp, '?')
-        else
-          # No sanitization so raw SQL and collect up binds
-          payload[:activerecord][:sql] = sql
-
-          # FIXME: Only works on Rails 5 as the bind format varied in previous versions of Rails
-          if binds.is_a?(Array)
-            raw_binds = []
-            binds.each { |x| raw_binds << x.value_before_type_cast }
-            payload[:activerecord][:binds] = raw_binds
-          end
-        end
-
-        payload
-      rescue Exception => e
-        ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
-      ensure
-        return payload
-      end
-
-      # In the spirit of ::ActiveRecord::ExplainSubscriber.ignore_payload?  There are
-      # only certain calls that we're interested in tracing.  e.g. No use to instrument
-      # framework caches.
-      #
-      # @param payload [String]
-      # @return [Boolean]
-      #
-      def ignore_payload?(name, sql)
-        IGNORED_PAYLOADS.include?(name) || IGNORED_SQL.include?(sql)
-      end
-
-      def exec_query(sql, name = 'SQL', binds = [], *args)
-        if !::Instana.tracer.tracing? || ignore_payload?(name, sql)
-          return super(sql, name, binds, *args)
-        end
-
-        kv_payload = collect(sql, binds)
-        ::Instana.tracer.trace(:activerecord, kv_payload) do
-          super(sql, name, binds, *args)
-        end
-      end
-
-      def exec_delete(sql, name = nil, binds = [])
-        if !::Instana.tracer.tracing? || ignore_payload?(name, sql)
-          return super(sql, name, binds)
-        end
-
-        kv_payload = collect(sql, binds)
-        ::Instana.tracer.trace(:activerecord, kv_payload) do
-          super(sql, name, binds)
-        end
-      end
-
-      def execute(sql, name = nil)
-        if !::Instana.tracer.tracing? || ignore_payload?(name, sql)
-          return super(sql, name)
-        end
-
-        kv_payload = collect(sql)
-        ::Instana.tracer.trace(:activerecord, kv_payload) do
-          super(sql, name)
-        end
-      end
-    end
-  end
-end

data/test/frameworks/rails/actionview3_test.rb

@@ -1,210 +0,0 @@
-require 'test_helper'
-
-class ActionViewTest < Minitest::Test
-  def test_config_defaults
-    assert ::Instana.config[:action_view].is_a?(Hash)
-    assert ::Instana.config[:action_view].key?(:enabled)
-    assert_equal true, ::Instana.config[:action_view][:enabled]
-  end
-
-  def test_render_view
-    clear_all!
-
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_view'))
-
-    spans = Instana.processor.queued_spans
-    assert_equal 3, spans.length
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal :actionview, third_span.name
-  end
-
-  def test_render_nothing
-    clear_all!
-
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_nothing'))
-
-    spans = Instana.processor.queued_spans
-    assert_equal 3, spans.length
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal "Nothing", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
-  end
-
-  def test_render_file
-    clear_all!
-
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_file'))
-
-    spans = Instana.processor.queued_spans
-    assert_equal 3, spans.length
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal "/etc/issue", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
-  end
-
-  def test_render_json
-    clear_all!
-
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_json'))
-
-    spans = Instana.processor.queued_spans
-    assert_equal 3, spans.length
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal "JSON", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
-  end
-
-  def test_render_xml
-    clear_all!
-
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_xml'))
-
-    assert_equal 3, spans.length
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal "XML", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
-  end
-
-  def test_render_body
-    clear_all!
-
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_rawbody'))
-
-    spans = Instana.processor.queued_spans
-    assert_equal 3, spans.length
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal "Raw", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
-  end
-
-  def test_render_js
-    clear_all!
-
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_js'))
-
-    spans = Instana.processor.queued_spans
-    assert_equal 3, spans.length
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal "Javascript", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
-  end
-
-  def test_render_alternate_layout
-    clear_all!
-
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_alternate_layout'))
-
-    spans = Instana.processor.queued_spans
-    assert_equal 3, spans.length
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal "layouts/mobile", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
-  end
-
-  def test_render_partial
-    clear_all!
-
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_partial'))
-
-    spans = Instana.processor.queued_spans
-    assert_equal 4, spans.length
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-    fourth_span = spans[3]
-
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal :actionview, third_span.name
-    assert_equal :render, fourth_span.name
-    assert_equal :partial, fourth_span[:data][:render][:type]
-    assert_equal 'message', fourth_span[:data][:render][:name]
-  end
-
-  def test_render_partial_that_errors
-    clear_all!
-
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_partial_that_errors'))
-
-    spans = Instana.processor.queued_spans
-    assert_equal 4, spans.length
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-    fourth_span = spans[3]
-
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal :actionview, third_span.name
-    assert_equal :render, fourth_span.name
-    assert_equal :partial, fourth_span[:data][:render][:type]
-    assert_equal 'syntax_error', fourth_span[:data][:render][:name]
-    assert fourth_span[:data][:log].key?(:message)
-    assert_equal "ActionView::Template::Error", fourth_span[:data][:log][:parameters]
-    assert fourth_span[:error]
-    assert fourth_span[:stack]
-  end
-
-  def test_render_collection
-    clear_all!
-
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/render_collection'))
-
-    spans = Instana.processor.queued_spans
-    assert_equal 5, spans.length
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-    fourth_span = spans[3]
-    fifth_span = spans[4]
-
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal :activerecord, third_span.name
-    assert_equal :actionview, fourth_span.name
-
-    assert_equal :render, fifth_span.name
-    assert_equal :collection, fifth_span[:data][:render][:type]
-    assert_equal 'blocks/block', fifth_span[:data][:render][:name]
-  end
-end