appsignal 3.3.8 → 3.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a589c3f722ba5db3195ee2b9609e635b046790f296ff5985a8974f20f9b6c28f
-  data.tar.gz: 6b8e85945c4517cedff96f03d304e945f70dbc5f0ee53afb153fe0ed35a8bcdd
+  metadata.gz: 762febba3d00911209c9fd4d6d7c1f55aa89ad38437df3da0fa5b36a00008c7b
+  data.tar.gz: 5cccb7e02b50707e3093025679cd48168379ed2300d855e851eb71d62095f4ff
 SHA512:
-  metadata.gz: 4beb87ea596e6c189b1ed6042fbfe202ce15e519e2e311c82cf2625a6feb7fa70aecbf4c367bfebec01088215fd1b8c1228204f9b684e8bb4ccc96cd531a78c9
-  data.tar.gz: 0b50957a4ba08682831a8f21c7b589f0a2658ed388b17fb6b9980802a8c83f181b8464976cc8a64ab16648a2d776dfe8c723f2cda227dc6c7d954eacd75ab09d
+  metadata.gz: eb3286752fa4a191175612ebb66ea1c8333c29ac74548d510a857aa1bce668d678a255bc995ac979e3f5fff424e9f39fb3883c0e9a835a496b15416b1d3efd5a
+  data.tar.gz: bb15b922ac0460bd0d58d7c5dcf50e95665be21bfc35af5d1a2d8ca400f78c2857fcc0d78f806568927607f55edffc5891c7b536c0554e48abbf90b41a7cc5fd

data/.semaphore/semaphore.yml

@@ -846,7 +846,7 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.6.9 for webmachine
+    - name: Ruby 2.6.9 for webmachine1
       env_vars:
       - *2
       - *3
@@ -855,9 +855,27 @@ blocks:
       - name: RUBY_VERSION
         value: 2.6.9
       - name: GEMSET
-        value: webmachine
+        value: webmachine1
       - name: BUNDLE_GEMFILE
-        value: gemfiles/webmachine.gemfile
+        value: gemfiles/webmachine1.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 2.6.9 for webmachine2
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 2.6.9
+      - name: GEMSET
+        value: webmachine2
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/webmachine2.gemfile
       - name: _RUBYGEMS_VERSION
         value: latest
       - name: _BUNDLER_VERSION
@@ -1239,7 +1257,25 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.7 for webmachine
+    - name: Ruby 2.7.7 for webmachine1
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 2.7.7
+      - name: GEMSET
+        value: webmachine1
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/webmachine1.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 2.7.7 for webmachine2
       env_vars:
       - *2
       - *3
@@ -1248,9 +1284,9 @@ blocks:
       - name: RUBY_VERSION
         value: 2.7.7
       - name: GEMSET
-        value: webmachine
+        value: webmachine2
       - name: BUNDLE_GEMFILE
-        value: gemfiles/webmachine.gemfile
+        value: gemfiles/webmachine2.gemfile
       - name: _RUBYGEMS_VERSION
         value: latest
       - name: _BUNDLER_VERSION
@@ -1596,7 +1632,7 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.0.5 for webmachine
+    - name: Ruby 3.0.5 for webmachine1
       env_vars:
       - *2
       - *3
@@ -1605,9 +1641,27 @@ blocks:
       - name: RUBY_VERSION
         value: 3.0.5
       - name: GEMSET
-        value: webmachine
+        value: webmachine1
       - name: BUNDLE_GEMFILE
-        value: gemfiles/webmachine.gemfile
+        value: gemfiles/webmachine1.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.0.5 for webmachine2
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.0.5
+      - name: GEMSET
+        value: webmachine2
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/webmachine2.gemfile
       - name: _RUBYGEMS_VERSION
         value: latest
       - name: _BUNDLER_VERSION
@@ -1935,7 +1989,7 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.1.3 for webmachine
+    - name: Ruby 3.1.3 for webmachine1
       env_vars:
       - *2
       - *3
@@ -1944,9 +1998,27 @@ blocks:
       - name: RUBY_VERSION
         value: 3.1.3
       - name: GEMSET
-        value: webmachine
+        value: webmachine1
       - name: BUNDLE_GEMFILE
-        value: gemfiles/webmachine.gemfile
+        value: gemfiles/webmachine1.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.1.3 for webmachine2
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.1.3
+      - name: GEMSET
+        value: webmachine2
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/webmachine2.gemfile
       - name: _RUBYGEMS_VERSION
         value: latest
       - name: _BUNDLER_VERSION
@@ -2274,7 +2346,25 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.1 for webmachine
+    - name: Ruby 3.2.1 for webmachine1
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.2.1
+      - name: GEMSET
+        value: webmachine1
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/webmachine1.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.2.1 for webmachine2
       env_vars:
       - *2
       - *3
@@ -2283,9 +2373,9 @@ blocks:
       - name: RUBY_VERSION
         value: 3.2.1
       - name: GEMSET
-        value: webmachine
+        value: webmachine2
       - name: BUNDLE_GEMFILE
