rack-ougai 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 27e100432cac9884d52ad4933f9d3224a2256e62
-  data.tar.gz: cea9f134706c03c91166c25dffef970ccdce29a3
+SHA256:
+  metadata.gz: 6e827d82e3bda428311a488e71e7a68407ebd6f9664fd4d93964696182ba884f
+  data.tar.gz: 60551ccad80cdf385be7f3f8a684f614f7b4ab5573bf28a56b5caa84e49e0cb2
 SHA512:
-  metadata.gz: 9ee784842d6d78fb28f3d056cfbc1d38acd9b4ad4f5ce8113e977cbbfd9f640bee907850c0429eb2ffffa03dc5eebcd47203b22020e30c9036e187dd64e50ee6
-  data.tar.gz: 73f60d0fa8de95aad6437376d9e6b7be15a4f93c71217ea525989b05baee2fc832f9d083029a0a813a7da09b10540b88c85737668c603e7d02e8f7e74d04019c
+  metadata.gz: 185c799a6a849b667d81d05818e5682c88fad6af4bb9a4d19cc3af6098573407a3588afe4d3159c17ab50f67ca91fcf62c7fd92054f6dcc8fe4dbdbaefabe0c9
+  data.tar.gz: 4443c2d0fc41196a02b037152642ba46ec137d852662d397f7207d38df42366710b31afacbdc3952267c1c392b46a5f8ade8f21f184cf88fe521e19e0f7bdfaf

data/.gitignore

@@ -7,4 +7,6 @@
 /spec/reports/
 /tmp/
 
+.vscode
+
 Gemfile.lock

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.0.1

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in rack-ougai.gemspec
 gemspec

data/README.md

