timber-rack 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 842b8f0648df453c036c272d6a4c6acb14b5871f93d510e5c0ff13d695099558
-  data.tar.gz: ac7015817b3f3cd58e2fbb2ae06439af33ad958c44beb9fa6bed381a68b44f9d
+  metadata.gz: e9b77ec2fe77256fca4523cff6c8920899d470ecc6f79416a8ae0d898a53218a
+  data.tar.gz: 7cbc3e59167ec9bc87802519d0ae78ff27e4d1a52eb783d80b4c88ee973d6296
 SHA512:
-  metadata.gz: f90f921a1ef9f09dccdd32d3ab0d00439b35726de39713d1d69fad28be6dde80c9815d088111beae17d3cc1b0c71d1752fa80c4475036a18401fa0bf705f8a2f
-  data.tar.gz: ef5185ce6ce4e908c2521effd3a3a4790ec949e11fcfa1eb03d8ce863e216fd770f8308e1e226862c8cb2515235ed0333c972832d246f0d3985935d72e7402b3
+  metadata.gz: 2ff4000fb69f6245488044fa6e021a9ee1b44ab3fbca1a6cd5d4875f977cbdeb75315500f2f44d035d02a70220ef43bfc10dd42cc140144eb1b7e46eb72e422c
+  data.tar.gz: 63867ce360ac7055cdc609c769a7140933b584107c03b6dffee36332fa753e02799f6a8d73a3f00dd927e60a9f4114cd44dd51ec0f18ad8e58b0a16caa499b1b

data/Gemfile

@@ -1,7 +1,3 @@
 source "https://rubygems.org"
 
-# TODO: REMOVE ME
-gem 'timber', git: 'https://github.com/timberio/timber-ruby.git', branch: '3.0'
-
-# Specify your gem's dependencies in timber-ruby-rack.gemspec
 gemspec

data/README.md

