timber 2.0.17 → 2.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1cbf6e1fada619873ed59f75deef55f365a3dae
-  data.tar.gz: 38abf4a05950039c65fc11c4ba52f803fed71085
+  metadata.gz: 2e4d4e220779ebe8ea442c98c2f03f36cf12f438
+  data.tar.gz: e995c553745a8839d306eea480d359063a779b9c
 SHA512:
-  metadata.gz: b9457963527f193130bbe8262b62d40ee0b3f917fe4c61a4e18cf2c1a3b733cc8187ab4dbaf5792080c078e7184472a744ec7190510ee875ee6bc51ba5c64008
-  data.tar.gz: 47e70a59700fcd56171f3b38e6996cbd6d7a0e5b28feaf8baae530206a114823e1ff84dfd7ed58c10f4f37ec542e679093e8aae75c3c9a13588ae207001864cf
+  metadata.gz: ca96f8e714fef59f4a14155b0376094928171636f2ca4cbb372ef928112d5e4c9c1f4be40c2cb856f94568d4139066e95d4544380fa043540c831a138f06a5d0
+  data.tar.gz: 41e76ccddb69c9961330560d78c9d82d941e2af0ad91e6e506ae99628147ea3ff96f43c9979299fdaa84b3638adaf88512e1e1532f11c7b33aae8a5287853031

data/lib/timber/events/controller_call.rb

@@ -24,7 +24,7 @@ module Timber
       alias to_h to_hash
 
       def as_json(_options = {})
-        {:server_side_app => {:controller_call => to_hash}}
+        {:controller_call => to_hash}
       end
 
       def message

data/lib/timber/events/exception.rb

@@ -26,7 +26,7 @@ module Timber
       alias to_h to_hash
 
       def as_json(_options = {})
-        {:server_side_app => {:exception => to_hash}}
+        {:exception => to_hash}
       end
 
       def message

data/lib/timber/events/http_client_request.rb

@@ -31,7 +31,7 @@ module Timber
       alias to_h to_hash
 
       def as_json(_options = {})
-        {:server_side_app => {:http_client_request => to_hash}}
+        {:http_client_request => to_hash}
       end
 
       def message

data/lib/timber/events/http_client_response.rb

@@ -26,7 +26,7 @@ module Timber
       alias to_h to_hash
 
       def as_json(_options = {})
-        {:server_side_app => {:http_client_response => to_hash}}
+        {:http_client_response => to_hash}
       end
 
       def message

data/lib/timber/events/http_server_request.rb

@@ -27,7 +27,7 @@ module Timber
       alias to_h to_hash
 
       def as_json(_options = {})
-        {:server_side_app => {:http_server_request => to_hash}}
+        {:http_server_request => to_hash}
       end
 
       def message

data/lib/timber/events/http_server_response.rb

@@ -22,7 +22,7 @@ module Timber
       alias to_h to_hash
 
       def as_json(_options = {})
-        {:server_side_app => {:http_server_response => to_hash}}
+        {:http_server_response => to_hash}
       end
 
       def message

data/lib/timber/events/sql_query.rb

@@ -20,7 +20,7 @@ module Timber
       alias to_h to_hash
 
       def as_json(_options = {})
-        {:server_side_app => {:sql_query => to_hash}}
+        {:sql_query => to_hash}
       end
     end
   end

data/lib/timber/events/template_render.rb

@@ -20,7 +20,7 @@ module Timber
       alias to_h to_hash
 
       def as_json(_options = {})
-        {:server_side_app => {:template_render => to_hash}}
+        {:template_render => to_hash}
       end
     end
   end

data/lib/timber/integrations/active_record/log_subscriber.rb

@@ -7,7 +7,6 @@ module Timber
       # @private
       class LogSubscriber < Integrator
         def initialize
-          require "active_record/log_subscriber"
           require "timber/integrations/active_record/log_subscriber/timber_log_subscriber"
         rescue LoadError => e
           raise RequirementNotMetError.new(e.message)

data/lib/timber/integrations/active_record/log_subscriber/timber_log_subscriber.rb

@@ -1,3 +1,9 @@
+# We require all of ActiveRecord because #logger usses ActiveRecord::Base.
+# We can't require active_record/base directly because ActiveRecord does not require
+# files properly.
+require "active_record"
+require "active_record/log_subscriber"
+
 module Timber
   module Integrations
     module ActiveRecord

data/lib/timber/log_entry.rb

