sensible_logging 0.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +7 -0
- data/.gitignore +2 -0
- data/.rspec +1 -0
- data/.ruby-version +1 -0
- data/Gemfile +5 -0
- data/LICENSE.txt +21 -0
- data/README.md +41 -0
- data/Rakefile +6 -0
- data/app.rb +22 -0
- data/config.ru +11 -0
- data/lib/sensible_logging.rb +18 -0
- data/lib/sensible_logging/middlewares/request_id.rb +20 -0
- data/lib/sensible_logging/middlewares/request_logger.rb +27 -0
- data/lib/sensible_logging/middlewares/tagged_logger.rb +44 -0
- data/lib/sensible_logging/version.rb +3 -0
- data/sensible_logging.gemspec +31 -0
- metadata +172 -0
checksums.yaml
ADDED
@@ -0,0 +1,7 @@
|
|
1
|
+
---
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: 573a3b8040fec85373dc5f2a00a82655e51ebe08d28b31c1a4dbfa3f18b0147f
|
4
|
+
data.tar.gz: 4d7d894842e36853317062862cd99577d9f61b78ad73fbbe909315ff14f8ecd6
|
5
|
+
SHA512:
|
6
|
+
metadata.gz: a8dea52bb2451b3bdcdce68b1ff75f5cfaa385b2321d9027b687f5b8bd27c5cef56d68fa197081a79cc0b4c11303e706867ad3ba6dd3ddba07c2f89b0a3f5004
|
7
|
+
data.tar.gz: 6b1ebcc33d6b13a5e4ce19307d538f4387ccfbd0e5cf5dcbc45d4729786e7ea2f41f917e80bed39d8c4b7aadf521aacb60e49061a23737581d23cfe907baac44
|
data/.gitignore
ADDED
data/.rspec
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
--require spec_helper
|
data/.ruby-version
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
2.5.0
|
data/Gemfile
ADDED
data/LICENSE.txt
ADDED
@@ -0,0 +1,21 @@
|
|
1
|
+
The MIT License (MIT)
|
2
|
+
|
3
|
+
Copyright (c) 2018 David Winter
|
4
|
+
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
7
|
+
in the Software without restriction, including without limitation the rights
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
10
|
+
furnished to do so, subject to the following conditions:
|
11
|
+
|
12
|
+
The above copyright notice and this permission notice shall be included in
|
13
|
+
all copies or substantial portions of the Software.
|
14
|
+
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
21
|
+
THE SOFTWARE.
|
data/README.md
ADDED
@@ -0,0 +1,41 @@
|
|
1
|
+
# Sensible logging
|
2
|
+
|
3
|
+
Proof of concept for some sensible defaults for logging in a Sinatra app.
|
4
|
+
|
5
|
+
Plan will be to wrap this up in a single self contained gem that can easily be dropped into existing Sinatra applications.
|
6
|
+
|
7
|
+
## Features
|
8
|
+
|
9
|
+
* Add (or use an existing) request ID for use in logs
|
10
|
+
* Trim the request logs to the bare minimal (method, path, status, duration and params if a GET request) - similar to lograge with Rails
|
11
|
+
* Tagged logging out of the box, with some sensible defaults; host, environment and request ID
|
12
|
+
|
13
|
+
## Demo
|
14
|
+
|
15
|
+
There is an example Sinatra app included in this repo, so:
|
16
|
+
|
17
|
+
```
|
18
|
+
bundle install
|
19
|
+
rackup
|
20
|
+
```
|
21
|
+
|
22
|
+
With the app running, run some curl commands against it:
|
23
|
+
|
24
|
+
```
|
25
|
+
curl 'localhost:9292/hello?one=two&two=three'
|
26
|
+
```
|
27
|
+
|
28
|
+
You should notice in the logs:
|
29
|
+
|
30
|
+
* Standard Sinatra `logger` helper works out of the box within apps with tags.
|
31
|
+
* Excluded paramaters are not included, in this example `two` based on `config.ru`
|
32
|
+
* The request log is minimal compared to out of the box Sinatra.
|
33
|
+
* `env['request_id']` is now available to hook into Sentry reports.
|
34
|
+
|
35
|
+
## Using
|
36
|
+
|
37
|
+
Key thing is to wrap the Sinatra app in `sensible_logging` (as in `config.ru`) with your required options for logger, log tags and excluded parameters.
|
38
|
+
|
39
|
+
## Todo
|
40
|
+
|
41
|
+
Need to ensure `sensible_logging` confirms to all of the relevant `productionisation` checklist items. Pretty much there though.
|
data/Rakefile
ADDED
data/app.rb
ADDED
@@ -0,0 +1,22 @@
|
|
1
|
+
require 'sinatra/base'
|
2
|
+
require 'logger'
|
3
|
+
|
4
|
+
class App < Sinatra::Base
|
5
|
+
configure do
|
6
|
+
set :log_level, Logger::DEBUG
|
7
|
+
end
|
8
|
+
|
9
|
+
configure :production do
|
10
|
+
set :log_level, Logger::INFO
|
11
|
+
end
|
12
|
+
|
13
|
+
get '/hello' do
|
14
|
+
logger.debug('test')
|
15
|
+
'test'
|
16
|
+
end
|
17
|
+
|
18
|
+
post '/' do
|
19
|
+
logger.debug('posting')
|
20
|
+
'posted'
|
21
|
+
end
|
22
|
+
end
|
data/config.ru
ADDED
@@ -0,0 +1,18 @@
|
|
1
|
+
require_relative './sensible_logging/middlewares/request_id'
|
2
|
+
require_relative './sensible_logging/middlewares/tagged_logger'
|
3
|
+
require_relative './sensible_logging/middlewares/request_logger'
|
4
|
+
|
5
|
+
def sensible_logging(app:, logger:, log_tags: [], exclude_params: [], tld_length: 1)
|
6
|
+
use RequestId
|
7
|
+
use TaggedLogger, logger, log_tags, tld_length
|
8
|
+
use RequestLogger, exclude_params
|
9
|
+
|
10
|
+
app.before do
|
11
|
+
env['rack.errors'] = env['rack.logger'] = env['logger']
|
12
|
+
if app.settings.log_level != nil
|
13
|
+
logger.level = app.settings.log_level
|
14
|
+
end
|
15
|
+
end
|
16
|
+
|
17
|
+
app
|
18
|
+
end
|
@@ -0,0 +1,20 @@
|
|
1
|
+
require 'securerandom'
|
2
|
+
|
3
|
+
class RequestId
|
4
|
+
def initialize(app)
|
5
|
+
@app = app
|
6
|
+
end
|
7
|
+
|
8
|
+
def call(env)
|
9
|
+
env['request_id'] = env['HTTP_X_REQUEST_ID'] || new_request_id
|
10
|
+
status, headers, body = @app.call(env)
|
11
|
+
headers['X-Request-Id'] ||= env['request_id']
|
12
|
+
[status, headers, body]
|
13
|
+
end
|
14
|
+
|
15
|
+
private
|
16
|
+
|
17
|
+
def new_request_id
|
18
|
+
SecureRandom.uuid
|
19
|
+
end
|
20
|
+
end
|
@@ -0,0 +1,27 @@
|
|
1
|
+
require 'rack/request'
|
2
|
+
|
3
|
+
class RequestLogger
|
4
|
+
def initialize(app, filtered_params = [])
|
5
|
+
@app = app
|
6
|
+
@filtered_params = filtered_params
|
7
|
+
end
|
8
|
+
|
9
|
+
def call(env)
|
10
|
+
req = Rack::Request.new(env)
|
11
|
+
start_time = Time.now
|
12
|
+
status, headers, body = @app.call(env)
|
13
|
+
end_time = Time.now - start_time
|
14
|
+
|
15
|
+
message = "method=#{req.request_method} path=#{req.path} status=#{status} duration=#{end_time}"
|
16
|
+
filtered_params = filter_params(req)
|
17
|
+
message += " params=#{filtered_params}" if req.get? && ! filtered_params.empty?
|
18
|
+
env['logger'].info(message)
|
19
|
+
[status, headers, body]
|
20
|
+
end
|
21
|
+
|
22
|
+
private
|
23
|
+
|
24
|
+
def filter_params(req)
|
25
|
+
req.params.select { |x| ! @filtered_params.include?(x) }
|
26
|
+
end
|
27
|
+
end
|
@@ -0,0 +1,44 @@
|
|
1
|
+
require 'active_support/tagged_logging'
|
2
|
+
|
3
|
+
class TaggedLogger
|
4
|
+
def initialize(app, logger = Logger.new(STDOUT), tags = [], tld_length = 1)
|
5
|
+
@app = app
|
6
|
+
@logger = ActiveSupport::TaggedLogging.new(logger)
|
7
|
+
|
8
|
+
@tags = tags
|
9
|
+
@tags = default_tags if tags.empty?
|
10
|
+
|
11
|
+
@tld_length = tld_length
|
12
|
+
end
|
13
|
+
|
14
|
+
def call(env)
|
15
|
+
@logger.tagged(*generate_tags(env)) do |logger|
|
16
|
+
env['logger'] = logger
|
17
|
+
@app.call(env)
|
18
|
+
end
|
19
|
+
end
|
20
|
+
|
21
|
+
def default_tags
|
22
|
+
[lambda { |req|
|
23
|
+
[subdomain(req), ENV['RACK_ENV'], req.env['request_id']]
|
24
|
+
}]
|
25
|
+
end
|
26
|
+
|
27
|
+
private
|
28
|
+
|
29
|
+
def subdomain(req)
|
30
|
+
domain_parts = req.host.split('.')
|
31
|
+
|
32
|
+
main_domain_length = @tld_length + 1
|
33
|
+
subdomain_length = domain_parts.length - main_domain_length
|
34
|
+
|
35
|
+
domain_parts[0...subdomain_length].join('.')
|
36
|
+
end
|
37
|
+
|
38
|
+
def generate_tags(env)
|
39
|
+
req = Rack::Request.new(env)
|
40
|
+
tags = @tags.map do |tag|
|
41
|
+
tag.call(req)
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
@@ -0,0 +1,31 @@
|
|
1
|
+
|
2
|
+
lib = File.expand_path('../lib', __FILE__)
|
3
|
+
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
4
|
+
require 'sensible_logging/version'
|
5
|
+
|
6
|
+
Gem::Specification.new do |spec|
|
7
|
+
spec.name = 'sensible_logging'
|
8
|
+
spec.version = SensibleLogging::VERSION
|
9
|
+
spec.authors = ['David Winter', 'Mark Sta Ana']
|
10
|
+
spec.email = ['sre@madetech.com']
|
11
|
+
|
12
|
+
spec.summary = 'Sensible logging defaults for your Sinatra app'
|
13
|
+
spec.homepage = 'https://github.com/madetech/sensible_logging'
|
14
|
+
spec.license = 'MIT'
|
15
|
+
|
16
|
+
spec.files = `git ls-files -z`.split("\x0").reject do |f|
|
17
|
+
f.match(%r{^(test|spec|features)/})
|
18
|
+
end
|
19
|
+
|
20
|
+
spec.require_paths = ['lib']
|
21
|
+
|
22
|
+
spec.add_runtime_dependency 'rack', '~> 2.0'
|
23
|
+
spec.add_runtime_dependency 'activesupport', '~> 5.2'
|
24
|
+
|
25
|
+
spec.add_development_dependency 'sinatra', '~> 2.0'
|
26
|
+
spec.add_development_dependency 'puma', '~> 3.12'
|
27
|
+
spec.add_development_dependency 'bundler', '~> 1.16'
|
28
|
+
spec.add_development_dependency 'rake', '~> 10.0'
|
29
|
+
spec.add_development_dependency 'rspec', '~> 3.0'
|
30
|
+
spec.add_development_dependency 'pry', '~> 0.12.2'
|
31
|
+
end
|
metadata
ADDED
@@ -0,0 +1,172 @@
|
|
1
|
+
--- !ruby/object:Gem::Specification
|
2
|
+
name: sensible_logging
|
3
|
+
version: !ruby/object:Gem::Version
|
4
|
+
version: 0.1.0
|
5
|
+
platform: ruby
|
6
|
+
authors:
|
7
|
+
- David Winter
|
8
|
+
- Mark Sta Ana
|
9
|
+
autorequire:
|
10
|
+
bindir: bin
|
11
|
+
cert_chain: []
|
12
|
+
date: 2019-01-07 00:00:00.000000000 Z
|
13
|
+
dependencies:
|
14
|
+
- !ruby/object:Gem::Dependency
|
15
|
+
name: rack
|
16
|
+
requirement: !ruby/object:Gem::Requirement
|
17
|
+
requirements:
|
18
|
+
- - "~>"
|
19
|
+
- !ruby/object:Gem::Version
|
20
|
+
version: '2.0'
|
21
|
+
type: :runtime
|
22
|
+
prerelease: false
|
23
|
+
version_requirements: !ruby/object:Gem::Requirement
|
24
|
+
requirements:
|
25
|
+
- - "~>"
|
26
|
+
- !ruby/object:Gem::Version
|
27
|
+
version: '2.0'
|
28
|
+
- !ruby/object:Gem::Dependency
|
29
|
+
name: activesupport
|
30
|
+
requirement: !ruby/object:Gem::Requirement
|
31
|
+
requirements:
|
32
|
+
- - "~>"
|
33
|
+
- !ruby/object:Gem::Version
|
34
|
+
version: '5.2'
|
35
|
+
type: :runtime
|
36
|
+
prerelease: false
|
37
|
+
version_requirements: !ruby/object:Gem::Requirement
|
38
|
+
requirements:
|
39
|
+
- - "~>"
|
40
|
+
- !ruby/object:Gem::Version
|
41
|
+
version: '5.2'
|
42
|
+
- !ruby/object:Gem::Dependency
|
43
|
+
name: sinatra
|
44
|
+
requirement: !ruby/object:Gem::Requirement
|
45
|
+
requirements:
|
46
|
+
- - "~>"
|
47
|
+
- !ruby/object:Gem::Version
|
48
|
+
version: '2.0'
|
49
|
+
type: :development
|
50
|
+
prerelease: false
|
51
|
+
version_requirements: !ruby/object:Gem::Requirement
|
52
|
+
requirements:
|
53
|
+
- - "~>"
|
54
|
+
- !ruby/object:Gem::Version
|
55
|
+
version: '2.0'
|
56
|
+
- !ruby/object:Gem::Dependency
|
57
|
+
name: puma
|
58
|
+
requirement: !ruby/object:Gem::Requirement
|
59
|
+
requirements:
|
60
|
+
- - "~>"
|
61
|
+
- !ruby/object:Gem::Version
|
62
|
+
version: '3.12'
|
63
|
+
type: :development
|
64
|
+
prerelease: false
|
65
|
+
version_requirements: !ruby/object:Gem::Requirement
|
66
|
+
requirements:
|
67
|
+
- - "~>"
|
68
|
+
- !ruby/object:Gem::Version
|
69
|
+
version: '3.12'
|
70
|
+
- !ruby/object:Gem::Dependency
|
71
|
+
name: bundler
|
72
|
+
requirement: !ruby/object:Gem::Requirement
|
73
|
+
requirements:
|
74
|
+
- - "~>"
|
75
|
+
- !ruby/object:Gem::Version
|
76
|
+
version: '1.16'
|
77
|
+
type: :development
|
78
|
+
prerelease: false
|
79
|
+
version_requirements: !ruby/object:Gem::Requirement
|
80
|
+
requirements:
|
81
|
+
- - "~>"
|
82
|
+
- !ruby/object:Gem::Version
|
83
|
+
version: '1.16'
|
84
|
+
- !ruby/object:Gem::Dependency
|
85
|
+
name: rake
|
86
|
+
requirement: !ruby/object:Gem::Requirement
|
87
|
+
requirements:
|
88
|
+
- - "~>"
|
89
|
+
- !ruby/object:Gem::Version
|
90
|
+
version: '10.0'
|
91
|
+
type: :development
|
92
|
+
prerelease: false
|
93
|
+
version_requirements: !ruby/object:Gem::Requirement
|
94
|
+
requirements:
|
95
|
+
- - "~>"
|
96
|
+
- !ruby/object:Gem::Version
|
97
|
+
version: '10.0'
|
98
|
+
- !ruby/object:Gem::Dependency
|
99
|
+
name: rspec
|
100
|
+
requirement: !ruby/object:Gem::Requirement
|
101
|
+
requirements:
|
102
|
+
- - "~>"
|
103
|
+
- !ruby/object:Gem::Version
|
104
|
+
version: '3.0'
|
105
|
+
type: :development
|
106
|
+
prerelease: false
|
107
|
+
version_requirements: !ruby/object:Gem::Requirement
|
108
|
+
requirements:
|
109
|
+
- - "~>"
|
110
|
+
- !ruby/object:Gem::Version
|
111
|
+
version: '3.0'
|
112
|
+
- !ruby/object:Gem::Dependency
|
113
|
+
name: pry
|
114
|
+
requirement: !ruby/object:Gem::Requirement
|
115
|
+
requirements:
|
116
|
+
- - "~>"
|
117
|
+
- !ruby/object:Gem::Version
|
118
|
+
version: 0.12.2
|
119
|
+
type: :development
|
120
|
+
prerelease: false
|
121
|
+
version_requirements: !ruby/object:Gem::Requirement
|
122
|
+
requirements:
|
123
|
+
- - "~>"
|
124
|
+
- !ruby/object:Gem::Version
|
125
|
+
version: 0.12.2
|
126
|
+
description:
|
127
|
+
email:
|
128
|
+
- sre@madetech.com
|
129
|
+
executables: []
|
130
|
+
extensions: []
|
131
|
+
extra_rdoc_files: []
|
132
|
+
files:
|
133
|
+
- ".gitignore"
|
134
|
+
- ".rspec"
|
135
|
+
- ".ruby-version"
|
136
|
+
- Gemfile
|
137
|
+
- LICENSE.txt
|
138
|
+
- README.md
|
139
|
+
- Rakefile
|
140
|
+
- app.rb
|
141
|
+
- config.ru
|
142
|
+
- lib/sensible_logging.rb
|
143
|
+
- lib/sensible_logging/middlewares/request_id.rb
|
144
|
+
- lib/sensible_logging/middlewares/request_logger.rb
|
145
|
+
- lib/sensible_logging/middlewares/tagged_logger.rb
|
146
|
+
- lib/sensible_logging/version.rb
|
147
|
+
- sensible_logging.gemspec
|
148
|
+
homepage: https://github.com/madetech/sensible_logging
|
149
|
+
licenses:
|
150
|
+
- MIT
|
151
|
+
metadata: {}
|
152
|
+
post_install_message:
|
153
|
+
rdoc_options: []
|
154
|
+
require_paths:
|
155
|
+
- lib
|
156
|
+
required_ruby_version: !ruby/object:Gem::Requirement
|
157
|
+
requirements:
|
158
|
+
- - ">="
|
159
|
+
- !ruby/object:Gem::Version
|
160
|
+
version: '0'
|
161
|
+
required_rubygems_version: !ruby/object:Gem::Requirement
|
162
|
+
requirements:
|
163
|
+
- - ">="
|
164
|
+
- !ruby/object:Gem::Version
|
165
|
+
version: '0'
|
166
|
+
requirements: []
|
167
|
+
rubyforge_project:
|
168
|
+
rubygems_version: 2.7.3
|
169
|
+
signing_key:
|
170
|
+
specification_version: 4
|
171
|
+
summary: Sensible logging defaults for your Sinatra app
|
172
|
+
test_files: []
|