raygun-apm 1.1.14-x86_64-linux → 1.1.15.pre2-x86_64-linux

data/lib/raygun/apm/config.rb

@@ -1,106 +1,106 @@
-module Raygun
-  module Apm
-    class Config
-      LOGLEVELS = {
-        "None" => Tracer::LOG_NONE,
-        "Info" => Tracer::LOG_INFO,
-        "Warning" => Tracer::LOG_WARNING,
-        "Error" => Tracer::LOG_ERROR,
-        "Verbose" => Tracer::LOG_VERBOSE,
-        "Debug" => Tracer::LOG_DEBUG,
-        "Everything" => Tracer::LOG_EVERYTHING,
-        # ruby profiler specific
-        "Blacklist" => Tracer::LOG_BLACKLIST
-      }
-
-      ENVIRONMENTS = {
-        "development" => Tracer::ENV_DEVELOPMENT,
-        "production" => Tracer::ENV_PRODUCTION
-      }
-
-      DEFAULT_BLACKLIST_PATH_UNIX = "/usr/share/Raygun/Blacklist"
-      DEFAULT_BLACKLIST_PATH_WINDOWS = "C:\\ProgramData\\Raygun\\Blacklist"
-
-      attr_accessor :env
-      def initialize(env=ENV)
-        @env = env
-      end
-
-      def self.cast_to_boolean(x)
-        case x
-        when true, 'true', 'True', 1, '1' then true
-        else
-          false
-        end
-      end
-
-      def self.config_var(attr, opts={}, &blk)
-        define_method attr.downcase do
-          val = if x = env[attr]
-            if opts[:as] == Integer
-              Integer(x)
-            elsif opts[:as] == String
-              x.to_s
-            elsif opts[:as] == :boolean
-              self.class.cast_to_boolean(x)
-            end
-          else
-            opts[:default]
-          end
-          blk ? blk.call(val) : val
-        end
-      end
-
-      # Initial constants for ProtonAgentTail.exe
-      UDP_SINK_HOST = TCP_SINK_HOST = TCP_MANAGEMENT_HOST = '127.0.0.1'
-      UDP_SINK_MULTICAST_HOST = '239.100.15.215'
-      UDP_SINK_PORT = TCP_SINK_PORT = 2799
-      TCP_MANAGEMENT_PORT = 2790
-
-      ## Enumerate all PROTON_ constants
-      config_var 'PROTON_API_KEY', as: String, default: ''
-      config_var 'PROTON_DEBUG_LOGLEVEL', as: String, default: 'None'
-      config_var 'PROTON_USER_OVERRIDES_FILE', as: String
-      config_var 'PROTON_NETWORK_MODE', as: String, default: 'Udp'
-      config_var 'PROTON_FILE_IPC_FOLDER', as: String
-      config_var 'PROTON_USE_MULTICAST', as: String, default: 'False'
-      config_var 'PROTON_BATCH_IDLE_COUNTER', as: Integer, default: 500
-      ## New - Ruby profiler
-      config_var 'PROTON_UDP_HOST', as: String, default: UDP_SINK_HOST
-      config_var 'PROTON_UDP_PORT', as: Integer, default: UDP_SINK_PORT
-      config_var 'PROTON_TCP_HOST', as: String, default: TCP_SINK_HOST
-      config_var 'PROTON_TCP_PORT', as: Integer, default: TCP_SINK_PORT
-      ## Conditional hooks
-      config_var 'PROTON_HOOK_REDIS', as: :boolean, default: 'True'
-      config_var 'PROTON_HOOK_INTERNALS', as: :boolean, default: 'True'
-
-      def proton_udp_host
-        if proton_use_multicast == 'True'
-          UDP_SINK_MULTICAST_HOST
-        else
-          env['PROTON_UDP_HOST'] ? env['PROTON_UDP_HOST'].to_s : UDP_SINK_HOST
-        end
-      end
-
-      def proton_tcp_host
-        env['PROTON_TCP_HOST'] ? env['PROTON_TCP_HOST'].to_s : TCP_SINK_HOST
-      end
-
-      def loglevel
-        LOGLEVELS[proton_debug_loglevel] || raise(ArgumentError, "invalid log level")
-      end
-
-      def environment
-        environment = env['RACK_ENV'] || env['RAILS_ENV'] || 'production'
-        ENVIRONMENTS[environment] || Tracer::ENV_PRODUCTION
-      end
-
-      # Prefer what is set by PROTON_USER_OVERRIDES_FILE env
-      def blacklist_file
-        return proton_user_overrides_file if proton_user_overrides_file
-        path = Gem.win_platform? ? DEFAULT_BLACKLIST_PATH_WINDOWS : DEFAULT_BLACKLIST_PATH_UNIX
-        "#{File.join(path, proton_api_key)}.txt"
-      end
-    end
-  end
-end
+module Raygun
+  module Apm
+    class Config
+      LOGLEVELS = {
+        "None" => Tracer::LOG_NONE,
+        "Info" => Tracer::LOG_INFO,
+        "Warning" => Tracer::LOG_WARNING,
+        "Error" => Tracer::LOG_ERROR,
+        "Verbose" => Tracer::LOG_VERBOSE,
+        "Debug" => Tracer::LOG_DEBUG,
+        "Everything" => Tracer::LOG_EVERYTHING,
+        # ruby profiler specific
+        "Blacklist" => Tracer::LOG_BLACKLIST
+      }
+
+      ENVIRONMENTS = {
+        "development" => Tracer::ENV_DEVELOPMENT,
+        "production" => Tracer::ENV_PRODUCTION
+      }
+
+      DEFAULT_BLACKLIST_PATH_UNIX = "/usr/share/Raygun/Blacklist"
+      DEFAULT_BLACKLIST_PATH_WINDOWS = "C:\\ProgramData\\Raygun\\Blacklist"
+
+      attr_accessor :env
+      def initialize(env=ENV)
+        @env = env
+      end
+
+      def self.cast_to_boolean(x)
+        case x
+        when true, 'true', 'True', 1, '1' then true
+        else
+          false
+        end
+      end
+
+      def self.config_var(attr, opts={}, &blk)
+        define_method attr.downcase do
+          val = if x = env[attr]
+            if opts[:as] == Integer
+              Integer(x)
+            elsif opts[:as] == String
+              x.to_s
+            elsif opts[:as] == :boolean
+              self.class.cast_to_boolean(x)
+            end
+          else
+            opts[:default]
+          end
+          blk ? blk.call(val) : val
+        end
+      end
+
+      # Initial constants for ProtonAgentTail.exe
+      UDP_SINK_HOST = TCP_SINK_HOST = TCP_MANAGEMENT_HOST = '127.0.0.1'
+      UDP_SINK_MULTICAST_HOST = '239.100.15.215'
+      UDP_SINK_PORT = TCP_SINK_PORT = 2799
+      TCP_MANAGEMENT_PORT = 2790
+
+      ## Enumerate all PROTON_ constants
+      config_var 'PROTON_API_KEY', as: String, default: ''
+      config_var 'PROTON_DEBUG_LOGLEVEL', as: String, default: 'None'
+      config_var 'PROTON_USER_OVERRIDES_FILE', as: String
+      config_var 'PROTON_NETWORK_MODE', as: String, default: 'Udp'
+      config_var 'PROTON_FILE_IPC_FOLDER', as: String
+      config_var 'PROTON_USE_MULTICAST', as: String, default: 'False'
+      config_var 'PROTON_BATCH_IDLE_COUNTER', as: Integer, default: 500
+      ## New - Ruby profiler
+      config_var 'PROTON_UDP_HOST', as: String, default: UDP_SINK_HOST
+      config_var 'PROTON_UDP_PORT', as: Integer, default: UDP_SINK_PORT
+      config_var 'PROTON_TCP_HOST', as: String, default: TCP_SINK_HOST
+      config_var 'PROTON_TCP_PORT', as: Integer, default: TCP_SINK_PORT
+      ## Conditional hooks
+      config_var 'PROTON_HOOK_REDIS', as: :boolean, default: 'True'
+      config_var 'PROTON_HOOK_INTERNALS', as: :boolean, default: 'True'
+
+      def proton_udp_host
+        if proton_use_multicast == 'True'
+          UDP_SINK_MULTICAST_HOST
+        else
+          env['PROTON_UDP_HOST'] ? env['PROTON_UDP_HOST'].to_s : UDP_SINK_HOST
+        end
+      end
+
+      def proton_tcp_host
+        env['PROTON_TCP_HOST'] ? env['PROTON_TCP_HOST'].to_s : TCP_SINK_HOST
+      end
+
+      def loglevel
+        LOGLEVELS[proton_debug_loglevel] || raise(ArgumentError, "invalid log level")
+      end
+
+      def environment
+        environment = env['RACK_ENV'] || env['RAILS_ENV'] || 'production'
+        ENVIRONMENTS[environment] || Tracer::ENV_PRODUCTION
+      end
+
+      # Prefer what is set by PROTON_USER_OVERRIDES_FILE env
+      def blacklist_file
+        return proton_user_overrides_file if proton_user_overrides_file
+        path = Gem.win_platform? ? DEFAULT_BLACKLIST_PATH_WINDOWS : DEFAULT_BLACKLIST_PATH_UNIX
+        "#{File.join(path, proton_api_key)}.txt"
+      end
+    end
+  end
+end

