twiglet 2.3.3 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d0d7afeaf36dbb4b751acc81270a07f53c407419a71b2f98506641bb945eacc
-  data.tar.gz: '08c3562addfa95848f2e12faf90e541f7f0f5dd3a33d9dda2948197b57a36965'
+  metadata.gz: fb67641cb96b209f76dff9715a469edd7cd78661ec606bfa2b229f8d5e124b01
+  data.tar.gz: 37d1f21d56ce96c099edefe3cbb93a7bedb14e6496fcf3aef9fa71cd09f1bb40
 SHA512:
-  metadata.gz: 3513377b684ac2f788c31734fb229027710e2e1ceba8cc535ce49faa38076ddc90b0204851483c23a05261271b2c14c6d7ce5622be364d6097c69e073fe32c73
-  data.tar.gz: d65dda69ac427e922edd34213fbe0672266e272eb6135b39afba6bd3738464958f054cc8bf0d1382b4c2ef45771abd7c419ac1153a1133d010ec6923ad0e94ce
+  metadata.gz: 04aeb0f52a59d136d56d2839094e2d3c113bf396204d772c0dc2097ef2c2181f5755dd5b2e4ffbc4643b66b0da1885937ff015f15b90834676526a1d2537ec53
+  data.tar.gz: 5e7bd5396bab68ab3f1aef5859753382774aad7ed5c5dd25a41dfe56aa9af97e8e08eece2515ca033ce2c5f9c342bda7b288ce9171a94f59cd151cad77cf3151

data/.github/CODEOWNERS

@@ -1,3 +1,4 @@
 # Add your project owners info here
 # More information: https://help.github.com/articles/about-codeowners/
-* @simplybusiness/application-tooling
+* @simplybusiness/silversmiths 
+

data/.github/workflows/ruby.yml

@@ -4,6 +4,9 @@ on:
   push:
     branches:
 
+env:
+  CI: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -13,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [2.6, 2.7]
+        ruby-version: [2.5, 2.6, 2.7]
 
     steps:
     - uses: actions/checkout@v2
@@ -23,11 +26,22 @@ jobs:
         ruby-version: ${{ matrix.ruby-version }}
     - name: Install dependencies
       run: bundle install
+    - name: install cc-test-reporter
+      env:
+        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+      run: |
+        curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-0.6.3-linux-amd64 > ./cc-test-reporter
+        chmod +x ./cc-test-reporter
+        ./cc-test-reporter before-build
     - name: Rubocop Check
       run: bundle exec rubocop
     - name: Run all tests
       run: bundle exec rake test
       shell: bash
+    - name: upload test coverage to CodeClimate
+      env:
+        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+      run: ./cc-test-reporter after-build
     - name: Run example_app
       run: bundle exec ruby example_app.rb
       shell: bash

data/.github/workflows/version-forget-me-not.yml

@@ -0,0 +1,27 @@
+name: Check version
+
+on:
+  pull_request:
+    branches:
+      - master # default branch
+    types: [opened, synchronize]
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+
+    steps:
+      # For private action we need to checkout the action repo.
+      # We can remove this once we make the action public.
+      - uses: actions/checkout@v1
+        with:
+          repository: simplybusiness/version-forget-me-not
+          ref: refs/tags/v1.0
+          # Do not put the actual secret here- only the name of the secret in your repo
+          token: ${{ secrets.BOT_TOKEN }}
+          path: './twiglet-ruby'
+      - uses: ./
+        env:
+          ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # It is the file path where you keep the version of gem.
+          # It usually in the `lib/<gem name>/version.rb` or in the gemspec file.
+          VERSION_FILE_PATH: "lib/twiglet/version.rb"

data/.gitignore

@@ -1,3 +1,4 @@
+*~
 *.gem
 Gemfile.lock
 *.rbc

data/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_gem:
   simplycop: .simplycop.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.5
   Rails:
     Enabled: false
   Documentation:

data/Dockerfile

@@ -0,0 +1,7 @@
+FROM ruby:2.6.5
+
+WORKDIR /var/app
+COPY Gemfile .
+RUN bundle install
+
+CMD ["bash"]

data/Gemfile

@@ -5,4 +5,5 @@ gem 'simplycop', git: 'https://github.com/simplybusiness/simplycop.git'
 group :development, :test do
   gem 'minitest'
   gem 'rake'
+  gem 'simplecov', '0.17.1'
 end

data/Makefile

