loga 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9144c2b13cb8e6ed178d6ee24e99c9d00d4ce23bf3198d487e1803d221038874
-  data.tar.gz: 2528a6ce89a60dccc50e22f98abd1e4e74ae3f49319adeed42a89a98ad4412f8
+  metadata.gz: 8b069a9b029cfb82d0a179ebb76738b71506eb717c49e0053c135204225f7d4f
+  data.tar.gz: e62a39b1e52025dc1bcd7a8c69b1d8e260f73e954de16f7c9fbfb42529154363
 SHA512:
-  metadata.gz: 1d9b346f49a5661ab32f3cabe4a16edba7757aa5a5d10b830758d1ca12ff70ece723014701a5ba82da7d358736c320af4a91e7dee609ba657d200905b5afdb3f
-  data.tar.gz: e53c366b5efcb67136322cae79fa6f21fcfdbefd654cb982681067b02de0c86d02f678afe02b7e5c3db298024818ba06dd5ac4ad51f0c234ea799a906295782d
+  metadata.gz: 9aae956e2b49cc519590cca3be9d32d6d268871b4d8bc97fb568b66003d3fd7913f04debf445b6cee2ced3a04d1d3af610eb256c48411b3f92fc76b3120c8d51
+  data.tar.gz: 16f42b6af8af4479ae5dfec57f47c27db4b41d9e4b7e58491e289cb5d487316d115fe47723bbf8690c30d692da59bb134a29f2b9eb964b9ff7477a3a5b2fd1f0

data/.circleci/config.yml

@@ -58,21 +58,21 @@ jobs:
           command: |
             ./tmp/cc-test-reporter sum-coverage tmp/codeclimate.*.json -o tmp/codeclimate.total.json
             ./tmp/cc-test-reporter upload-coverage -i tmp/codeclimate.total.json -r $CODECLIMATE_REPO_TOKEN
-  ruby-2.2:
-    docker:
-      - image: circleci/ruby:2.2.10
-    <<: *test_build
   ruby-2.3:
     docker:
-      - image: circleci/ruby:2.3.7
+      - image: circleci/ruby:2.3
     <<: *test_build
   ruby-2.4:
     docker:
-      - image: circleci/ruby:2.4.4
+      - image: circleci/ruby:2.4
     <<: *test_build
   ruby-2.5:
     docker:
-      - image: circleci/ruby:2.5.1
+      - image: circleci/ruby:2.5
+    <<: *test_build
+  ruby-2.6:
+    docker:
+      - image: circleci/ruby:2.6
     <<: *test_build
   rubocop:
     <<: *basic_build
@@ -111,25 +111,25 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - ruby-2.2:
+      - ruby-2.3:
           filters:
             tags:
               only: /.*/
           requires:
             - build
-      - ruby-2.3:
+      - ruby-2.4:
           filters:
             tags:
               only: /.*/
           requires:
             - build
-      - ruby-2.4:
+      - ruby-2.5:
           filters:
             tags:
               only: /.*/
           requires:
             - build
-      - ruby-2.5:
+      - ruby-2.6:
           filters:
             tags:
               only: /.*/
@@ -140,10 +140,10 @@ workflows:
             tags:
               only: /.*/
           requires:
-            - ruby-2.2
             - ruby-2.3
             - ruby-2.4
             - ruby-2.5
+            - ruby-2.6
       - push-to-rubygems:
           filters:
             tags:
@@ -152,7 +152,7 @@ workflows:
               ignore: /.*/
           requires:
             - rubocop
-            - ruby-2.2
             - ruby-2.3
             - ruby-2.4
             - ruby-2.5
+            - ruby-2.6

data/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.4.0] - 2019-09-03
+### Fixed
+- `duration` in the `sidekiq` integration is now calculated correctly
+### Added
+- Add build for ruby 2.6
+### Removed
+- Remove build for ruby 2.2
+
 ## [2.3.1] - 2019-05-14
 ### Added
 New configuration option `hide_pii` which defaults to `true` to hide email addresses in logs that get generate when an email is sent through action_mailer

data/lib/loga/sidekiq/job_logger.rb

@@ -9,14 +9,16 @@ module Loga
 
       EVENT_TYPE = 'sidekiq'.freeze
 
-      attr_reader :started_at, :data
+      def started_at
+        @started_at ||= Time.now
+      end
 
-      def initialize
-        @started_at = Time.now
-        @data = {}
+      def data
+        @data ||= {}
       end
 
       def call(item, _queue)
+        reset_data
         yield
       rescue Exception => ex # rubocop:disable Lint/RescueException
         data['exception'] = ex
@@ -29,6 +31,11 @@ module Loga
 
       private
 
+      def reset_data
+        @data = {}
+        @started_at = Time.now
+      end
+
       def assign_data(item)
         data['created_at']  = item['created_at']
         data['enqueued_at'] = item['enqueued_at']

data/lib/loga/version.rb

@@ -1,3 +1,3 @@
 module Loga
-  VERSION = '2.3.1'.freeze
+  VERSION = '2.4.0'.freeze
 end

data/spec/integration/sidekiq_spec.rb

@@ -21,9 +21,9 @@ end
 describe 'Sidekiq client logger' do
   let(:target) { StringIO.new }
 
-  let(:json_line) do
+  def read_json_log(line:)
     target.rewind
-    JSON.parse(target.read)
+    JSON.parse(target.each_line.drop(line - 1).first)
   end
 
   before do
@@ -117,6 +117,8 @@ describe 'Sidekiq client logger' do
         'version'=> '1.1',
       }
 
+      json_line = read_json_log(line: 1)
+
       aggregate_failures do
         expect(json_line).to include(expected_attributes)
 
@@ -126,6 +128,20 @@ describe 'Sidekiq client logger' do
 
         expect(json_line['short_message']).to match(/MySidekiqWorker with jid:*/)
       end
+
+      # This was a bug - the duration was constantly incresing based on when
+      # the logger was created. https://github.com/FundingCircle/loga/pull/117
+      #
+      # Test that after sleeping for few seconds the duration is still under 500ms
+      sleep 1
+
+      MySidekiqWorker.perform_async('Bob')
+
+      sleep 1
+
+      json_line = read_json_log(line: 2)
+
+      expect(json_line['_duration']).to be < 500
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loga
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Funding Circle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-14 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport