app_perf_rpm 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a31589cddf1471657ebd6d97b9eb41fedfc86768
-  data.tar.gz: 306b0b306e9ce951a5f88281aaa28ee2ce33c099
+  metadata.gz: 8a066a37d5f3c2f7880ef434988ca092e512e741
+  data.tar.gz: a781dcbc4d6c97fe97fd807d6eaa8859450a45a2
 SHA512:
-  metadata.gz: efa6827c82f8155be934a5c4130ef8b2f6e6a5967c4c4a45219a5c6498debc38aabbf64fbfe0557766603520343ffa28e329ff5b5a2feb1c37f9bbafd7fcd3d9
-  data.tar.gz: c7517fd67206b1e8f1bb00f9a75871282638daffd987595a4a2167126bc8468a3d25cf9ad5140e06f965ac4afd2c6b74663ef42ea34cdd26a5fdc4339b374f81
+  metadata.gz: d0c35afab0e3d636277c7b308f0c81186ee5a6cfe3f01997c0e559e63b327e5e09103063ee5e6d026f69357c00387e326e013affa98d9de64d0fcf92ea29989c
+  data.tar.gz: 1bed1af8e426808af7702eedfc810f7508f8b510acb0c49f621dbbf17c343e5a1bc6a3f47571ba18b4ba3cb3614e4ef1f2c2cd629ee5fb7348310ed0d4f2b6c8

data/lib/app_perf_rpm/configuration.rb

