raygun-apm 0.0.24-universal-darwin → 0.0.25-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba6d477ea9e5a8e1f7755f207572eb71013d9fd649d0dbe46392bbf0cee21f9c
-  data.tar.gz: b26062f2d14781244e347cc927aacaf02d24081f1bb1d003634e2aad8cdb099e
+  metadata.gz: 8cbd4a4849aec64aaad3b41b0871d38f125fc09515cc98f81d1e7d0aebbef610
+  data.tar.gz: 20ea68ad7d939efdf2a5d07252d3a9c304d511c53558826781a369ca56656650
 SHA512:
-  metadata.gz: 39ec3f64fd40ff1116cee96c8636234a9262a426d3eb488421a086d14dc02648fd3e30b3aacac621335c0159685f4d8a0f2429d11b77ba771615a54c5772cef7
-  data.tar.gz: d0cd5be852006ed6989e4719d59b09d88d656ed7830595e72ad47cb3fe935b297a4d59b8c4f95ac326ae8a7a6f5849af49694d0affb80a1dc7ed089dc8c8636b
+  metadata.gz: 10a914762f1e0e88f2f72f633731ab600ab3e8111e2b531341dacc5247b3d3a708407f252e20c2e5d7d6bbf1a6a8e8a8aed27dfa4c9b1330a367bb047961ee81
+  data.tar.gz: 4ddb191526ebeafa89dadb4c29ecc18243a2269b40b7bf8b3e1ac1dc0c6ff5cbc349c7c332e9c6f20f0c4ec7e681e8f266451f635a5fe75722e9cbdb43c3e4b6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    raygun-apm (0.0.24)
+    raygun-apm (0.0.25)
 
 GEM
   remote: https://rubygems.org/
@@ -30,4 +30,4 @@ DEPENDENCIES
   raygun-apm!
 
 BUNDLED WITH
-   2.1.0
+   2.1.2

data/README.rdoc

@@ -75,7 +75,7 @@ Extended events can be sent where appropiate
   event = Raygun::Apm::Event::HttpIn.new
   event[:pid] = Process.pid
   event[:tid] = 0
-  event[:timestamp] = Time.now.to_f*1000000
+  event[:timestamp] = tracer.now
   event[:url] = 'https://google.com/'
   event[:verb] = 'GET'
   event[:status] = 200
@@ -87,7 +87,7 @@ Extended events can be sent where appropiate
   event = Raygun::Apm::Event::Sql.new
   event[:pid] = Process.pid
   event[:tid] = 0
-  event[:timestamp] = Time.now.to_f*1000000
+  event[:timestamp] = tracer.now
   event[:provider] = 'postgres'
   event[:host] = 'localhost'
   event[:database] = 'rails'

data/lib/raygun/apm/blacklist.rb

@@ -136,6 +136,9 @@ module Raygun
         Warning
         ZeroDivisionError
         IPAddr
+        Net::
+        OpenSSL
+        BasicSocket
       }
 
       def self.extend_with(list)

data/lib/raygun/apm/hooks/net_http.rb

@@ -0,0 +1,46 @@
+require 'net/http'
+
+module Raygun
+  module Apm
+    module Hooks
+      module Net
+        module HTTP
+          private
+
+          def transport_request(request)
+            if tracer = raygun_apm_tracer
+              started = tracer.now
+              response = super
+              ended = tracer.now
+              event = raygun_apm_http_out_event
+              event[:url] = request.uri.to_s
+              event[:verb] = request.method
+              event[:status] = response.code.to_i
+              event[:duration] = ended - started
+              event[:timestamp] = started
+              event[:tid] = tracer.get_thread_id(Thread.current)
+              tracer.emit(event)
+              response
+            else
+              super
+            end
+          end
+
+          def raygun_apm_http_out_event
+            @_raygun_apm_http_out_event ||= begin
+              event = Raygun::Apm::Event::HttpOut.new
+              event[:pid] = Process.pid
+              event
+            end
+          end
+
+          def raygun_apm_tracer
+            Thread.current.thread_variable_get(:_raygun_apm_tracer)
+          end
+        end
+      end
+    end
+  end
+end
+
+::Net::HTTP.prepend(Raygun::Apm::Hooks::Net::HTTP)

data/lib/raygun/apm/version.rb

@@ -1,5 +1,5 @@
 module Raygun
   module Apm
