timber 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66f219592e109d976752d4334d0daf0008327a4d
-  data.tar.gz: 95f2d9e28f713c6ebcd344860445235aa0799cdd
+  metadata.gz: 9e48b303535350b36a68d4af296da5a9ee1ddfe1
+  data.tar.gz: accd259a2827a8a466e5cb2aadfc93ac8d350cb9
 SHA512:
-  metadata.gz: ed74f610fdc2758631f621d95adbd7c925b8573a4f870747a4423420dfb0ea2fdd8951e94516972ad8ccc9023bfa94ad7df14479c00fbb35f8abf47a3880dcff
-  data.tar.gz: 80a086de1b57fca570db4508349f94d370dc850bab15e4ef090fe1c621580f9dab67d2fb503845f32432e42b657f9f0d8fee615d487809b057b7c826bf63b61f
+  metadata.gz: 2f4bf4cf69e07973acc22b59892bcb0b33c76af23de8023fa6fde65807752d7f2d5739ecbed720e0c344bf2c14eda2b994772ec0450fc36c40922d9681e65ea1
+  data.tar.gz: 5917a43860fe36328e1a5246596eca5124ce4a4ca589f41a7b1a3da529484c5b04fab5760f96e98d74f64e90a75b782b7188f2057aa6d2423705a9f03f151ed4

data/README.md

@@ -58,9 +58,8 @@ Into this:
 }
 ```
 
-Notice we include data that isn't in the log message directly. It does the same for
-`http requests`, `sql queries`, `exceptions`, `template renderings`, and any other event
-your framework logs.
+It does the same for `http requests`, `sql queries`, `exceptions`, `template renderings`,
+and any other event your framework logs.
 
 (for a full list see [`Timber::Events`](lib/timber/events))
 
@@ -69,19 +68,13 @@ your framework logs.
 
 Glad you asked! :)
 
-1. It's application aware and enriches your logs with data you can't get otherwise. This
-   entire process is fully managed for you.
+1. It's application aware and enriches your logs with data you can't get otherwise.
 2. It defines a shared schema across all of our libraries. Meaning your log data, across all
-   applications, will be normalized.
+   applications, is normalized.
 3. It does not alter the original log message, giving you the best of both worlds: human
    readable logs *and* rich structured events.
-4. It's completely transparent with absolutely no vendor lock-in or risk of code debt. Timber
-   adheres exactly to the `Logger` API. Meaning Timber can be installed and removed without
-   any reprocusion.
-
-What really makes Timber unique is that at the end of the day it's just good ol' loggin'.
-No special API, no proprietary data format, the data is accessible and owned by you.
-[Woo!](http://i.giphy.com/7JYWGKgwxga5i.gif)
+4. It's completely transparent with absolutely no vendor lock-in or risk of code debt. It
+   does not introduce a special API, it's just good ol' loggin'.
 
 
 ## Logging Custom Events
@@ -113,8 +106,6 @@ No mention of Timber anywhere!
 
 ## The Timber Console / Pricing
 
-Like my mother always said:
-
 > What good is structured log data if you can't search and visualize it?
 
 Enter [the Timber Console](https://timber.io). It's a modern, fast, and beautiful console for
@@ -182,14 +173,8 @@ No probs! Use it as normal, Timber will even pull out the tags and include them
 config.logger = ActiveSupport::TaggedLogging.new(Timber::Logger.new(STDOUT))
 ```
 
-**Warning**: Tags lack meaningful descriptions, they are a poor mans context. Not to worry though!
-Timber provides a simple system for adding custom context that you can optionally use. Checkout
-[the `Timber::CurrentContext` docs](lib/timber/current_context.rb) for examples.
-
 ---
 
-I leave you with one final thought:
-
 <p align="center" style="background: #140f2a;">
 <a href="http://github.com/timberio/timber-ruby"><img src="http://files.timber.io/images/ruby-library-readme-log-truth.png" height="947" /></a>
 </p>

data/lib/timber/log_devices/http.rb

@@ -8,7 +8,7 @@ module Timber
     #
     # See {#initialize} for options and more details.
     class HTTP