@@ -30,7 +30,7 @@ module AppPerfRpm
         self.dispatch_interval ||= 60 # In seconds
         self.agent_disabled ||= default_if_blank(ENV["APP_PERF_AGENT_DISABLED"], false)
         self.instrumentation = {
-          :rack                 => { :enabled => true, :backtrace => false, :trace_middleware => false },
+          :rack                 => { :enabled => true, :backtrace => false, :trace_middleware => true },
           :active_record        => { :enabled => true, :backtrace => false },
           :active_record_import => { :enabled => true, :backtrace => false },
           :action_view          => { :enabled => true, :backtrace => false },

data/lib/app_perf_rpm/instruments/rack.rb

@@ -1,41 +1,76 @@
 module AppPerfRpm
   module Instruments
-    class Rack
-      attr_reader :app
-
-      def initialize(app)
-        @app = app
-      end
-
+    module RackModule
       def call(env)
         req = ::Rack::Request.new(env)
+        status, headers, body = nil, nil, nil
 
-        incoming_trace = env["HTTP_X_APP_PERF_TRACE"]
-        incoming_trace_id = env["HTTP_X_APP_PERF_TRACE_ID"]
-
-        opts = {}
-        if incoming_trace.to_s.eql?("1")
-          opts.merge!("trace_id" => incoming_trace_id)
-        end
+        if ::AppPerfRpm::Tracer.in_trace? &&
+          ::AppPerfRpm.configuration.instrumentation[:rack][:trace_middleware]
+          AppPerfRpm::Tracer.trace("rack-middleware") do |span|
+            span.type = "web"
+            span.domain = req.host
+            span.url = req.path
+            span.options["class"] = @app.class.name
 
-        if ignore_path?(req.path)
-          @status, @headers, @response = @app.call(env)
+            status, headers, body = @app.call env
+          end
         else
-          AppPerfRpm::Tracer.start_trace("rack", opts) do |span|
+          AppPerfRpm::Tracer.start_trace("rack") do |span|
             span.type = "web"
             span.domain = req.host
             span.url = req.path
-            span.options["class"] = self.class.name
+            span.options["class"] = @app.class.name
 
-            @status, @headers, @response = @app.call(env)
+            status, headers, body = @app.call env
           end
         end
 
-        [@status, @headers, @response]
+        [status, headers, body]
+      end
+    end
+  end
+end
+
+if ::AppPerfRpm.configuration.instrumentation[:rack][:enabled]
+  ::AppPerfRpm.logger.info "Initializing rack tracer."
+
+  if ::AppPerfRpm.configuration.instrumentation[:rack][:trace_middleware]
+    ::AppPerfRpm.logger.info "Initializing rack-middleware tracer."
+  end
+
+  module AppPerfRpm
+    module Instruments
+      class Rack
+        include AppPerfRpm::Instruments::RackModule
+
+        def initialize(app)
+          @app = app
+        end
+      end
+    end
+  end
+
+  module ActionDispatch
+    class MiddlewareStack
+      class AppPerfRack
+        include AppPerfRpm::Instruments::RackModule
+
+        def initialize(app)
+          @app = app
+        end
+      end
+
+      class Middleware
+        def build(app)
+          AppPerfRack.new(klass.new(app, *args, &block))
+        end
       end
 
-      def ignore_path?(path)
-        path.to_s =~ /\/assets/
+      def build(app = nil, &block)
+        app ||= block
+        raise "AppPerfRack#build requires an app" unless app
+        middlewares.reverse.inject(AppPerfRack.new(app)) {|a, e| e.build(a)}
       end
     end
   end

data/lib/app_perf_rpm/rails.rb

@@ -6,8 +6,6 @@ if defined?(::Rails)
       unless AppPerfRpm.disable_agent?
         AppPerfRpm.load
         Rails.configuration.middleware.use AppPerfRpm::Middleware
-        AppPerfRpm.logger.info "Initializing rack middleware tracer."
-        Rails.configuration.middleware.insert 0, AppPerfRpm::Instruments::Rack
       end
     end
   end

data/lib/app_perf_rpm/railtie.rb

@@ -1,22 +1,10 @@
 module AppPerfRpm
   class Railtie < ::Rails::Railtie
-    require 'app_perf_rpm/instruments/rack'
-
     # TODO: Why this isn't working with the initializer?
     initializer "app_perf.initialize" do |app|
       unless AppPerfRpm.disable_agent?
+        require 'app_perf_rpm/instruments/rack'
         app.middleware.use AppPerfRpm::Middleware
-
-        if ::AppPerfRpm.configuration.instrumentation[:rack][:enabled]
-          AppPerfRpm.logger.info "Initializing rack tracer."
-          app.middleware.insert 0, AppPerfRpm::Instruments::Rack
-
-          if AppPerfRpm.configuration.instrumentation[:rack][:trace_middleware]
-            AppPerfRpm.logger.info "Initializing rack middleware tracer."
-            require 'app_perf_rpm/instruments/rack_middleware'
-            app.middleware.insert 1, AppPerfRpm::Instruments::RackMiddleware
-          end
-        end
       end
 
       config.after_initialize do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_perf_rpm
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Randy Girard
@@ -103,7 +103,6 @@ files:
 - lib/app_perf_rpm/instruments/faraday.rb
 - lib/app_perf_rpm/instruments/net_http.rb
 - lib/app_perf_rpm/instruments/rack.rb
-- lib/app_perf_rpm/instruments/rack_middleware.rb
 - lib/app_perf_rpm/instruments/redis.rb
 - lib/app_perf_rpm/instruments/sequel.rb
 - lib/app_perf_rpm/instruments/sidekiq.rb

data/lib/app_perf_rpm/instruments/rack_middleware.rb

@@ -1,69 +0,0 @@
-module AppPerfRpm
-  module Instruments
-    class RackMiddleware
-      attr_reader :app
-
-      def initialize(app)
-        @app = app
-        self.extend(AppPerfRpmRack)
-      end
-
-      def call(env)
-        @app.call(env)
-      end
-
-      module AppPerfRpmRack
-        def self.extended(object)
-          object.singleton_class.class_eval do
-            alias_method :call_without_tracing, :call
-            alias_method :call, :call_with_tracing
-            public :call
-          end
-
-          object.instance_eval do
-            recursive_app_perf
-          end
-        end
-
-        private
-
-        def recursive_app_perf
-          return if @app.nil?
-          return unless @app.respond_to?(:call)
-          @app.extend(AppPerfRpmRack)
-        end
-
-        def call_with_tracing(env)
-          req = ::Rack::Request.new(env)
-
-          incoming_trace = env["HTTP_X_APP_PERF_TRACE"]
-          incoming_trace_id = env["HTTP_X_APP_PERF_TRACE_ID"]
-
-          opts = {}
-          if incoming_trace.to_s.eql?("1")
-            opts.merge!("trace_id" => incoming_trace_id)
-          end
-
-          if !::AppPerfRpm::Tracer.tracing? || ignore_path?(req.path)
-            @status, @headers, @response = @app.call_without_tracing(env)
-          else
-            AppPerfRpm::Tracer.trace("rack-middleware", opts) do |span|
-              span.type = "web"
-              span.domain = req.host
-              span.url = req.path
-              span.options["class"] = self.class.name
-
-              @status, @headers, @response = @app.call_without_tracing(env)
-            end
-          end
-
-          [@status, @headers, @response]
-        end
-
-        def ignore_path?(path)
-          path.to_s =~ /\/assets/
-        end
-      end
-    end
-  end
-end