@@ -3,7 +3,6 @@
 [![ISC License](https://img.shields.io/badge/license-ISC-ff69b4.svg)](LICENSE.md)
 [![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/github/timberio/timber-ruby-rack)
 [![Build Status](https://travis-ci.org/timberio/timber-ruby-rack.svg?branch=master)](https://travis-ci.org/timberio/timber-ruby-rack)
-[![Code Climate](https://codeclimate.com/github/timberio/timber-ruby-rack/badges/gpa.svg)](https://codeclimate.com/github/timberio/timber-ruby-rack)
 
 This library integrates the [`timber` Ruby library](https://github.com/timberio/timber-ruby) with the [Rack](https://github.com/rack/rack) framework,
 turning your Rack logs into rich structured events.

data/lib/timber-rack/http_context.rb

@@ -17,9 +17,9 @@ module Timber
             remote_addr: request.ip,
             request_id: request.request_id
           )
-          CurrentContext.with(context) do
-            @app.call(env)
-          end
+
+          CurrentContext.add(context.to_hash)
+          @app.call(env)
         end
       end
     end

data/lib/timber-rack/http_events.rb

@@ -141,8 +141,7 @@ module Timber
             status, headers, body = @app.call(env)
 
             Config.instance.logger.info do
-              http_context_key = Contexts::HTTP.keyspace
-              http_context = CurrentContext.fetch(http_context_key)
+              http_context = CurrentContext.fetch(:http)
               content_length = headers[CONTENT_LENGTH_KEY]
               duration_ms = (Time.now - start) * 1000.0
 

data/lib/timber-rack/http_request.rb

@@ -1,5 +1,3 @@
-require "timber/util"
-
 module Timber
   module Integrations
     module Rack
@@ -9,37 +7,25 @@ module Timber
       # @note This event should be installed automatically through integrations,
       #   such as the {Integrations::ActionController::LogSubscriber} integration.
       class HTTPRequest
-        BODY_MAX_BYTES = 8192.freeze
-        HEADERS_JSON_MAX_BYTES = 8192.freeze
-        HEADERS_TO_SANITIZE = ['authorization', 'x-amz-security-token'].freeze
-        HOST_MAX_BYTES = 256.freeze
-        METHOD_MAX_BYTES = 20.freeze
-        PATH_MAX_BYTES = 2048.freeze
-        QUERY_STRING_MAX_BYTES = 2048.freeze
-        REQUEST_ID_MAX_BYTES = 256.freeze
-        SCHEME_MAX_BYTES = 20.freeze
-        SERVICE_NAME_MAX_BYTES = 256.freeze
-
         attr_reader :body, :content_length, :headers, :headers_json, :host, :method, :path, :port,
           :query_string, :request_id, :scheme, :service_name
 
         def initialize(attributes)
-          normalizer = Util::AttributeNormalizer.new(attributes)
-          body_limit = attributes.delete(:body_limit) || BODY_MAX_BYTES
-          headers_to_sanitize = HEADERS_TO_SANITIZE + (attributes.delete(:headers_to_sanitize) || [])
+          @body = attributes[:body]
+          @content_length = attributes[:content_length]
+          @headers = attributes[:headers]
+          @host = attributes[:host]
+          @method = attributes[:method]
+          @path = attributes[:path]
+          @port = attributes[:port]
+          @query_string = attributes[:query_string]
+          @scheme = attributes[:scheme]
+          @request_id = attributes[:request_id]
+          @service_name = attributes[:service_name]
 
-          @body = normalizer.fetch(:body, :string, :limit => body_limit)
-          @content_length = normalizer.fetch(:content_length, :integer)
-          @headers= normalizer.fetch(:headers, :hash, :sanitize => headers_to_sanitize)
-          @headers_json = @headers.to_json.byteslice(0, HEADERS_JSON_MAX_BYTES)
-          @host = normalizer.fetch(:host, :string, :limit => HOST_MAX_BYTES)
-          @method = normalizer.fetch!(:method, :string, :upcase => true, :limit => METHOD_MAX_BYTES)
-          @path = normalizer.fetch(:path, :string, :limit => PATH_MAX_BYTES)
-          @port = normalizer.fetch(:port, :integer)
-          @query_string = normalizer.fetch(:query_string, :string, :limit => QUERY_STRING_MAX_BYTES)
-          @scheme = normalizer.fetch(:scheme, :string, :limit => SCHEME_MAX_BYTES)
-          @request_id = normalizer.fetch(:request_id, :string, :limit => REQUEST_ID_MAX_BYTES)
-          @service_name = normalizer.fetch(:service_name, :string, :limit => SERVICE_NAME_MAX_BYTES)
+          if @headers
+            @headers_json = @headers.to_json
+          end
         end
 
         def message

data/lib/timber-rack/http_response.rb

@@ -1,5 +1,3 @@
-require "timber/util"
-
 module Timber
   module Integrations
     module Rack
@@ -7,29 +5,22 @@ module Timber
       # to clients.
 
       class HTTPResponse
-        BODY_MAX_BYTES = 8192.freeze
-        HEADERS_JSON_MAX_BYTES = 256.freeze
-        HEADERS_TO_SANITIZE = ['authorization', 'x-amz-security-token'].freeze
-        REQUEST_ID_MAX_BYTES = 256.freeze
-        SERVICE_NAME_MAX_BYTES = 256.freeze
-
         attr_reader :body, :content_length, :headers, :headers_json, :http_context, :request_id, :service_name,
           :status, :duration_ms
 
         def initialize(attributes)
-          normalizer = Util::AttributeNormalizer.new(attributes)
-          body_limit = attributes.delete(:body_limit) || BODY_MAX_BYTES
-          headers_to_sanitize = HEADERS_TO_SANITIZE + (attributes.delete(:headers_to_sanitize) || [])
-
-          @body = normalizer.fetch(:body, :string, :limit => body_limit)
-          @content_length = normalizer.fetch(:content_length, :integer)
-          @headers = normalizer.fetch(:headers, :hash, :sanitize => headers_to_sanitize)
-          @headers_json = @headers.to_json.byteslice(0, HEADERS_JSON_MAX_BYTES)
+          @body = attributes[:body]
+          @content_length  = attributes[:content_length]
+          @headers = attributes[:headers]
           @http_context = attributes[:http_context]
-          @request_id = normalizer.fetch(:request_id, :string, :limit => REQUEST_ID_MAX_BYTES)
-          @service_name = normalizer.fetch(:service_name, :string, :limit => SERVICE_NAME_MAX_BYTES)
-          @status = normalizer.fetch!(:status, :integer)
-          @duration_ms = normalizer.fetch!(:duration_ms, :float, :precision => 6)
+          @request_id = attributes[:request_id]
+          @service_name = attributes[:service_name]
+          @status = attributes[:status]
+          @duration_ms = attributes[:duration_ms]
+
+          if @headers
+            @headers_json = @headers.to_json
+          end
         end
 
         # Returns the human readable log message for this event.

data/lib/timber-rack/user_context.rb

@@ -67,13 +67,10 @@ module Timber
         def call(env)
           user_hash = get_user_hash(env)
           if user_hash
-            context = Contexts::User.new(user_hash)
-            CurrentContext.with(context) do
-              @app.call(env)
-            end
-          else
-            @app.call(env)
+            CurrentContext.add({user: user_hash})
           end
+
+          @app.call(env)
         end
 
         private

data/lib/timber-rack/version.rb

@@ -1,7 +1,7 @@
 module Timber
   module Integrations
     module Rack
-      VERSION = "1.0.0"
+      VERSION = "1.0.1"
     end
   end
 end

data/timber-rack.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Timber Technologies, Inc."]
   spec.email         = ["hi@timber.io"]
 
-  spec.summary       = %q{Timber for Ruby is a drop in replacement for your Ruby logger that unobtrusively augments your logs with rich metadata and context making them easier to search, use, and read.}
+  spec.summary       = %q{Timber integration for Rack}
   spec.homepage      = "https://docs.timber.io/languages/ruby/"
   spec.license       = "ISC"
 
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # spec.add_dependency "timber", "3.0.0.alpha.0"
+  spec.add_dependency "timber", "~> 3.0"
   spec.add_runtime_dependency "rack", ">= 1.2", "< 3.0"
 
   spec.add_development_dependency "bundler", ">= 0.0"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: timber-rack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Timber Technologies, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: timber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -123,10 +137,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
-summary: Timber for Ruby is a drop in replacement for your Ruby logger that unobtrusively
-  augments your logs with rich metadata and context making them easier to search,
-  use, and read.
+summary: Timber integration for Rack
 test_files: []