@@ -1,9 +1,11 @@
-# Rack::Ougai #
+# Rack::Ougai
+
 `Rack::Ougai` replaces the Rack logging system with an [Ougai](https://github.com/tilfin/ougai) logger
 that supports Bunyan-styled structured logging in JSON. It includes a few options for building those logs,
-as well as integration with (`Rack::RequestID`)[https://github.com/dancavallaro/rack-requestid].
+as well as integration with [`Rack::RequestID`](https://github.com/dancavallaro/rack-requestid).
+
+## Installation
 
-## Installation ##
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -12,18 +14,23 @@ gem 'rack-ougai'
 
 And then execute:
 
-    $ bundle
+```sh
+bundle
+```
 
 Or install it yourself as:
 
-    $ gem install rack-ougai
+```sh
+gem install rack-ougai
+```
+
+## Usage
 
-## Usage ##
 Your `config.ru` should include directives similar to these. Obviously, `Rack::RequestID` is
 optional, but `Rack::Ougai::Logger` (or another logger provider) should be high in your middleware
 stack so as to push a logger down into the subsequent middleware.
 
-```
+```ruby
 require 'rack/ougai'
 require 'rack/requestid'
 
@@ -35,27 +42,32 @@ use Rack::Ougai::AttachRequestID # Replaces logger with a child logger that's ta
 use Rack::Ougai::LogRequests # logs every request with timing data, request result, etc.
 ```
 
-## Log Providers ##
+## Log Providers
+
+### `Rack::Ougai::Logger`
 
-### `Rack::Ougai::Logger` ###
 Simple, no-configuration Ougai logger that accepts a `Logger` severity level.
 
-### `Rack::Ougai::ConstantLogger` ###
+### `Rack::Ougai::ConstantLogger`
+
 Specify a preconfigured logger to be used for all requests. For example, in one project I
 build a global logger, separate from Rack, which is configured via a YAML file; I add it as the
 top level logger in Rack, too.
 
-```
+```ruby
 require 'myproject/log'
 
 use Rack::Ougai::ConstantLogger, MyProject::Log # an instance of Ougai::Logging
 ```
 
-## Contributing ##
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/rack-ougai. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/eropple/rack-ougai. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+## License
 
-## License ##
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
-## Code of Conduct ##
-Everyone interacting in the Rack::Ougai project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/rack-ougai/blob/master/CODE_OF_CONDUCT.md).
+## Code of Conduct
+
+Everyone interacting in the Rack::Ougai project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/eropple/rack-ougai/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,2 +1,3 @@
 require "bundler/gem_tasks"
-task :default => :spec
+
+task default: :spec

data/lib/rack/ougai/{attach_requestid.rb → attach_request_id.rb}

@@ -7,13 +7,11 @@ module Rack
 
       def initialize(app, opts = {})
         @app = app
-
         @storage = opts[:storage] || proc { Thread.current }
       end
 
       def call(env)
         parent = env[Rack::RACK_LOGGER]
-
         request_id = env[REQUEST_ID_KEY]
 
         if request_id.nil?

data/lib/rack/ougai/log_requests.rb

@@ -3,29 +3,39 @@ require 'time'
 module Rack
   module Ougai
     class LogRequests
-      def initialize(app, logger = nil)
+      def initialize(app, logger = nil, local: false)
         @app = app
         @logger = logger
+        @local = local
       end
 
       def call(env)
-        status, headers, body = @app.call(env)
+        start_time = Time.now
+        status, headers, _body = @app.call(env)
       ensure
         logger = @logger || env[RACK_LOGGER]
-        logger.info('HTTP Request', create_log(env, status, headers))
+        logger.info('http', create_log(start_time, env, status, headers))
       end
 
       private
 
-      def create_log(env, status, header)
-        {
-          time: Time.now,
+      def create_log(start_time, env, status, _headers)
+        end_time = Time.now
+
+        ret = {
+          time: @local ? start_time : start_time.utc,
+          usec: end_time.usec - start_time.usec,
           remote_addr: env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"],
           method: env[REQUEST_METHOD],
           path: env[PATH_INFO],
           query: env[QUERY_STRING],
           status: status.to_i,
         }
+
+        request_id = env['HTTP_X_REQUEST_ID']
+        ret[:request_id] = request_id unless request_id.nil?
+
+        ret
       end
 
     end

data/lib/rack/ougai/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Ougai
-    VERSION = "0.1.0"
+    VERSION = "0.3.0".freeze
   end
 end

data/lib/rack/ougai.rb

@@ -4,7 +4,7 @@ require "rack/ougai/logger"
 require "rack/ougai/constant_logger"
 
 require "rack/ougai/log_requests"
-require "rack/ougai/attach_requestid"
+require "rack/ougai/attach_request_id"
 
 module Rack
   module Ougai

data/rack-ougai.gemspec

@@ -1,12 +1,13 @@
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require "rack/ougai/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "rack-ougai"
   spec.version       = Rack::Ougai::VERSION
-  spec.authors       = ["Toshimitsu Takahashi", "Ed Ropple"]
-  spec.email         = ["toshi@tilfin.com", "ed@edropple.com"]
+  spec.authors       = ["Toshimitsu Takahashi", "Ed Ropple", "Pablo Crivella"]
+  spec.email         = ["toshi@tilfin.com", "ed@edropple.com", "pablocrivella@gmail.com"]
 
   spec.summary       = "Rack integration for the Ougai logger."
   spec.homepage      = "https://github.com/eropple/rack-ougai"
@@ -19,9 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 12.0"
 
   spec.add_runtime_dependency "rack", "~> 2.0"
-  spec.add_runtime_dependency "ougai", "~> 1.5"
+  spec.add_runtime_dependency "ougai", "~> 2.0"
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rack-ougai
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Toshimitsu Takahashi
 - Ed Ropple
-autorequire: 
+- Pablo Crivella
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,28 +18,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -59,24 +60,26 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-description: 
+        version: '2.0'
+description:
 email:
 - toshi@tilfin.com
 - ed@edropple.com
+- pablocrivella@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".tool-versions"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -85,7 +88,7 @@ files:
 - bin/console
 - bin/setup
 - lib/rack/ougai.rb
-- lib/rack/ougai/attach_requestid.rb
+- lib/rack/ougai/attach_request_id.rb
 - lib/rack/ougai/constant_logger.rb
 - lib/rack/ougai/log_requests.rb
 - lib/rack/ougai/logger.rb
@@ -95,7 +98,7 @@ homepage: https://github.com/eropple/rack-ougai
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,9 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Rack integration for the Ougai logger.
 test_files: []