@@ -0,0 +1,9 @@
+.PHONY: all build test
+
+all: build test
+
+build:
+	docker build -t simplybusiness/ruby-dev:2.6.5 .
+
+test:
+	docker run -it -v `pwd`:/var/app simplybusiness/ruby-dev:2.6.5 bundle exec rake test

data/README.md

@@ -117,7 +117,7 @@ which will print:
 {"service":{"name":"service name"},"@timestamp":"2020-05-14T10:58:30.780+01:00","log":{"level":"error"},"event":{"action":"HTTP request"},"trace":{"id":"126bb6fa-28a2-470f-b013-eefbf9182b2d"},"message":"Error 500 in /pets/buy","http":{"request":{"method":"post","url.path":"/pet/buy"},"response":{"status_code":500}}}
 ```
 
-## Use of dotted keys
+## Use of dotted keys (DEPRECATED)
 
 Writing nested json objects could be confusing. This library has a built-in feature to convert dotted keys into nested objects, so if you log like this:
 

data/Rakefile

@@ -2,6 +2,6 @@ require 'rake/testtask'
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.test_files = FileList['test/*_test.rb']
+  t.test_files = FileList['test/test_coverage.rb', 'test/*_test.rb', 'examples/rack/request_logger_test.rb']
   t.verbose = true
 end

data/examples/rack/example_rack_app.rb

@@ -0,0 +1,17 @@
+require 'twiglet/logger'
+require 'request_logger'
+
+# basic rack application
+class Application
+  def call(_env)
+    status  = 200
+    headers = { "Content-Type" => "text/json" }
+    body    = ["Example rack app"]
+
+    [status, headers, body]
+  end
+end
+
+use RequestLogger, Twiglet::Logger.new('example_app')
+
+run Application.new

data/examples/rack/request_logger.rb

@@ -0,0 +1,49 @@
+# Middleware for logging request logs
+class RequestLogger
+  def initialize(app, logger)
+    @app = app
+    @logger = logger
+  end
+
+  def call(env)
+    status, headers, body = @app.call(env)
+    log(env, status)
+    [status, headers, body]
+  rescue StandardError => e
+    log_error(env, 500, e)
+    [500, {}, body]
+  end
+
+  private
+
+  def log(env, status)
+    fields = get_fields(env, status)
+    @logger.info(fields)
+  end
+
+  def log_error(env, status, error)
+    fields = get_fields(env, status)
+    @logger.error(fields, error)
+  end
+
+  def get_fields(env, status)
+    message = "#{env['REQUEST_METHOD']}: #{env['PATH_INFO']}"
+
+    {
+      http: {
+        request: {
+          method: env['REQUEST_METHOD'],
+          server: env['SERVER_NAME'],
+          https_enabled: env['HTTPS'],
+          path: env['PATH_INFO'],
+          query: env['QUERY_STRING']  # Don't log PII query params
+        },
+        response: {
+          status: status,
+          body: { bytes: env['CONTENT_LENGTH'] }
+        }
+      },
+      message: message
+    }
+  end
+end

data/examples/rack/request_logger_test.rb

@@ -0,0 +1,66 @@
+require 'minitest/autorun'
+require_relative './request_logger'
+require 'rack'
+
+describe RequestLogger do
+  let(:output) { StringIO.new }
+
+  before { output.rewind }
+
+  it 'log should not be empty' do
+    request.get("/some/path")
+    log = output.string
+    refute_empty log
+  end
+
+  it 'logs the request data' do
+    request.get("/some/path?some_var=1")
+    log = JSON.parse(output.string)
+    http_body = {
+      "request" => {
+        "https_enabled" => "off",
+        "method" => "GET",
+        "path" => "/some/path",
+        "query" => "some_var=1",
+        "server" => "example.org"
+      },
+      "response" => {
+        "status" => 200,
+        "body" => { "bytes" => "0" }
+      }
+    }
+    assert_equal http_body, log["http"]
+    assert_equal "GET: /some/path", log["message"]
+  end
+
+  it 'does not log PII' do
+    request.post("/user/info", input_data: {credit_card_no: '1234'})
+    log = output.string
+    assert_includes log, "POST: /user/info"
+    refute_includes log, 'credit_card_no'
+    refute_includes log, '1234'
+  end
+
+  it 'logs an error message when a request is bad' do
+    bad_request.get("/some/path")
+    log = JSON.parse(output.string)
+    assert_equal 'error', log['log']['level']
+    assert_equal 'some exception', log['error']['message']
+  end
+end
+
+def request
+  app = ->(env) { [200, env, "app"] }
+  base_request(app)
+end
+
+def bad_request
+  app = Rack::Lint.new ->(_env) { raise StandardError, 'some exception' }
+  base_request(app)
+end
+
+def base_request(app)
+  logger = Twiglet::Logger.new('example', output: output)
+  req_logger = RequestLogger.new(app, logger)
+  Rack::MockRequest.new(req_logger)
+end

data/lib/twiglet/formatter.rb

@@ -50,6 +50,9 @@ module Twiglet
 
     def log_message(level, message:)
       base_message = {
+        ecs: {
+          version: '1.5.0'
+        },
         "@timestamp": @now.call.iso8601(3),
         service: {
           name: @service_name

data/lib/twiglet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Twiglet
-  VERSION = '2.3.3'
+  VERSION = '2.3.8'
 end

data/test/formatter_test.rb

@@ -17,6 +17,9 @@ describe Twiglet::Formatter do
   it 'returns a formatted log from a string message' do
     msg = @formatter.call('warn', nil, nil, 'shop is running low on dog food')
     expected_log = {
+      "ecs" => {
+        "version" => '1.5.0'
+      },
       "@timestamp" => '2020-05-11T15:01:01.000Z',
       "service" => {
         "name" => 'petshop'

data/test/logger_test.rb

@@ -49,6 +49,9 @@ describe Twiglet::Logger do
 
       expected_log = {
         message: 'Out of pets exception',
+        ecs: {
+          version: '1.5.0'
+        },
         "@timestamp": '2020-05-11T15:01:01.000Z',
         service: {
           name: 'petshop'
@@ -136,10 +139,10 @@ describe Twiglet::Logger do
       @logger.info({message: 'there'})
 
       expected_output =
-        '{"@timestamp":"2020-05-11T15:01:01.000Z",'\
+        '{"ecs":{"version":"1.5.0"},"@timestamp":"2020-05-11T15:01:01.000Z",'\
         '"service":{"name":"petshop"},"log":{"level":"debug"},"message":"hi"}'\
         "\n"\
-        '{"@timestamp":"2020-05-11T15:01:01.000Z",'\
+        '{"ecs":{"version":"1.5.0"},"@timestamp":"2020-05-11T15:01:01.000Z",'\
         '"service":{"name":"petshop"},"log":{"level":"info"},"message":"there"}'\
         "\n"\
 
@@ -251,6 +254,9 @@ describe Twiglet::Logger do
 
       expected_log = {
         message: 'Out of pets exception',
+        ecs: {
+          version: '1.5.0'
+        },
         "@timestamp": '2020-05-11T15:01:01.000Z',
         service: {
           name: 'petshop'

data/test/test_coverage.rb

@@ -0,0 +1,13 @@
+require 'simplecov'
+
+SimpleCov.start do
+  add_filter "/test/"
+  add_filter "examples/rack/request_logger_test.rb"
+
+  if ENV['CI']
+    formatter SimpleCov::Formatter::SimpleFormatter
+  else
+    formatter SimpleCov::Formatter::MultiFormatter.new([SimpleCov::Formatter::SimpleFormatter,
+                                                        SimpleCov::Formatter::HTMLFormatter])
+  end
+end

data/twiglet.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files            = `git ls-files -- {test}/*`.split("\n")
 
   gem.require_paths         = ['lib']
-  gem.required_ruby_version = '>= 2.6'
+  gem.required_ruby_version = '>= 2.5'
 
   gem.license               = 'Copyright SimplyBusiness'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twiglet
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.8
 platform: ruby
 authors:
 - Simply Business
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies: []
 description: Like a log, only smaller.
 email:
@@ -20,16 +20,22 @@ files:
 - ".github/CODEOWNERS"
 - ".github/workflows/gem-publish.yml"
 - ".github/workflows/ruby.yml"
+- ".github/workflows/version-forget-me-not.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - LICENSE
+- Makefile
 - RATIONALE.md
 - README.md
 - Rakefile
 - example_app.rb
+- examples/rack/example_rack_app.rb
+- examples/rack/request_logger.rb
+- examples/rack/request_logger_test.rb
 - lib/hash_extensions.rb
 - lib/twiglet/formatter.rb
 - lib/twiglet/logger.rb
@@ -37,6 +43,7 @@ files:
 - test/formatter_test.rb
 - test/hash_extensions_test.rb
 - test/logger_test.rb
+- test/test_coverage.rb
 - twiglet.gemspec
 homepage: https://github.com/simplybusiness/twiglet-ruby
 licenses:
@@ -50,7 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="