-    VERSION = "0.0.24"
+    VERSION = "0.0.25"
   end
 end

data/lib/raygun/apm.rb

@@ -11,6 +11,5 @@ require "raygun/apm/event"
 
 module Raygun
   module Apm
-    # Your code goes here...
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: universal-darwin
 authors:
 - Erkki Eilonen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2019-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source
@@ -127,7 +127,7 @@ files:
 - lib/raygun/apm/blacklist.rb
 - lib/raygun/apm/config.rb
 - lib/raygun/apm/event.rb
-- lib/raygun/apm/middleware.rb
+- lib/raygun/apm/hooks/net_http.rb
 - lib/raygun/apm/tracer.rb
 - lib/raygun/apm/version.rb
 - raygun-apm.gemspec

data/lib/raygun/apm/middleware.rb

@@ -1,104 +0,0 @@
-module Raygun
-  module Apm
-    class Middleware
-      def initialize(app)
-        @app = app
-        @tracer = Raygun::Apm::Tracer.new
-        @tracer.udp_sink!
-        @tracer.process_started
-        ObjectSpace.define_finalizer(self, self.class.finalize(@tracer))
-
-        @http_in_subscriber = ActiveSupport::Notifications.subscribe('process_action.action_controller') do |*args|
-          http_in_handler(args)
-        end
-        @sql_subscriber = ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
-          sql_handler(args)
-        end
-
-        # If any kamikaze errors on init, shutdown the tracer
-      rescue Raygun::Apm::FatalError => e
-        kamikaze_handler(e)
-      end
-
-      def call(env)
-        @status, @headers, @response = instrument(env)
-        [@status, @headers, @response]
-      end
-
-      def instrument(env)
-        res = nil
-        # Can be nil if we had a kamikaze error
-        @tracer.start_trace if @tracer
-        res = @app.call(env)
-        # Can be nil if we had a kamikaze error
-        @tracer.end_trace if @tracer
-        res
-      rescue Raygun::Apm::FatalError => e
-        kamikaze_handler(e)
-      end
-
-      def kamikaze_handler(exception)
-        warn "Raygun APM shutting down due to error - %s", e.message
-        # Kill extended event subcriptions
-        ActiveSupport::Notifications.unsubscribe(@http_in_subscriber)
-        ActiveSupport::Notifications.unsubscribe(@sql_subscriber)
-        # Shutdown the tracepoint if enabled to reduce any overhead and stall emission
-        @tracer.tracepoint.stop if @tracer.tracepoint.enabled?
-        # Let the GC clean up the sink thread through the finalizer below
-        @tracer = nil
-      end
-
-      def http_in_handler(args)
-        notification = ActiveSupport::Notifications::Event.new *args
-        if notification.payload[:exception]
-          # XXX notify?
-          return
-        end
-        req = Rack::Request.new notification.payload[:headers].env
-        event = Raygun::Apm::Event::HttpIn.new
-        event[:url] = req.url
-        event[:verb] = req.request_method
-        event[:status] = notification.payload[:status]
-        # XXX constant milliseconds to microseconds
-        event[:duration] = notification.duration * 1000
-        event[:timestamp] = notification.time.to_f*1000000
-        event[:pid] = Process.pid
-        event[:tid] = @tracer.get_thread_id(Thread.current)
-        @tracer.emit(event)
-      rescue => e
-        # XXX report
-      end
-
-      def sql_handler(args)
-        notification = ActiveSupport::Notifications::Event.new *args
-        connection = if notification.payload[:connection]
-          notification.payload[:connection]
-        else
-          ObjectSpace._id2ref(notification.payload[:connection_id])
-        end
-        event = Raygun::Apm::Event::Sql.new
-        event[:query] = notification.payload[:sql]
-
-        # XXX this is hacky
-        if config = connection.instance_variable_get('@config')
-          event[:provider] = config[:adapter]
-          event[:host] = config[:host]
-          event[:database] = config[:database]
-        end
-
-        # XXX constant milliseconds to microseconds
-        event[:duration] = notification.duration * 1000
-        event[:timestamp] = notification.time.to_f*1000000
-        event[:pid] = Process.pid
-        event[:tid] = @tracer.get_thread_id(Thread.current)
-        @tracer.emit(event)
-      rescue => e
-        # XXX report
-      end
-
-      def self.finalize(tracer)
-        proc {tracer.process_ended}
-      end
-    end
-  end
-end