-        value: gemfiles/webmachine.gemfile
+        value: gemfiles/webmachine2.gemfile
       - name: _RUBYGEMS_VERSION
         value: latest
       - name: _BUNDLER_VERSION

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.3.9
+
+### Fixed
+
+- [a6db61b9](https://github.com/appsignal/appsignal-ruby/commit/a6db61b9a14a5a3b4ba89c99d35229bcdee98f94) patch - Fixed an error when using our Logging feature with Ruby's default logger formatter.
+
 ## 3.3.8
 
 ### Added

data/build_matrix.yml

@@ -339,4 +339,5 @@ matrix:
           - "2.6.9"
           - "2.7.7"
     - gem: "sinatra"
-    - gem: "webmachine"
+    - gem: "webmachine1"
+    - gem: "webmachine2"

data/gemfiles/{webmachine.gemfile → webmachine1.gemfile}

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'webmachine'
+gem 'webmachine', '~> 1.6'
 gem 'webrick'
 
 gemspec :path => '../'

data/gemfiles/webmachine2.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "webmachine", "~> 2.0"
+gem "webrick"
+
+gemspec :path => "../"

data/lib/appsignal/logger.rb

@@ -9,6 +9,13 @@ module Appsignal
     PLAINTEXT = 0
     LOGFMT = 1
     JSON = 2
+    SEVERITY_MAP = {
+      DEBUG => 2,
+      INFO => 3,
+      WARN => 5,
+      ERROR => 6,
+      FATAL => 7
+    }.freeze
 
     # Create a new logger instance
     #
@@ -25,7 +32,7 @@ module Appsignal
     # We support the various methods in the Ruby
     # logger class by supplying this method.
     # @api private
-    def add(severity, message = nil, group = nil) # rubocop:disable Metrics/CyclomaticComplexity
+    def add(severity, message = nil, group = nil)
       severity ||= UNKNOWN
       return true if severity < level
       group = @group if group.nil?
@@ -38,24 +45,11 @@ module Appsignal
         end
       end
       return if message.nil?
-      message = formatter.call(severity, 0, group, message) if formatter
-      severity_number = case severity
-                        when DEBUG
-                          2
-                        when INFO
-                          3
-                        when WARN
-                          5
-                        when ERROR
-                          6
-                        when FATAL
-                          7
-                        else
-                          0
-                        end
+      message = formatter.call(severity, Time.now, group, message) if formatter
+
       Appsignal::Extension.log(
         group,
-        severity_number,
+        SEVERITY_MAP.fetch(severity, 0),
         @format,
         message,
         Appsignal::Utils::Data.generate({})
@@ -71,7 +65,7 @@ module Appsignal
       return if DEBUG < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      message = formatter.call(DEBUG, 0, @group, message) if formatter
+      message = formatter.call(DEBUG, Time.now, @group, message) if formatter
       Appsignal::Extension.log(
         @group,
         2,
@@ -89,7 +83,7 @@ module Appsignal
       return if INFO < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      message = formatter.call(INFO, 0, @group, message) if formatter
+      message = formatter.call(INFO, Time.now, @group, message) if formatter
       Appsignal::Extension.log(
         @group,
         3,
@@ -107,7 +101,7 @@ module Appsignal
       return if WARN < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      message = formatter.call(WARN, 0, @group, message) if formatter
+      message = formatter.call(WARN, Time.now, @group, message) if formatter
       Appsignal::Extension.log(
         @group,
         5,
@@ -125,7 +119,7 @@ module Appsignal
       return if ERROR < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      message = formatter.call(ERROR, 0, @group, message) if formatter
+      message = formatter.call(ERROR, Time.now, @group, message) if formatter
       Appsignal::Extension.log(
         @group,
         6,
@@ -143,7 +137,7 @@ module Appsignal
       return if FATAL < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      message = formatter.call(FATAL, 0, @group, message) if formatter
+      message = formatter.call(FATAL, Time.now, @group, message) if formatter
       Appsignal::Extension.log(
         @group,
         7,

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "3.3.8".freeze
+  VERSION = "3.3.9".freeze
 end

data/spec/lib/appsignal/logger_spec.rb

@@ -115,14 +115,29 @@ describe Appsignal::Logger do
 
       context "with a formatter set" do
         before do
-          logger.formatter = proc do |_level, _timestamp, _appname, message|
-            "formatted: '#{message}'"
+          Timecop.freeze(Time.local(2023))
+          logger.formatter = logger.formatter = proc do |_level, timestamp, _appname, message|
+            # This line replicates the behaviour of the Ruby default Logger::Formatter
+            # which expects a timestamp object as a second argument
+            # https://github.com/ruby/ruby/blob/master/lib/logger/formatter.rb#L15-L17
+            time = timestamp.strftime("%Y-%m-%dT%H:%M:%S.%6N")
+            "formatted: #{time} '#{message}'"
           end
         end
 
+        after do
+          Timecop.return
+        end
+
         it "should log with a level, message and group" do
           expect(Appsignal::Extension).to receive(:log)
-            .with("group", method[1], 0, "formatted: 'Log message'", instance_of(Appsignal::Extension::Data))
+            .with(
+              "group",
+              method[1],
+              0,
+              "formatted: 2023-01-01T00:00:00.000000 'Log message'",
+              instance_of(Appsignal::Extension::Data)
+            )
           logger.send(method[0], "Log message")
         end
       end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.3.8
+  version: 3.3.9
 platform: ruby
 authors:
 - Robert Beekman
 - Thijs Cadier
 - Tom de Bruijn
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-30 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -182,7 +182,8 @@ files:
 - gemfiles/sequel-435.gemfile
 - gemfiles/sequel.gemfile
 - gemfiles/sinatra.gemfile
-- gemfiles/webmachine.gemfile
+- gemfiles/webmachine1.gemfile
+- gemfiles/webmachine2.gemfile
 - lib/appsignal.rb
 - lib/appsignal/auth_check.rb
 - lib/appsignal/capistrano.rb
@@ -428,7 +429,7 @@ metadata:
   documentation_uri: https://docs.appsignal.com/ruby/
   homepage_uri: https://docs.appsignal.com/ruby/
   source_code_uri: https://github.com/appsignal/appsignal-ruby
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -444,8 +445,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
 test_files: