app_perf_rpm 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3acd152efd84397682641dd381b931c8a005251
-  data.tar.gz: 3f6b8ee3b1bc73675323e7050791511b725a2360
+  metadata.gz: 5514146ba2ff7a662504fe584fbc5f7275f88ae8
+  data.tar.gz: 71671f2252b993f5e99d0c240c9502e564001eff
 SHA512:
-  metadata.gz: d60c4242d0f5d71a614bffba15b140a3d05b9b98a8eef9b51d080786802a31ab8bb34cdf69549c03445ae9e6aeb033f7d55caf0f0781291ab79604309b9020ed
-  data.tar.gz: 13ca881a617b1af03acc08c3a579de2678c240c0a746c77e2633417ad8a42678422e5a5e56b8548e387298653078d06ce5c08c836bf5449ffa4c51ad1de2cc6e
+  metadata.gz: 115dfee2ee761d034683660bc271503977de17915a679893074ab904fa963f5dc028986db2e420a2ccd2787286ff443b6387dc0183489197d6d2c976eba6f443
+  data.tar.gz: 98749bc895ca61c62195a522a938a91b4750fcbd18eec63f25279ffe4c990a9d476263f10598760e6b9de5781b59687f5e6f0922bbc81063a3e94a2b272e6334

data/lib/app_perf_rpm.rb

@@ -150,7 +150,11 @@ module AppPerfRpm
     end
 
     def now
-      Process.clock_gettime(Process::CLOCK_REALTIME)
+      if defined?(Process::CLOCK_REALTIME)
+        Process.clock_gettime(Process::CLOCK_REALTIME)
+      else
+        Time.now
+      end
     end
 
   end

data/lib/app_perf_rpm/backtrace.rb

@@ -1,7 +1,9 @@
 module AppPerfRpm
   class Backtrace
     class << self
-      def backtrace(kind: :all)
+      def backtrace(opts = {})
+        kind = opts[:kind]
+
         if kind
           bt = Kernel.caller
           bt = clean(bt)
@@ -42,7 +44,9 @@ module AppPerfRpm
       #  end
       #end
 
-      def source_extract(backtrace: Kernel.caller(0))
+      def source_extract(opts = {})
+        backtrace = opts[:backtrace] || Kernel.caller(0)
+
         Array(backtrace).select {|bt| bt[/^#{::AppPerfRpm.config.app_root.to_s}\//] }.map do |trace|
           file, line_number = extract_file_and_line_number(trace)
           source_to_hash(file, line_number)
@@ -91,7 +95,9 @@ module AppPerfRpm
         [file, line.to_i]
       end
 
-      def trim_backtrace(_backtrace, kind: :all)
+      def trim_backtrace(_backtrace, opts = {})
+        kind = opts[:kind]
+
         return _backtrace unless _backtrace.is_a?(Array)
 
         length = _backtrace.size

data/lib/app_perf_rpm/configuration.rb

@@ -34,6 +34,7 @@ module AppPerfRpm
         self.instrumentation = {
           :rack                    => { :enabled => true, :backtrace => :app, :source => true, :trace_middleware => false },
           :roda                    => { :enabled => true, :backtrace => :app, :source => true },
+          :grape                   => { :enabled => true, :backtrace => :app, :source => true },
           :active_record           => { :enabled => true, :backtrace => :app, :source => true },
           :active_record_import    => { :enabled => true, :backtrace => :app, :source => true },
           :active_model_serializer => { :enabled => true, :backtrace => :app, :source => true },

data/lib/app_perf_rpm/instruments/action_view.rb

@@ -49,8 +49,10 @@ if ::AppPerfRpm.config.instrumentation[:action_view][:enabled] && defined?(::Act
         span.finish if span
       end
     end
-  else
-    ActionView::PartialRenderer.class_eval do
+  end
+
+  if defined?(Rails) && Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 0
+    ::ActionView::Partials::PartialRenderer.class_eval do
       alias :render_partial_without_trace :render_partial
       def render_partial
         if ::AppPerfRpm::Tracer.tracing?
@@ -100,41 +102,104 @@ if ::AppPerfRpm.config.instrumentation[:action_view][:enabled] && defined?(::Act
       end
     end
 
-    ::ActionView::TemplateRenderer.class_eval do
-      alias render_with_layout_without_trace render_with_layout
+    ::ActionView::Rendering.class_eval do
+      alias :_render_template_without_trace _render_template
 
-      def render_with_layout(path, locals, *args, &block)
+      def _render_template(template, layout = nil, options = {})
         if ::AppPerfRpm::Tracer.tracing?
-          layout = nil
-
-          if path
-            if method(:find_layout).arity == 3
-              # Rails 5
-              layout = find_layout(path, locals.keys, [formats.first])
-            else
-              # Rails 3, 4
-              layout = find_layout(path, locals.keys)
-            end
-
-            @path = path
-          end
+          span = AppPerfRpm.tracer.start_span("render_template")
+          span.set_tag "view.template", template
+          span.set_tag "view.layout", layout
+          span.set_tag "component", "ActionView"
+          span.set_tag "span.kind", "client"
+          AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
+        end
 
-          if layout
-            span = AppPerfRpm.tracer.start_span("render_with_layout")
-            # span.set_tag "view.layout", layout
-            span.set_tag "view.template", layout.identifier
-          else
-            span = AppPerfRpm.tracer.start_span("render_without_layout")
-            if @path
-              span.set_tag "view.template", @path.call
-            end
+        _render_template_without_trace(template, layout, options)
+      rescue Exception => e
+        if span
+          span.set_tag('error', true)
+          span.log_error(e)
+        end
+        raise
+      ensure
+        span.finish if span
+      end
+    end
+  end
+
+  if defined?(Rails) && Rails.version >= '3.1.0'
+    ActionView::PartialRenderer.class_eval do
+      alias :render_partial_without_trace :render_partial
+      def render_partial
+        if ::AppPerfRpm::Tracer.tracing?
+          span = AppPerfRpm.tracer.start_span("render_partial", tags: {
+            "component" => "ActionView",
+            "span.kind" => "client",
+            "view.template" => @options[:partial]
+          })
+          AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
+        end
+
+        render_partial_without_trace
+      rescue Exception => e
+        if span
+          span.set_tag('error', true)
+          span.log_error(e)
+        end
+        raise
+      ensure
+        span.finish if span
+      end
+
+      alias :render_collection_without_trace :render_collection
+      def render_collection
+        if ::AppPerfRpm::Tracer.tracing?
+          span = AppPerfRpm.tracer.start_span("render_collection", tags: {
+            "component" => "ActionView",
+            "span.kind" => "client",
+            "view.template" => @path
+          })
+          if @_request
+            span.set_tag('view.controller', @_request.path_parameters['controller'])
+            span.set_tag('view.action', @_request.path_parameters['action'])
           end
+          AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
+        end
+
+        render_collection_without_trace
+      rescue Exception => e
+        if span
+          span.set_tag('error', true)
+          span.log_error(e)
+        end
+        raise
+      ensure
+        span.finish if span
+      end
+    end
+
+    ::ActionView::TemplateRenderer.class_eval do
+      alias :render_template_without_trace :render_template
+
+      def render_template(template, layout_name = nil, locals = {})
+        if ::AppPerfRpm::Tracer.tracing?
+          layout = if layout_name.is_a?(String)
+                     layout_name
+                   elsif method(:find_layout).arity == 3
+                     find_layout(layout_name, locals, [formats.first])
+                   elsif locals
+                     find_layout(layout_name, locals)
+                   end
+          span = AppPerfRpm.tracer.start_span("render_template")
+          span.set_tag "view.layout", layout
+          span.set_tag "view.template", template.identifier
           span.set_tag "component", "ActionView"
           span.set_tag "span.kind", "client"
           AppPerfRpm::Utils.log_source_and_backtrace(span, :action_view)
         end
 
-        render_with_layout_without_trace(path, locals, *args, &block)
+        render_template_without_trace(template, layout_name, locals)
       rescue Exception => e
         if span
           span.set_tag('error', true)

data/lib/app_perf_rpm/instruments/active_record.rb

@@ -17,11 +17,16 @@ if ::AppPerfRpm.config.instrumentation[:active_record][:enabled] &&
       ::AppPerfRpm::Instruments::ActiveRecord::Adapters::Sqlite3
     )
     ::ActiveRecord::ConnectionAdapters::SQLite3Adapter.class_eval do
-      alias_method :exec_query_without_trace, :exec_query
-      alias_method :exec_query, :exec_query_with_trace
+      if Rails.version < "3.1"
+        alias_method :exec_query_without_trace, :execute
+        alias_method :execute, :exec_query_with_trace
+      else
+        alias_method :exec_query_without_trace, :exec_query
+        alias_method :exec_query, :exec_query_with_trace
 
-      alias_method :exec_delete_without_trace, :exec_delete
-      alias_method :exec_delete, :exec_delete_with_trace
+        alias_method :exec_delete_without_trace, :exec_delete
+        alias_method :exec_delete, :exec_delete_with_trace
+      end
     end
   end
 
@@ -32,11 +37,16 @@ if ::AppPerfRpm.config.instrumentation[:active_record][:enabled] &&
     )
 
     ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
-      alias_method :exec_query_without_trace, :exec_query
-      alias_method :exec_query, :exec_query_with_trace
+      if Rails.version < "3.1"
+        alias_method :exec_query_without_trace, :execute
+        alias_method :execute, :exec_query_with_trace
+      else
+        alias_method :exec_query_without_trace, :exec_query
+        alias_method :exec_query, :exec_query_with_trace
 
-      alias_method :exec_delete_without_trace, :exec_delete
-      alias_method :exec_delete, :exec_delete_with_trace
+        alias_method :exec_delete_without_trace, :exec_delete
+        alias_method :exec_delete, :exec_delete_with_trace
+      end
     end
   end
 
@@ -47,11 +57,8 @@ if ::AppPerfRpm.config.instrumentation[:active_record][:enabled] &&
     )
 
     ::ActiveRecord::ConnectionAdapters::Mysql2Adapter.class_eval do
-      if (::ActiveRecord::VERSION::MAJOR == 3 && ::ActiveRecord::VERSION::MINOR == 0) ||
-          ::ActiveRecord::VERSION::MAJOR == 2
-        alias_method :execute_without_trace, :execute
-        alias_method :execute, :execute_with_trace
-      end
+      alias_method :execute_without_trace, :execute
+      alias_method :execute, :execute_with_trace
     end
   end
 end

data/lib/app_perf_rpm/instruments/active_record/adapters/mysql2.rb

@@ -23,7 +23,7 @@ module AppPerfRpm
                 adapter = connection_config.fetch(:adapter)
                 sanitized_sql = sanitize_sql(sql, adapter)
 
-                span = AppPerfRpm.tracer.start_span(name || 'sql.query', tags: {
+                span = AppPerfRpm.tracer.start_span(name || 'SQL', tags: {
                   "component" => "ActiveRecord",
                   "span.kind" => "client",
                   "db.statement" => sanitized_sql,

data/lib/app_perf_rpm/instruments/active_record/adapters/postgresql.rb

@@ -23,7 +23,7 @@ module AppPerfRpm
                 adapter = connection_config.fetch(:adapter)
                 sanitized_sql = sanitize_sql(sql, adapter)
 
-                span = AppPerfRpm.tracer.start_span(name || 'sql.query', tags: {
+                span = AppPerfRpm.tracer.start_span(name || 'SQL', tags: {
                   "component" => "ActiveRecord",
                   "span.kind" => "client",
                   "db.statement" => sanitized_sql,
@@ -53,7 +53,7 @@ module AppPerfRpm
                 adapter = connection_config.fetch(:adapter)
                 sanitized_sql = sanitize_sql(sql, adapter)
 
-                span = AppPerfRpm.tracer.start_span(name || 'sql.query', tags: {
+                span = AppPerfRpm.tracer.start_span(name || 'SQL', tags: {
                   "component" => "ActiveRecord",
                   "span.kind" => "client",
                   "db.statement" => sanitized_sql,
@@ -83,7 +83,7 @@ module AppPerfRpm
                 adapter = connection_config.fetch(:adapter)
                 sanitized_sql = sanitize_sql(sql, adapter)
 
-                span = AppPerfRpm.tracer.start_span(name || 'sql.query', tags: {
+                span = AppPerfRpm.tracer.start_span(name || 'SQL', tags: {
                   "component" => "ActiveRecord",
                   "span.kind" => "client",
                   "db.statement" => sanitized_sql,
@@ -112,7 +112,7 @@ module AppPerfRpm
               adapter = connection_config.fetch(:adapter)
               sanitized_sql = sanitize_sql(sql, adapter)
 
-              span = AppPerfRpm.tracer.start_span('sql.query', tags: {
+              span = AppPerfRpm.tracer.start_span('SQL', tags: {
                 "component" => "ActiveRecord",
                 "span.kind" => "client",
                 "db.statement" => "BEGIN",

data/lib/app_perf_rpm/instruments/active_record/adapters/sqlite3.rb

@@ -17,13 +17,13 @@ module AppPerfRpm
               name == 'ActiveRecord::SchemaMigration Load'
           end
 
-          def exec_query_with_trace(sql, name = nil, binds = [])
+          def exec_query_with_trace(sql, name = nil, *args)
             if ::AppPerfRpm::Tracer.tracing?
               unless ignore_trace?(name)
                 adapter = connection_config.fetch(:adapter)
                 sanitized_sql = sanitize_sql(sql, adapter)
 
-                span = AppPerfRpm.tracer.start_span('sql.query', tags: {
+                span = AppPerfRpm.tracer.start_span(name || 'SQL', tags: {
                   "component" => "ActiveRecord",
                   "span.kind" => "client",
                   "db.statement" => sanitized_sql,
@@ -36,7 +36,7 @@ module AppPerfRpm
               end
             end
 
-            exec_query_without_trace(sql, name, binds)
+            exec_query_without_trace(sql, name, *args)
           rescue Exception => e
             if span
               span.set_tag('error', true)
@@ -47,13 +47,13 @@ module AppPerfRpm
             span.finish if span
           end
 
-          def exec_delete_with_trace(sql, name = nil, binds = [])
+          def exec_delete_with_trace(sql, name = nil, *args)
             if ::AppPerfRpm::Tracer.tracing?
               unless ignore_trace?(name)
                 adapter = connection_config.fetch(:adapter)
                 sanitized_sql = sanitize_sql(sql, adapter)
 
-                span = AppPerfRpm.tracer.start_span('sql.query', tags: {
+                span = AppPerfRpm.tracer.start_span(name || 'SQL', tags: {
                   "component" => "ActiveRecord",
                   "span.kind" => "client",
                   "db.statement" => sanitized_sql,
@@ -66,7 +66,7 @@ module AppPerfRpm
               end
             end
 
-            exec_delete_without_trace(sql, name, binds)
+            exec_delete_without_trace(sql, name, *args)
           rescue Exception => e
             if span
               span.set_tag('error', true)
@@ -77,13 +77,13 @@ module AppPerfRpm
             span.finish if span
           end
 
-          def exec_insert_with_trace(sql, name = nil, binds = [], *args)
+          def exec_insert_with_trace(sql, name = nil, *args)
             if ::AppPerfRpm::Tracer.tracing?
               unless ignore_trace?(name)
                 adapter = connection_config.fetch(:adapter)
                 sanitized_sql = sanitize_sql(sql, adapter)
 
-                span = AppPerfRpm.tracer.start_span('sql.query', tags: {
+                span = AppPerfRpm.tracer.start_span(name || 'SQL', tags: {
                   "component" => "ActiveRecord",
                   "span.kind" => "client",
                   "db.statement" => sanitized_sql,
@@ -111,7 +111,7 @@ module AppPerfRpm
             if ::AppPerfRpm::Tracer.tracing?
               adapter = connection_config.fetch(:adapter)
 
-              span = AppPerfRpm.tracer.start_span('sql.query', tags: {
+              span = AppPerfRpm.tracer.start_span(name || 'SQL', tags: {
                 "component" => "ActiveRecord",
                 "span.kind" => "client",
                 "db.statement" => "BEGIN",

data/lib/app_perf_rpm/instruments/grape.rb

@@ -0,0 +1,61 @@
+module AppPerfRpm
+  module Instruments
+    module GrapeMiddleware
+
+      def call_with_trace(env)
+        req = ::Rack::Request.new(env)
+
+        if AppPerfRpm::Tracer.tracing?
+          request_method = req.request_method.to_s.upcase
+          path = req.path
+          endpoint = env["api.endpoint"]
+
+          if endpoint && endpoint.options
+            options = endpoint.options
+            request_method = options[:method].first.to_s.upcase
+            klass = options[:for]
+            namespace = endpoint.namespace
+            namespace = "" if namespace == "/"
+
+            path = options[:path].first.to_s
+            path = "/#{path}" if path[0] != "/"
+            path = "#{namespace}#{path}"
+          end
+
+          action = path.to_s.split("/").last
+          operation = "#{klass}##{action}"
+
+          span = AppPerfRpm.tracer.start_span(operation, tags: {
+            "component" => "Grape",
+            "span.kind" => "client",
+            "class.name" => @app.class.name,
+            "http.path" => path,
+            "http.method" => request_method
+          })
+          AppPerfRpm::Utils.log_source_and_backtrace(span, :rack)
+        end
+
+        begin
+          call_without_trace(env)
+        rescue Exception => e
+          if span
+            span.set_tag('error', true)
+            span.log_error(e)
+          end
+          raise
+        ensure
+          span.finish if span
+        end
+      end
+    end
+  end
+end
+
+if ::AppPerfRpm.config.instrumentation[:grape][:enabled] && defined?(::Grape)
+  ::AppPerfRpm.logger.info "Initializing grape tracer."
+  ::Grape::Middleware::Base.send(:include, AppPerfRpm::Instruments::GrapeMiddleware)
+  ::Grape::Middleware::Base.class_eval do
+    alias_method :call_without_trace, :call
+    alias_method :call, :call_with_trace
+  end
+end

data/lib/app_perf_rpm/instruments/net_http.rb

@@ -4,7 +4,7 @@ if ::AppPerfRpm.config.instrumentation[:net_http][:enabled] && defined?(Net::HTT
   Net::HTTP.class_eval do
     def request_with_trace(*args, &block)
       if ::AppPerfRpm::Tracer.tracing?
-        span = ::AppPerfRpm.tracer.start_span("net-http", {
+        span = ::AppPerfRpm.tracer.start_span("net-http", tags: {
           "component" => "NetHttp",
           "span.kind" => "client"
         })

data/lib/app_perf_rpm/reporters/json_client.rb

@@ -6,10 +6,10 @@ require 'base64'
 module AppPerfRpm
   module Reporters
     class JsonClient
-      def initialize(url:, collector:, flush_interval:)
-        @collector = collector
-        @flush_interval = flush_interval
-        @spans_uri = URI.parse(url)
+      def initialize(opts = { :url => nil, :collector => nil, :flush_interval => nil })
+        @collector = opts[:collector]
+        @flush_interval = opts[:flush_interval]
+        @spans_uri = URI.parse(opts[:url])
       end
 
       def start

data/lib/app_perf_rpm/tracer.rb

@@ -1,5 +1,3 @@
-require 'opentracing'
-
 module AppPerfRpm
   class Tracer
     class << self

data/lib/app_perf_rpm/tracing/managed_span.rb

@@ -27,9 +27,11 @@ module AppPerfRpm
         end
       end
 
-      def finish(end_time: AppPerfRpm.now)
+      def finish(opts = {})
+        opts[:end_time] ||= AppPerfRpm.now
+
         deactivate
-        @span.finish(end_time: end_time)
+        @span.finish(end_time: opts[:end_time])
       end
     end
   end

data/lib/app_perf_rpm/tracing/managed_tracer.rb

@@ -1,6 +1,6 @@
 module AppPerfRpm
   module Tracing
-    class ManagedTracer < OpenTracing::Tracer
+    class ManagedTracer
       extend Forwardable
       def_delegators :@tracer, :inject, :extract
 
@@ -23,8 +23,10 @@ module AppPerfRpm
         thread_span_stack.active_span
       end
 
-      def start_span(operation_name, child_of: active_span, **args)
-        span = @tracer.start_span(operation_name, child_of: child_of, **args)
+      def start_span(operation_name, opts = {}, *args)
+        opts[:child_of] ||= active_span
+
+        span = @tracer.start_span(operation_name, opts, *args)
         @thread_span_stack.set_active_span(span)
       end
     end

data/lib/app_perf_rpm/tracing/span.rb

@@ -4,13 +4,13 @@ module AppPerfRpm
       attr_accessor :operation_name
 
       attr_reader :context, :start_time, :end_time, :tags, :log_entries
-      def initialize(context, operation_name, collector, start_time: AppPerfRpm.now, tags: {})
+      def initialize(context, operation_name, collector, opts = {})
         @context = context
         @operation_name = operation_name
         @collector = collector
-        @start_time = start_time
+        @start_time = opts[:start_time] || AppPerfRpm.now
         @end_time = nil
-        @tags = tags
+        @tags = opts[:tags] || {}
         @log_entries = []
       end
 
@@ -32,22 +32,25 @@ module AppPerfRpm
         @context.get_baggage_item(key)
       end
 
-      def log(event: nil, timestamp: AppPerfRpm.now, **fields)
+      # Original definition for ruby 2+ was this:
+      # def log(opts = { :event => nil, :timestamp => AppPerfRpm.now }, **fields)
+      # but this doesn't work in 1.9.
+      def log(opts = {}, *_, fields)
         entry = {
-          "event" => event,
-          "timestamp" => timestamp,
+          "event" => opts[:event] || nil,
+          "timestamp" => opts[:timestamp] || AppPerfRpm.now,
         }
 
-        entry["fields"] = fields if fields
+        entry["fields"] = fields
         @log_entries << entry
 
         nil
       end
 
-      def log_error(exception, timestamp: AppPerfRpm.now)
+      def log_error(exception, opts = {})
         log(
           event: "error",
-          timestamp: timestamp,
+          timestamp: opts[:timestamp] || AppPerfRpm.now,
           message: exception.message,
           error_class: exception.class.to_s,
           backtrace: AppPerfRpm::Backtrace.clean(exception.backtrace),
@@ -55,12 +58,12 @@ module AppPerfRpm
         )
       end
 
-      def exit(end_time: AppPerfRpm.now)
-        @end_time = end_time
+      def exit(opts = {})
+        @end_time = opts[:end_time] || AppPerfRpm.now
       end
 
-      def finish(end_time: AppPerfRpm.now)
-        @collector.send_span(self, @end_time || end_time)
+      def finish(opts = {})
+        @collector.send_span(self, @end_time || opts[:end_time] || AppPerfRpm.now)
       end
     end
   end

data/lib/app_perf_rpm/tracing/span_context.rb

@@ -17,12 +17,12 @@ module AppPerfRpm
 
       attr_reader :span_id, :parent_id, :trace_id, :baggage
 
-      def initialize(span_id:, parent_id: nil, trace_id:, sampled:, baggage: {})
-        @span_id = span_id
-        @parent_id = parent_id
-        @trace_id = trace_id
-        @sampled = sampled
-        @baggage = baggage
+      def initialize(opts = {})
+        @span_id = opts[:span_id] || nil
+        @parent_id = opts[:parent_id] || nil
+        @trace_id = opts[:trace_id] || nil
+        @sampled = opts[:sampled] || nil
+        @baggage = opts[:baggage] || {}
       end
 
       def set_baggage_item(key, value)

data/lib/app_perf_rpm/tracing/tracer.rb

@@ -1,13 +1,16 @@
-require 'opentracing'
-
 module AppPerfRpm
   module Tracing
     class Tracer
       attr_reader :thread_span_stack, :collector
 
-      def self.build(collector:, sender:, service_name:)
-        sender.start
-        new(collector, sender)
+      def self.build(opts = {})
+        opts[:collector] ||= nil
+        opts[:sender] ||= nil
+        opts[:service_name] ||= nil
+
+        opts[:sender].start
+
+        new(opts[:collector], opts[:sender])
       end
 
       def initialize(collector, sender)
@@ -19,7 +22,11 @@ module AppPerfRpm
         @sender.stop
       end
 
-      def start_span(operation_name, child_of: nil, start_time: AppPerfRpm.now, tags: {}, **)
+      def start_span(operation_name, opts = {}, *)
+        child_of = opts[:child_of] || nil
+        opts[:start_time] ||= AppPerfRpm.now
+        opts[:tags] ||= {}
+
         context =
           if child_of
             parent_context = child_of.respond_to?(:context) ? child_of.context : child_of
@@ -29,8 +36,8 @@ module AppPerfRpm
           end
 
         span = Span.new(context, operation_name, @collector, {
-          start_time: start_time,
-          tags: tags
+          start_time: opts[:start_time],
+          tags: opts[:tags]
         })
       end
 

data/lib/app_perf_rpm/utils.rb

@@ -7,7 +7,7 @@ module AppPerfRpm
     end
 
     def connection_config
-      @connection_config ||= if ::ActiveRecord::VERSION::MAJOR == 2
+      @connection_config ||= if ::ActiveRecord::VERSION::MAJOR == 2 || (::ActiveRecord::VERSION::MAJOR == 3 && ::ActiveRecord::VERSION::MINOR < 1)
                                ActiveRecord::Base.connection.instance_variable_get(:@config)
                              else
                                ::ActiveRecord::Base.connection_config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_perf_rpm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Randy Girard
@@ -24,78 +24,50 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: opentracing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-- !ruby/object:Gem::Dependency
-  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -170,6 +142,7 @@ files:
 - lib/app_perf_rpm/instruments/activerecord_import.rb
 - lib/app_perf_rpm/instruments/emque_consuming.rb
 - lib/app_perf_rpm/instruments/faraday.rb
+- lib/app_perf_rpm/instruments/grape.rb
 - lib/app_perf_rpm/instruments/net_http.rb
 - lib/app_perf_rpm/instruments/rack.rb
 - lib/app_perf_rpm/instruments/redis.rb
@@ -218,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: AppPerf Ruby Agent