data/lib/raygun/apm/diagnostics.rb

@@ -1,54 +1,54 @@
-require "socket"
-require "json"
-
-module Raygun
-  module Apm
-    class Diagnostics
-      AGENT_STATE_DOWN = "\nThe Raygun APM Agent appears to not be running on the current host.\nIf not already installed, please consult https://raygun.com/documentation/product-guides/apm/agent/downloads/\nOtherwise refer to https://raygun.com/documentation/product-guides/apm/agent/installation/ for starting the Agent."
-      AGENT_STATE_UNKNOWN = "\nThe Raygun APM Agent is reachable, but Unable to determine the state of the Agent at the moment."
-      AGENT_STATE_UP_MISCONFIGURED = "\nThe Raygun APM Agent is running, but misconfigured.\nThe API Key needs to be set through the Raygun_ApiKey environment variable.\nThe API key can be found under 'Application Settings' in the Raygun UI"
-      AGENT_STATE_UP_CONFIGURED = "\nThe Raygun APM Agent is configured properly!"
-      AGENT_MINIMUM_VERSION_NOT_MET = "\nVersion #{Raygun::Apm::VERSION} of the Raygun APM Profiler requires a minimum Agent version #{Raygun::Apm::MINIMUM_AGENT_VERSION}\nPlease download the latest Agent from https://raygun.com/documentation/product-guides/apm/agent/downloads/"
-      PROFILER_NOOPED = "Profiler loaded in noop mode and will be disabled due to the minimum Agent version not met"
-
-      def initialize(host: Apm::Config::TCP_MANAGEMENT_HOST, port: Apm::Config::TCP_MANAGEMENT_PORT)
-        @host = host
-        @port = port
-      end
-
-      def verify_agent(tracer)
-        socket.write "GetAgentInfo"
-        response = JSON.parse(socket.gets)
-        if minimum_agent_version_not_met?(response['Version'])
-          puts AGENT_MINIMUM_VERSION_NOT_MET
-          tracer.noop!
-          puts PROFILER_NOOPED
-        else
-          if response['Status'] == 1
-            puts AGENT_STATE_UP_CONFIGURED
-          elsif response['Status'] == 0
-            puts AGENT_STATE_UP_MISCONFIGURED
-          end
-        end
-      rescue Errno::ECONNREFUSED
-        puts AGENT_STATE_DOWN
-      rescue
-        puts AGENT_STATE_UNKNOWN
-      end
-
-      private
-      def socket
-        @socket ||= s = TCPSocket.new(@host, @port)
-      end
-
-      def minimum_agent_version_not_met?(version)
-        # Legacy path
-        if String === version
-          version < Raygun::Apm::MINIMUM_AGENT_VERSION
-        else
-          "#{version['Major']}.#{version['Minor']}.#{version['Build']}.#{version['Revision']}" < Raygun::Apm::MINIMUM_AGENT_VERSION
-        end
-      end
-    end
-  end
-end
+require "socket"
+require "json"
+
+module Raygun
+  module Apm
+    class Diagnostics
+      AGENT_STATE_DOWN = "\nThe Raygun APM Agent appears to not be running on the current host.\nIf not already installed, please consult https://raygun.com/documentation/product-guides/apm/agent/downloads/\nOtherwise refer to https://raygun.com/documentation/product-guides/apm/agent/installation/ for starting the Agent."
+      AGENT_STATE_UNKNOWN = "\nThe Raygun APM Agent is reachable, but Unable to determine the state of the Agent at the moment."
+      AGENT_STATE_UP_MISCONFIGURED = "\nThe Raygun APM Agent is running, but misconfigured.\nThe API Key needs to be set through the Raygun_ApiKey environment variable.\nThe API key can be found under 'Application Settings' in the Raygun UI"
+      AGENT_STATE_UP_CONFIGURED = "\nThe Raygun APM Agent is configured properly!"
+      AGENT_MINIMUM_VERSION_NOT_MET = "\nVersion #{Raygun::Apm::VERSION} of the Raygun APM Profiler requires a minimum Agent version #{Raygun::Apm::MINIMUM_AGENT_VERSION}\nPlease download the latest Agent from https://raygun.com/documentation/product-guides/apm/agent/downloads/"
+      PROFILER_NOOPED = "Profiler loaded in noop mode and will be disabled due to the minimum Agent version not met"
+
+      def initialize(host: Apm::Config::TCP_MANAGEMENT_HOST, port: Apm::Config::TCP_MANAGEMENT_PORT)
+        @host = host
+        @port = port
+      end
+
+      def verify_agent(tracer)
+        socket.write "GetAgentInfo"
+        response = JSON.parse(socket.gets)
+        if minimum_agent_version_not_met?(response['Version'])
+          puts AGENT_MINIMUM_VERSION_NOT_MET
+          tracer.noop!
+          puts PROFILER_NOOPED
+        else
+          if response['Status'] == 1
+            puts AGENT_STATE_UP_CONFIGURED
+          elsif response['Status'] == 0
+            puts AGENT_STATE_UP_MISCONFIGURED
+          end
+        end
+      rescue Errno::ECONNREFUSED
+        puts AGENT_STATE_DOWN
+      rescue
+        puts AGENT_STATE_UNKNOWN
+      end
+
+      private
+      def socket
+        @socket ||= s = TCPSocket.new(@host, @port)
+      end
+
+      def minimum_agent_version_not_met?(version)
+        # Legacy path
+        if String === version
+          version < Raygun::Apm::MINIMUM_AGENT_VERSION
+        else
+          "#{version['Major']}.#{version['Minor']}.#{version['Build']}.#{version['Revision']}" < Raygun::Apm::MINIMUM_AGENT_VERSION
+        end
+      end
+    end
+  end
+end

data/lib/raygun/apm/event.rb

@@ -1,49 +1,49 @@
-module Raygun
-  module Apm
-    class Event
-      def inspect
-        "#<#{self.class.name}:#{self.object_id}> length:#{self.length} pid:#{self[:pid]} tid:#{self[:tid]} timestamp:#{self[:timestamp]}"
-      end
-      class ExceptionThrown < Event
-        def inspect
-          super + " class:#{self[:class_name]}"
-        end
-      end
-      class ThreadStarted < Event
-        def inspect
-          super + " parent_tid:#{self[:parent_tid]}"
-        end
-      end
-      class Begin < Event
-        def inspect
-          super + " function_id:#{self[:function_id]} instance_id:#{self[:instance_id]}"
-        end
-      end
-      class End < Event
-        def inspect
-          super + " function_id:#{self[:function_id]}"
-        end
-      end
-      class Methodinfo < Event
-        def inspect
-          super + " function_id:#{self[:function_id]} class_name:#{self[:class_name]} method_name:#{self[:method_name]} method_source:#{self[:method_source]}"
-        end
-      end
-      class HttpOut < Event
-        def inspect
-          super + " url:#{self[:url]} verb:#{self[:verb]} status:#{self[:status]} duration:#{self[:duration]}"
-        end
-      end
-      class Sql < Event
-        def inspect
-          super + " provider:#{self[:provider]} host:#{self[:host]} query:#{self[:query]} database:#{self[:database]} duration:#{self[:duration]}"
-        end
-      end
-      class BeginTransaction < Event
-        def inspect
-          super + " api_key:#{self[:api_key]} technology_type:#{self[:technology_type]} process_type:#{self[:process_type]}"
-        end
-      end
-    end
-  end
+module Raygun
+  module Apm
+    class Event
+      def inspect
+        "#<#{self.class.name}:#{self.object_id}> length:#{self.length} pid:#{self[:pid]} tid:#{self[:tid]} timestamp:#{self[:timestamp]}"
+      end
+      class ExceptionThrown < Event
+        def inspect
+          super + " class:#{self[:class_name]}"
+        end
+      end
+      class ThreadStarted < Event
+        def inspect
+          super + " parent_tid:#{self[:parent_tid]}"
+        end
+      end
+      class Begin < Event
+        def inspect
+          super + " function_id:#{self[:function_id]} instance_id:#{self[:instance_id]}"
+        end
+      end
+      class End < Event
+        def inspect
+          super + " function_id:#{self[:function_id]}"
+        end
+      end
+      class Methodinfo < Event
+        def inspect
+          super + " function_id:#{self[:function_id]} class_name:#{self[:class_name]} method_name:#{self[:method_name]} method_source:#{self[:method_source]}"
+        end
+      end
+      class HttpOut < Event
+        def inspect
+          super + " url:#{self[:url]} verb:#{self[:verb]} status:#{self[:status]} duration:#{self[:duration]}"
+        end
+      end
+      class Sql < Event
+        def inspect
+          super + " provider:#{self[:provider]} host:#{self[:host]} query:#{self[:query]} database:#{self[:database]} duration:#{self[:duration]}"
+        end
+      end
+      class BeginTransaction < Event
+        def inspect
+          super + " api_key:#{self[:api_key]} technology_type:#{self[:technology_type]} process_type:#{self[:process_type]}"
+        end
+      end
+    end
+  end
 end

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