@@ -5,7 +5,7 @@ module Timber
   # `Logger` and the log device that you set it up with.
   class LogEntry #:nodoc:
     DT_PRECISION = 6.freeze
-    SCHEMA = "https://raw.githubusercontent.com/timberio/log-event-json-schema/1.2.21/schema.json".freeze
+    SCHEMA = "https://raw.githubusercontent.com/timberio/log-event-json-schema/2.0.1/schema.json".freeze
 
     attr_reader :context_snapshot, :event, :level, :message, :progname, :tags, :time, :time_ms
 

data/lib/timber/version.rb

@@ -1,3 +1,3 @@
 module Timber
-  VERSION = "2.0.17"
+  VERSION = "2.0.19"
 end

data/spec/timber/integrations/action_controller/log_subscriber_spec.rb

@@ -43,7 +43,7 @@ if defined?(::ActionController)
         lines = clean_lines(io.string.split("\n"))
         expect(lines.length).to eq(3)
         expect(lines[1]).to start_with('Processing by LogSubscriberController#index as HTML\n  Parameters: {"query"=>"value"} @metadata {"level":"info","dt":"2016-09-01T12:00:00.000000Z"')
-        expect(lines[1]).to include('"event":{"server_side_app":{"controller_call":{"controller":"LogSubscriberController","action":"index","params_json":"{\"query\":\"value\"}"}}}')
+        expect(lines[1]).to include('"event":{"controller_call":{"controller":"LogSubscriberController","action":"index","params_json":"{\"query\":\"value\"}"}}')
       end
 
       # Remove blank lines since Rails does this to space out requests in the logs

data/spec/timber/integrations/action_dispatch/debug_exceptions_spec.rb

@@ -41,7 +41,7 @@ if defined?(::ActionDispatch)
         lines = clean_lines(io.string.split("\n"))
         expect(lines.length).to eq(3)
         expect(lines[2]).to start_with('RuntimeError (boom) @metadata {"level":"fatal",')
-        expect(lines[2]).to include("\"event\":{\"server_side_app\":{\"exception\":{\"name\":\"RuntimeError\",\"message\":\"boom\",\"backtrace\":[")
+        expect(lines[2]).to include("\"event\":{\"exception\":{\"name\":\"RuntimeError\",\"message\":\"boom\",\"backtrace\":[")
       end
 
       # Remove blank lines since Rails does this to space out requests in the logs

data/spec/timber/integrations/action_view/log_subscriber_spec.rb

@@ -53,7 +53,7 @@ if defined?(::ActionView)
             dispatch_rails_request("/action_view_log_subscriber")
             lines = clean_lines(io.string.split("\n"))
             expect(lines[2].strip).to start_with("Rendered spec/support/rails/templates/template.html (0.0ms) @metadata {\"level\":\"info\"")
-            expect(lines[2]).to include("\"event\":{\"server_side_app\":{\"template_render\":{\"name\":\"spec/support/rails/templates/template.html\",\"time_ms\":0.0}}},")
+            expect(lines[2]).to include("\"event\":{\"template_render\":{\"name\":\"spec/support/rails/templates/template.html\",\"time_ms\":0.0}},")
           end
         end
       end

data/spec/timber/integrations/active_record/log_subscriber_spec.rb

@@ -38,7 +38,7 @@ if defined?(::ActiveRecord)
           expect(string).to include("select * from users")
           expect(string).to include("@metadata")
           expect(string).to include("\"level\":\"debug\"")
-          expect(string).to include("\"event\":{\"server_side_app\":{\"sql_query\"")
+          expect(string).to include("\"event\":{\"sql_query\"")
         end
       end
     end

data/spec/timber/logger_spec.rb

@@ -59,7 +59,7 @@ describe Timber::Logger, :rails_23 => true do
         message = Timber::Events::SQLQuery.new(sql: "select * from users", time_ms: 56, message: "select * from users")
         logger.info(message)
         expect(io.string).to start_with("select * from users @metadata {\"level\":\"info\",\"dt\":\"2016-09-01T12:00:00.000000Z\",")
-        expect(io.string).to include("\"event\":{\"server_side_app\":{\"sql_query\":{\"sql\":\"select * from users\",\"time_ms\":56.0}}}")
+        expect(io.string).to include("\"event\":{\"sql_query\":{\"sql\":\"select * from users\",\"time_ms\":56.0}}")
       end
 
       it "should allow :time_ms" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timber
 version: !ruby/object:Gem::Version
-  version: 2.0.17
+  version: 2.0.19
 platform: ruby
 authors:
 - Timber Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-23 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack