appsignal 3.3.10-java → 3.4.0-java

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.4.0
+
+### Deprecated
+
+- [6f9b7a4d](https://github.com/appsignal/appsignal-ruby/commit/6f9b7a4d12c6ff3353359cb37c5c02af8bbc6ec6) minor - Remove support for Ruby versions in that are end of life, following our [maintenance policy](https://docs.appsignal.com/support/maintenance-policy.html). Please upgrade your Ruby version to a supported version before upgrading AppSignal.
+
+### Fixed
+
+- [5b7735ac](https://github.com/appsignal/appsignal-ruby/commit/5b7735ac5868b0fbf9727922a32ca4645d4e2fdd) patch - Fix Logger add method signature error
+
 ## 3.3.10
 
 ### Fixed

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec

data/appsignal.gemspec

@@ -1,4 +1,6 @@
-require File.expand_path("../lib/appsignal/version", __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path("lib/appsignal/version", __dir__)
 
 Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
   gem.authors = [
@@ -19,50 +21,28 @@ Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
   gem.name                  = "appsignal"
   gem.require_paths         = %w[lib ext]
   gem.version               = Appsignal::VERSION
-  gem.required_ruby_version = ">= 2.0"
+  gem.required_ruby_version = ">= 3.0"
   # Default extension installer. Overridden by JRuby gemspec as defined in
   # `Rakefile`.
   gem.extensions            = %w[ext/extconf.rb]
 
   gem.metadata = {
     "rubygems_mfa_required" => "true",
-    "bug_tracker_uri"   => "https://github.com/appsignal/appsignal-ruby/issues",
-    "changelog_uri"     =>
+    "bug_tracker_uri" => "https://github.com/appsignal/appsignal-ruby/issues",
+    "changelog_uri" =>
       "https://github.com/appsignal/appsignal-ruby/blob/main/CHANGELOG.md",
     "documentation_uri" => "https://docs.appsignal.com/ruby/",
-    "homepage_uri"      => "https://docs.appsignal.com/ruby/",
-    "source_code_uri"   => "https://github.com/appsignal/appsignal-ruby"
+    "homepage_uri" => "https://docs.appsignal.com/ruby/",
+    "source_code_uri" => "https://github.com/appsignal/appsignal-ruby"
   }
 
   gem.add_dependency "rack"
 
+  gem.add_development_dependency "pry"
   gem.add_development_dependency "rake", ">= 12"
   gem.add_development_dependency "rspec", "~> 3.8"
+  gem.add_development_dependency "rubocop"
   gem.add_development_dependency "timecop"
+  gem.add_development_dependency "webmock"
   gem.add_development_dependency "yard", ">= 0.9.20"
-  gem.add_development_dependency "pry"
-
-  # Dependencies that need to be locked to a specific version in developement
-  ruby_version = Gem::Version.new(RUBY_VERSION)
-  if ruby_version < Gem::Version.new("2.3.0")
-    gem.add_development_dependency "webmock", "3.14.0"
-  else
-    gem.add_development_dependency "webmock"
-  end
-  if ruby_version > Gem::Version.new("2.5.0")
-    # RuboCop dependency parallel depends on Ruby > 2.4
-    gem.add_development_dependency "rubocop", "0.50.0"
-  end
-  if ruby_version < Gem::Version.new("2.1.0")
-    # Newer versions of rexml use keyword arguments with optional arguments which
-    # work in Ruby 2.1 and newer.
-    gem.add_development_dependency "rexml", "3.2.4"
-  end
-  if ruby_version < Gem::Version.new("2.1.0")
-    # public_suffix 3.0 and newer don't support Ruby < 2.1
-    gem.add_development_dependency "public_suffix", "~> 2.0.5"
-  elsif ruby_version < Gem::Version.new("2.3.0")
-    # public_suffix 4.0 and newer don't support Ruby < 2.3
-    gem.add_development_dependency "public_suffix", "~> 3.1.1"
-  end
 end

data/build_matrix.yml

@@ -61,7 +61,7 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
         - name: Validate CI setup
           env_vars:
             - name: RUBY_VERSION
-              value: 2.6.9
+              value: 3.2.2
             - name: GEMSET
               value: no_dependencies
             - name: BUNDLE_GEMFILE
@@ -85,7 +85,7 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
         - name: RuboCop
           env_vars:
             - name: RUBY_VERSION
-              value: 2.6.9
+              value: 3.2.2
             - name: GEMSET
               value: no_dependencies
             - name: BUNDLE_GEMFILE
@@ -165,45 +165,16 @@ matrix:
   gemsets: # By default all gems are tested
     none:
       - "no_dependencies"
-    old_rails:
-      - "no_dependencies"
-      - "rails-3.2"
-      - "rails-4.2"
     minimal:
       - "no_dependencies"
-      - "rails-5.2"
       - "rails-6.0"
       - "rails-6.1"
       - "rails-7.0"
 
   ruby:
-    - ruby: "2.0.0-p648"
-      rubygems: "2.7.8"
-      bundler: "1.17.3"
-      gems: "old_rails"
-    - ruby: "2.1.10"
-      rubygems: "2.7.8"
-      bundler: "1.17.3"
-      gems: "none"
-    - ruby: "2.2.10"
-      rubygems: "2.7.8"
-      bundler: "1.17.3"
-      gems: "none"
-    - ruby: "2.3.8"
-      gems: "none"
-      rubygems: "3.3.26"
-      bundler: "2.3.26"
-    - ruby: "2.4.10"
-      gems: "none"
-    - ruby: "2.5.8"
-      gems: "minimal"
-    - ruby: "2.6.9"
-    - ruby: "2.7.7"
     - ruby: "3.0.5"
     - ruby: "3.1.3"
     - ruby: "3.2.1"
-    - ruby: "jruby-9.3.9.0"
-      gems: "minimal"
     - ruby: "jruby-9.4.0.0"
       gems: "minimal"
   gems:
@@ -233,74 +204,14 @@ matrix:
           - "3.2.1"
     - gem: "que"
     - gem: "que_beta"
-    - gem: "rails-3.2"
-      bundler: "1.17.3"
-      only:
-        ruby:
-          - "2.0.0-p648"
-          - "2.1.10"
-          - "2.2.10"
-          - "2.3.8"
-          - "2.4.10"
-          - "2.5.8"
-    - gem: "rails-4.2"
-      bundler: "1.17.3"
-      only:
-        ruby:
-          - "2.0.0-p648"
-          - "2.1.10"
-          - "2.2.10"
-          - "2.3.8"
-          - "2.4.10"
-          - "2.5.8"
-    - gem: "rails-5.0"
-      only:
-        ruby:
-          - "2.0.0-p648"
-          - "2.1.10"
-          - "2.2.10"
-          - "2.3.8"
-          - "2.4.10"
-          - "2.5.8"
-          - "2.6.9"
-          - "2.7.7"
-    - gem: "rails-5.1"
-      only:
-        ruby:
-          - "2.0.0-p648"
-          - "2.1.10"
-          - "2.2.10"
-          - "2.3.8"
-          - "2.4.10"
-          - "2.5.8"
-          - "2.6.9"
-          - "2.7.7"
-    - gem: "rails-5.2"
-      only:
-        ruby:
-          - "2.0.0-p648"
-          - "2.1.10"
-          - "2.2.10"
-          - "2.3.8"
-          - "2.4.10"
-          - "2.5.8"
-          - "2.6.9"
-          - "2.7.7"
-          - "jruby-9.3.9.0"
     - gem: "rails-6.0"
       only:
         ruby:
-          - "2.5.8"
-          - "2.6.9"
-          - "2.7.7"
           - "3.0.5"
           - "jruby-9.4.0.0"
     - gem: "rails-6.1"
       only:
         ruby:
-          - "2.5.8"
-          - "2.6.9"
-          - "2.7.7"
           - "3.0.5"
           - "3.1.3"
           - "3.2.1"
@@ -308,36 +219,11 @@ matrix:
     - gem: "rails-7.0"
       only:
         ruby:
-          - "2.7.7"
           - "3.0.5"
           - "3.1.3"
           - "3.2.1"
           - "jruby-9.4.0.0"
-    - gem: "resque-1"
-      bundler: "1.17.3"
-      only:
-        ruby:
-          - "2.0.0-p648"
-          - "2.1.10"
-          - "2.2.10"
-          - "2.3.8"
-          - "2.4.10"
-          - "2.5.8"
-          - "2.6.9"
-          - "2.7.7"
-    - gem: "resque-2"
     - gem: "sequel"
-    - gem: "sequel-435"
-      only:
-        ruby:
-          - "2.0.0-p648"
-          - "2.1.10"
-          - "2.2.10"
-          - "2.3.8"
-          - "2.4.10"
-          - "2.5.8"
-          - "2.6.9"
-          - "2.7.7"
     - gem: "sinatra"
     - gem: "webmachine1"
     - gem: "webmachine2"

data/lib/appsignal/logger.rb

@@ -2,6 +2,7 @@
 
 require "logger"
 require "set"
+require "thread"
 
 module Appsignal
   # Logger that flushes logs to the AppSignal logging service
@@ -27,12 +28,13 @@ module Appsignal
       @group = group
       @level = level
       @format = format
+      @mutex = Mutex.new
     end
 
     # We support the various methods in the Ruby
     # logger class by supplying this method.
     # @api private
-    def add(severity, message = nil, group = nil, attributes = {})
+    def add(severity, message = nil, group = nil)
       severity ||= UNKNOWN
       return true if severity < level
       group = @group if group.nil?
@@ -52,7 +54,7 @@ module Appsignal
         SEVERITY_MAP.fetch(severity, 0),
         @format,
         message,
-        Appsignal::Utils::Data.generate(attributes)
+        Appsignal::Utils::Data.generate(appsignal_attributes)
       )
     end
     alias log add
@@ -65,7 +67,7 @@ module Appsignal
       return if DEBUG < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      add(DEBUG, message, @group, attributes)
+      add_with_attributes(DEBUG, message, @group, attributes)
     end
 
     # Log an info level message
@@ -76,7 +78,7 @@ module Appsignal
       return if INFO < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      add(INFO, message, @group, attributes)
+      add_with_attributes(INFO, message, @group, attributes)
     end
 
     # Log a warn level message
@@ -87,7 +89,7 @@ module Appsignal
       return if WARN < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      add(WARN, message, @group, attributes)
+      add_with_attributes(WARN, message, @group, attributes)
     end
 
     # Log an error level message
@@ -98,7 +100,7 @@ module Appsignal
       return if ERROR < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      add(ERROR, message, @group, attributes)
+      add_with_attributes(ERROR, message, @group, attributes)
     end
 
     # Log a fatal level message
@@ -109,7 +111,20 @@ module Appsignal
       return if FATAL < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      add(FATAL, message, @group, attributes)
+      add_with_attributes(FATAL, message, @group, attributes)
+    end
+
+    private
+
+    def add_with_attributes(severity, message, group, attributes)
+      Thread.current[:appsignal_logger_attributes] = attributes
+      add(severity, message, group)
+    ensure
+      Thread.current[:appsignal_logger_attributes] = nil
+    end
+
+    def appsignal_attributes
+      Thread.current.fetch(:appsignal_logger_attributes, {})
     end
   end
 end

data/lib/appsignal/version.rb

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

data/spec/lib/appsignal/logger_spec.rb

@@ -76,13 +76,15 @@ describe Appsignal::Logger do
   ].each do |method|
     describe "##{method[0]}" do
       it "should log with a message" do
+        # rubocop:disable Style/BracesAroundHashParameters
         expect(Appsignal::Utils::Data).to receive(:generate)
-          .with({})
+          .with({ :attribute => "value" })
           .and_call_original
+        # rubocop:enable Style/BracesAroundHashParameters
         expect(Appsignal::Extension).to receive(:log)
           .with("group", method[1], 0, "Log message", instance_of(Appsignal::Extension::Data))
 
-        logger.send(method[0], "Log message")
+        logger.send(method[0], "Log message", :attribute => "value")
       end
 
       it "should log with a block" do

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.3.10
+  version: 3.4.0
 platform: java
 authors:
 - Robert Beekman
 - Thijs Cadier
 - Tom de Bruijn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-03 00:00:00.000000000 Z
+date: 2023-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -26,6 +26,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -55,7 +69,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,21 +83,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.20
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.20
-- !ruby/object:Gem::Dependency
-  name: pry
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,19 +111,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.9.20
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -183,17 +183,10 @@ files:
 - gemfiles/psych-4.gemfile
 - gemfiles/que.gemfile
 - gemfiles/que_beta.gemfile
-- gemfiles/rails-3.2.gemfile
-- gemfiles/rails-4.2.gemfile
-- gemfiles/rails-5.0.gemfile
-- gemfiles/rails-5.1.gemfile
-- gemfiles/rails-5.2.gemfile
 - gemfiles/rails-6.0.gemfile
 - gemfiles/rails-6.1.gemfile
 - gemfiles/rails-7.0.gemfile
-- gemfiles/resque-1.gemfile
 - gemfiles/resque-2.gemfile
-- gemfiles/sequel-435.gemfile
 - gemfiles/sequel.gemfile
 - gemfiles/sinatra.gemfile
 - gemfiles/webmachine1.gemfile
@@ -443,7 +436,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
@@ -452,15 +445,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
 test_files:

data/gemfiles/rails-3.2.gemfile

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~> 3.2.14'
-gem 'test-unit'
-
-gem "rack-cache", "~> 1.9.0"
-
-gemspec :path => '../'

data/gemfiles/rails-4.2.gemfile

@@ -1,23 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~> 4.2.0'
-gem 'mime-types', '~> 2.6'
-
-ruby_version = Gem::Version.new(RUBY_VERSION)
-if ruby_version < Gem::Version.new("2.3.0")
-  gem "sidekiq", "~> 4.0"
-else
-  gem "sidekiq"
-end
-
-if ruby_version < Gem::Version.new("2.1.0")
-  gem 'nokogiri', '~> 1.6.0'
-end
-if ruby_version < Gem::Version.new("2.5.0")
-  gem 'sprockets', '~> 3.7.2'
-end
-
-gem "minitest", "5.12.0"
-gem "connection_pool", "2.2.3"
-
-gemspec :path => '../'

data/gemfiles/rails-5.0.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~> 5.0.0'
-gem "sidekiq"
-
-gemspec :path => '../'

data/gemfiles/rails-5.1.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~> 5.1.0'
-gem "sidekiq"
-
-gemspec :path => '../'

data/gemfiles/rails-5.2.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~> 5.2.0'
-gem "sidekiq"
-
-gemspec :path => '../'

data/gemfiles/resque-1.gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'resque', "~> 1.27.0"
-gem 'sinatra'
-gem 'mime-types', '~> 2.6'
-
-gemspec :path => '../'

data/gemfiles/sequel-435.gemfile

@@ -1,10 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'sequel', '~> 4.35'
-if RUBY_PLATFORM == "java"
-  gem 'jdbc-sqlite3'
-else
-  gem 'sqlite3'
-end
-
-gemspec :path => '../'