@@ -1,36 +1,36 @@
-require 'excon'
-
-module Raygun
-  module Apm
-    module Hooks
-      module Excon
-        def request(params={}, &block)
-          if tracer = Raygun::Apm::Tracer.instance
-            started = tracer.now
-            response = super
-            ended = tracer.now
-            event = raygun_apm_http_out_event
-            event[:pid] = Process.pid
-            event[:url] = "#{@data[:scheme]}://#{@data[:host]}/#{params[:path]}"
-            event[:verb] = params[:method].to_s.upcase
-            event[:status] = response.status
-            event[:duration] = ended - started
-            event[:timestamp] = started
-            event[:tid] = tracer.get_thread_id(Thread.current)
-            tracer.emit(event)
-            response
-          else
-            super
-          end
-        end
-
-        private
-        def raygun_apm_http_out_event
-          @_raygun_apm_http_out_event ||= Raygun::Apm::Event::HttpOut.new
-        end
-      end
-    end
-  end
-end
-
-Raygun::Apm::Tracer.patch(Excon::Connection, Raygun::Apm::Hooks::Excon)
+require 'excon'
+
+module Raygun
+  module Apm
+    module Hooks
+      module Excon
+        def request(params={}, &block)
+          if tracer = Raygun::Apm::Tracer.instance
+            started = tracer.now
+            response = super
+            ended = tracer.now
+            event = raygun_apm_http_out_event
+            event[:pid] = Process.pid
+            event[:url] = "#{@data[:scheme]}://#{@data[:host]}/#{params[:path]}"
+            event[:verb] = params[:method].to_s.upcase
+            event[:status] = response.status
+            event[:duration] = ended - started
+            event[:timestamp] = started
+            event[:tid] = tracer.get_thread_id(Thread.current)
+            tracer.emit(event)
+            response
+          else
+            super
+          end
+        end
+
+        private
+        def raygun_apm_http_out_event
+          @_raygun_apm_http_out_event ||= Raygun::Apm::Event::HttpOut.new
+        end
+      end
+    end
+  end
+end
+
+Raygun::Apm::Tracer.patch(Excon::Connection, Raygun::Apm::Hooks::Excon)

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