-      API_URI = URI.parse("https://logs.timber.io/frames")
+      API_URI = URI.parse(ENV["TIMBER_INGESTION_URL"] || "https://logs.timber.io/frames")
       CONTENT_TYPE = "application/x-timber-msgpack-frame-1".freeze
       CONNECTION_HEADER = "keep-alive".freeze
       USER_AGENT = "Timber Ruby Gem/#{Timber::VERSION}".freeze
@@ -16,6 +16,7 @@ module Timber
         https.use_ssl = true
         https.read_timeout = 30
         https.ssl_timeout = 10
+        # Ruby 1.9.X doesn't have this setting.
         if https.respond_to?(:keep_alive_timeout=)
           https.keep_alive_timeout = 60
         end
@@ -64,6 +65,15 @@ module Timber
         @delivery_interval_thread = Thread.new do
           loop do
             sleep(options[:delivery_frequency_seconds] || DELIVERY_FREQUENCY_SECONDS)
+
+            @last_messages_overflow_count = 0
+            messages_overflown_count = @buffer.messages_overflown_count
+            if messages_overflown_count >= @last_messages_overflow_count
+              difference = messages_overflown_count - @last_messages_overflow_count
+              @last_messages_overflow_count = messages_overflown_count
+              logger.warn("Timber HTTP buffer has overflown #{difference} times")
+            end
+
             buffer_for_delivery = @buffer.reserve
             if buffer_for_delivery
               deliver(buffer_for_delivery)
@@ -106,11 +116,13 @@ module Timber
               res = HTTPS.request(request)
               code = res.code.to_i
               if code < 200 || code >= 300
-                Config.instance.logger.debug("Timber HTTP delivery failed - #{res.code}: #{res.body}")
-                sleep((try_index + 1) * BACKOFF_RATE_SECONDS)
+                try = try_index + 1
+                logger.debug("Timber HTTP delivery failed, try #{try} - #{res.code}: #{res.body}")
+                sleep(try * BACKOFF_RATE_SECONDS)
               else
                 @buffer.remove(body)
-                Config.instance.logger.debug("Timber HTTP delivery successful - #{code}")
+                logger.debug("Timber HTTP delivery successful - #{code}")
+                logger.debug("Timber new buffer size - #{@buffer.total_bytesize}")
                 break # exit the loop
               end
             end
@@ -120,6 +132,10 @@ module Timber
         def authorization_payload
           @authorization_payload ||= "Basic #{Base64.strict_encode64(@api_key).chomp}"
         end
+
+        def logger
+          Config.instance.logger
+        end
     end
   end
 end

data/lib/timber/log_devices/http/triggered_buffer.rb

@@ -15,12 +15,15 @@ module Timber
         DEFAULT_PAYLOAD_LIMIT_BYTES = 5_000_000 # 5mb, the Timber API will not accept messages larger than this
         DEFAULT_LIMIT_BYTES = 50_000_000 # 50mb
 
+        attr_reader :messages_overflown_count
+
         def initialize(options = {})
           @buffers = []
           @monitor = Monitor.new
           @payload_limit_bytes = options[:payload_limit_bytes] || DEFAULT_PAYLOAD_LIMIT_BYTES
           @limit_bytes = options[:limit_bytes] || DEFAULT_LIMIT_BYTES
           @overflow_handler = options[:overflow_handler]
+          @messages_overflown_count = 0
         end
 
         def write(msg)
@@ -59,20 +62,25 @@ module Timber
           end
         end
 
-        private
-          def total_bytesize
-            @buffers.reduce(0) { |acc, buffer| acc + buffer.bytesize }
-          end
+        def total_bytesize
+          @buffers.reduce(0) { |acc, buffer| acc + buffer.bytesize }
+        end
 
+        private
           def writable_buffer
             @buffers.find { |buffer| !buffer.frozen? }
           end
 
           def handle_overflow(msg)
+            @messages_overflown_count += 1
             if @overflow_handler
               @overflow_handler.call(msg)
             end
           end
+
+          def logger
+            Config.instance.logger
+          end
       end
     end
   end

data/lib/timber/version.rb

@@ -1,3 +1,3 @@
 module Timber
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

metadata

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