timber 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c9b324e70feb9ff1373222ba8a5f713a7c3137a
-  data.tar.gz: 73ec3459c15d1a9438f762c9aec975eefd1e2852
+  metadata.gz: cbe987d8fbffcd959912acd47bdca88392cb6639
+  data.tar.gz: 80f5e3d9615a6a1d31f0bf29708a9f14b32f4698
 SHA512:
-  metadata.gz: ac167d0a6d8ae1f7968d3df367203d75df9405f26dd89d6d4bb6a0641182f45d6290c771f187099f6858633f593bac5d49da086fc1b35b4028745c377385ae98
-  data.tar.gz: 9b6d80aae0f5f44c821ea73f00ff9418e2656b52d007840c292f189182b4480e6b9907beae8bf365ace3d255f68494ac36668a84a9d40ab34f17ca51fa2ed302
+  metadata.gz: 46c5cf19a12a27e92a8891b340af164429e6983343cfcd2dfb013ebfc167dd714863874ece6350619a7c58a6253cf44059b8d903249ffb35419b5b3d6b027523
+  data.tar.gz: 4f8e29cef3c8337df09f6c05541a67f00f89312eedccc667c692bf0afb7d6d08b9578e361346a336e343c270f25403214f07c7f2ce226e3b2f1bdb6e3195b295

data/lib/timber/events/http_server_request.rb

@@ -4,9 +4,9 @@ module Timber
     #
     # @note This event should be installed automatically through probes,
     #   such as the {Probes::ActionControllerLogSubscriber} probe.
-    class HTTPRequest < Timber::Event
+    class HTTPServerRequest < Timber::Event
       attr_reader :host, :method, :path, :port, :query_params, :content_type,
-        :remote_addr, :referrer, :request_id, :user_agent
+        :remote_addr, :referrer, :request_id, :scheme, :user_agent
 
       def initialize(attributes)
         @host = attributes[:host] || raise(ArgumentError.new(":host is required"))
@@ -18,13 +18,14 @@ module Timber
         @remote_addr = attributes[:remote_addr]
         @referrer = attributes[:referrer]
         @request_id = attributes[:request_id]
+        @scheme = attributes[:scheme] || raise(ArgumentError.new(":scheme is required"))
         @user_agent = attributes[:user_agent]
       end
 
       def to_hash
         {host: host, method: method, path: path, port: port, query_params: query_params,
           headers: {content_type: content_type, remote_addr: remote_addr, referrer: referrer,
-            request_id: request_id, user_agent: user_agent}}
+            request_id: request_id, scheme: scheme, user_agent: user_agent}}
       end
       alias to_h to_hash
 

data/lib/timber/events/http_server_response.rb

@@ -4,7 +4,7 @@ module Timber
     #
     # @note This event should be installed automatically through probes,
     #   such as the {Probes::ActionControllerLogSubscriber} probe.
-    class HTTPResponse < Timber::Event
+    class HTTPServerResponse < Timber::Event
       attr_reader :status, :time_ms, :additions
 
       def initialize(attributes)

data/lib/timber/probes/action_controller_log_subscriber/log_subscriber.rb

@@ -33,7 +33,7 @@ module Timber
               status = extract_status(exception_class_name)
             end
 
-            Events::HTTPResponse.new(
+            Events::HTTPServerResponse.new(
               status: status,
               time_ms: event.duration,
               additions: additions

data/lib/timber/probes/rails_rack_logger.rb

@@ -23,7 +23,7 @@ module Timber
               def http_request_event(request)
                 # No idea why rails 3.X returns a "/" :/
                 referrer = request.referer == "/" ? nil : request.referer
-                Events::HTTPRequest.new(
+                Events::HTTPServerRequest.new(
                   host: request.host,
                   method: request.request_method,
                   path: request.filtered_path,
@@ -33,6 +33,7 @@ module Timber
                   remote_addr: request.ip,
                   referrer: referrer,
                   request_id: request_id(request.env),
+                  scheme: request.scheme,
                   user_agent: request.user_agent
                 )
               end

data/lib/timber/version.rb

@@ -1,3 +1,3 @@
 module Timber
-  VERSION = "1.1.8"
+  VERSION = "1.1.9"
 end

data/spec/support/rails.rb

@@ -2,7 +2,7 @@ require "rails"
 
 # Defualt the rails logger to nothing, each test shoould be
 # responsible for setting up the logger
-logger = ::Logger.new(STDOUT)
+logger = ::Logger.new(nil) # change to STDOUT to see rails logs
 Rails.logger = logger
 
 class RailsApp < Rails::Application

data/spec/timber/probes/rails_rack_logger_spec.rb

@@ -39,7 +39,7 @@ describe Timber::Probes::RailsRackLogger do
         allow_any_instance_of(::Rails::Rack::Logger).to receive(:logger).and_return(logger)
         dispatch_rails_request("/rails_rack_logger")
         expect(io.string).to start_with("Started GET \"/rails_rack_logger\" for 123.456.789.10 @metadata {\"level\":\"info\",\"dt\":\"2016-09-01T12:00:00.000000Z\"")
-        expect(io.string).to include("\"event\":{\"server_side_app\":{\"http_server_request\":{\"host\":\"example.org\",\"method\":\"GET\",\"path\":\"/rails_rack_logger\",\"port\":80,\"headers\":{\"remote_addr\":\"123.456.789.10\",\"request_id\":\"unique-request-id-1234\"}}}")
+        expect(io.string).to include("\"event\":{\"server_side_app\":{\"http_server_request\":{\"host\":\"example.org\",\"method\":\"GET\",\"path\":\"/rails_rack_logger\",\"port\":80,\"headers\":{\"remote_addr\":\"123.456.789.10\",\"request_id\":\"unique-request-id-1234\",\"scheme\":\"http\"}}}")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timber
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Timber Technologies, Inc.