@@ -1,43 +1,43 @@
-require 'httpclient'
-
-module Raygun
-  module Apm
-    module Hooks
-      module HTTPClient
-        private
-
-        def do_request(method, uri, query, body, header, &filtered_block)
-          if tracer = Raygun::Apm::Tracer.instance
-            started = tracer.now
-            response = super
-            ended = tracer.now
-            event = raygun_apm_http_out_event
-            event[:pid] = Process.pid
-            event[:url] = raygun_apm_url(uri, query)
-            event[:verb] = method.to_s.upcase
-            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_url(uri, query)
-          uri = uri.to_param if uri.respond_to?(:to_param)
-          query = query.to_param if query.respond_to?(:to_param)
-          query && uri ? URI.join(uri, query).to_s : uri.to_s
-        end
-
-        def raygun_apm_http_out_event
-          @_raygun_apm_http_out_event ||= Raygun::Apm::Event::HttpOut.new
-        end
-      end
-    end
-  end
-end
-
-Raygun::Apm::Tracer.patch(HTTPClient, Raygun::Apm::Hooks::HTTPClient)
+require 'httpclient'
+
+module Raygun
+  module Apm
+    module Hooks
+      module HTTPClient
+        private
+
+        def do_request(method, uri, query, body, header, &filtered_block)
+          if tracer = Raygun::Apm::Tracer.instance
+            started = tracer.now
+            response = super
+            ended = tracer.now
+            event = raygun_apm_http_out_event
+            event[:pid] = Process.pid
+            event[:url] = raygun_apm_url(uri, query)
+            event[:verb] = method.to_s.upcase
+            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_url(uri, query)
+          uri = uri.to_param if uri.respond_to?(:to_param)
+          query = query.to_param if query.respond_to?(:to_param)
+          query && uri ? URI.join(uri, query).to_s : uri.to_s
+        end
+
+        def raygun_apm_http_out_event
+          @_raygun_apm_http_out_event ||= Raygun::Apm::Event::HttpOut.new
+        end
+      end
+    end
+  end
+end
+
+Raygun::Apm::Tracer.patch(HTTPClient, Raygun::Apm::Hooks::HTTPClient)