appsignal 3.2.1-java → 3.2.2-java

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.2.2
+
+### Changed
+
+- [2b1964d9](https://github.com/appsignal/appsignal-ruby/commit/2b1964d94eee0b20c12f5c602c427643057e787b) patch - Track new Ruby 3.2 VM cache metrics. In Ruby 3.2 the `class_serial` and `global_constant_state` metrics are no longer reported for the "Ruby (VM) metrics" magic dashboard, because Ruby 3.2 removed these metrics. Instead we will now report the new `constant_cache_invalidations` and `constant_cache_misses` metrics reported by Ruby 3.2.
+- [6804e898](https://github.com/appsignal/appsignal-ruby/commit/6804e89817234c88105d2376687b5574bfc8e8c9) patch - Use log formatter if set in logger
+
 ## 3.2.1
 
 ### Fixed

data/build_matrix.yml

@@ -25,6 +25,12 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
       commands:
         - checkout
         - rm -f $HOME/.rbenv/plugins/rbenv-gem-rehash/etc/rbenv.d/exec/~gem-rehash.bash
+        - |
+          if [ -n "$_LIBYAML" ]; then
+            install-package --update libyaml-dev
+          else
+            echo Skipping libyaml-dev install
+          fi
         - |
           if [ -n "$_C_VERSION" ]; then
             sem-version c $_C_VERSION
@@ -54,8 +60,8 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
       task:
         prologue:
           commands:
-            - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)
-            - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)
+            - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec)
+            - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec)
             - ./support/bundler_wrapper install --jobs=3 --retry=3
         jobs:
         - name: Validate CI setup
@@ -71,15 +77,15 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
         epilogue:
           on_pass:
             commands:
-              - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE) .bundle
-              - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE) $HOME/.gem
+              - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec) .bundle
+              - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec) $HOME/.gem
     - name: Ruby linters
       dependencies: []
       task:
         prologue:
           commands:
-            - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)
-            - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)
+            - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec)
+            - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec)
             - ./support/bundler_wrapper install --jobs=3 --retry=3
         jobs:
         - name: RuboCop
@@ -95,8 +101,8 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
         epilogue:
           on_pass:
             commands:
-              - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE) .bundle
-              - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE) $HOME/.gem
+              - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec) .bundle
+              - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec) $HOME/.gem
     - name: Other linters
       dependencies: []
       task:
@@ -143,16 +149,16 @@ matrix:
       value: "1"
   prologue: # Shared for all jobs in the build matrix
     commands:
-      - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)
-      - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE)
+      - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec)
+      - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec)
       - ./support/install_deps
       - bundle config set clean 'true'
       - ./support/bundler_wrapper install --jobs=3 --retry=3
   epilogue: # Shared for all jobs in the build matrix
     on_pass:
       commands:
-        - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE) .bundle
-        - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE) $HOME/.gem
+        - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec) .bundle
+        - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE)-$(checksum appsignal.gemspec) $HOME/.gem
     on_fail:
       commands:
         - "[ -e ext/install.report ] && cat ext/install.report || echo 'No ext/install.report file found'"
@@ -196,16 +202,16 @@ matrix:
     - ruby: "2.5.8"
       gems: "minimal"
     - ruby: "2.6.9"
-    - ruby: "2.7.5"
-    - ruby: "3.0.3"
-    - ruby: "3.1.1"
-    - ruby: "3.2.0-preview1"
-    - ruby: "jruby-9.2.19.0"
-      gems: "minimal"
+    - ruby: "2.7.7"
+    - ruby: "3.0.4"
+    - ruby: "3.1.2"
+    - ruby: "3.2.0-preview3"
       env_vars:
-        - name: "_C_VERSION"
-          value: "8"
-    - ruby: "jruby-9.3.6.0"
+        - name: "_LIBYAML"
+          value: "1"
+    - ruby: "jruby-9.3.9.0"
+      gems: "minimal"
+    - ruby: "jruby-9.4.0.0"
       gems: "minimal"
   gems:
     - gem: "no_dependencies"
@@ -217,15 +223,15 @@ matrix:
     - gem: "psych-3"
       only:
         ruby:
-          - "3.0.3"
-          - "3.1.1"
-          - "3.2.0-preview1"
+          - "3.0.4"
+          - "3.1.2"
+          - "3.2.0-preview3"
     - gem: "psych-4"
       only:
         ruby:
-          - "3.0.3"
-          - "3.1.1"
-          - "3.2.0-preview1"
+          - "3.0.4"
+          - "3.1.2"
+          - "3.2.0-preview3"
     - gem: "que"
     - gem: "que_beta"
     - gem: "rails-3.2"
@@ -258,7 +264,7 @@ matrix:
           - "2.4.10"
           - "2.5.8"
           - "2.6.9"
-          - "2.7.5"
+          - "2.7.7"
     - gem: "rails-5.1"
       only:
         ruby:
@@ -269,7 +275,7 @@ matrix:
           - "2.4.10"
           - "2.5.8"
           - "2.6.9"
-          - "2.7.5"
+          - "2.7.7"
     - gem: "rails-5.2"
       only:
         ruby:
@@ -280,34 +286,34 @@ matrix:
           - "2.4.10"
           - "2.5.8"
           - "2.6.9"
-          - "2.7.5"
-          - "jruby-9.2.19.0"
+          - "2.7.7"
+          - "jruby-9.3.9.0"
     - gem: "rails-6.0"
       only:
         ruby:
           - "2.5.8"
           - "2.6.9"
-          - "2.7.5"
-          - "3.0.3"
-          - "jruby-9.2.19.0"
+          - "2.7.7"
+          - "3.0.4"
+          - "jruby-9.4.0.0"
     - gem: "rails-6.1"
       only:
         ruby:
           - "2.5.8"
           - "2.6.9"
-          - "2.7.5"
-          - "3.0.3"
-          - "3.1.1"
-          - "3.2.0-preview1"
-          - "jruby-9.2.19.0"
-          - "jruby-9.3.6.0"
+          - "2.7.7"
+          - "3.0.4"
+          - "3.1.2"
+          - "3.2.0-preview3"
+          - "jruby-9.4.0.0"
     - gem: "rails-7.0"
       only:
         ruby:
-          - "2.7.5"
-          - "3.0.3"
-          - "3.1.1"
-          - "3.2.0-preview1"
+          - "2.7.7"
+          - "3.0.4"
+          - "3.1.2"
+          - "3.2.0-preview3"
+          - "jruby-9.4.0.0"
     - gem: "resque-1"
       bundler: "1.17.3"
       only:
@@ -319,7 +325,7 @@ matrix:
           - "2.4.10"
           - "2.5.8"
           - "2.6.9"
-          - "2.7.5"
+          - "2.7.7"
     - gem: "resque-2"
     - gem: "sequel"
     - gem: "sequel-435"
@@ -332,6 +338,6 @@ matrix:
           - "2.4.10"
           - "2.5.8"
           - "2.6.9"
-          - "2.7.5"
+          - "2.7.7"
     - gem: "sinatra"
     - gem: "webmachine"

data/lib/appsignal/logger.rb

@@ -5,7 +5,7 @@ require "set"
 
 module Appsignal
   # Logger that flushes logs to the AppSignal logging service
-  class Logger < ::Logger
+  class Logger < ::Logger # rubocop:disable Metrics/ClassLength
     # Create a new logger instance
     #
     # @param group Name of the group for this logger.
@@ -20,7 +20,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)
+    def add(severity, message = nil, group = nil) # rubocop:disable Metrics/CyclomaticComplexity
       severity ||= UNKNOWN
       return true if severity < level
       group = @group if group.nil?
@@ -33,6 +33,7 @@ module Appsignal
         end
       end
       return if message.nil?
+      message = formatter.call(severity, 0, group, message) if formatter
       severity_number = case severity
                         when DEBUG
                           2
@@ -64,6 +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
       Appsignal::Extension.log(
         @group,
         2,
@@ -80,6 +82,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
       Appsignal::Extension.log(
         @group,
         3,
@@ -96,6 +99,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
       Appsignal::Extension.log(
         @group,
         5,
@@ -112,6 +116,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
       Appsignal::Extension.log(
         @group,
         6,
@@ -128,6 +133,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
       Appsignal::Extension.log(
         @group,
         7,

data/lib/appsignal/probes/mri.rb

@@ -18,17 +18,38 @@ module Appsignal
       def call
         stat = RubyVM.stat
 
-        set_gauge(
-          "ruby_vm",
-          stat[:class_serial],
-          :metric => :class_serial
-        )
-
-        set_gauge(
-          "ruby_vm",
-          stat[:constant_cache] ? stat[:constant_cache].values.sum : stat[:global_constant_state],
-          :metric => :global_constant_state
-        )
+        constant_cache_invalidations = stat[:constant_cache_invalidations]
+        if constant_cache_invalidations
+          set_gauge(
+            "ruby_vm",
+            constant_cache_invalidations,
+            :metric => :constant_cache_invalidations
+          )
+        end
+
+        constant_cache_misses = stat[:constant_cache_misses]
+        if constant_cache_misses
+          set_gauge(
+            "ruby_vm",
+            constant_cache_misses,
+            :metric => :constant_cache_misses
+          )
+        end
+
+        class_serial = stat[:class_serial]
+        if class_serial
+          set_gauge("ruby_vm", class_serial, :metric => :class_serial)
+        end
+
+        global_constant_state =
+          stat[:constant_cache] ? stat[:constant_cache].values.sum : stat[:global_constant_state]
+        if global_constant_state
+          set_gauge(
+            "ruby_vm",
+            global_constant_state,
+            :metric => :global_constant_state
+          )
+        end
 
         set_gauge("thread_count", Thread.list.size)
         if Appsignal::GarbageCollection.enabled?

data/lib/appsignal/version.rb

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

data/spec/lib/appsignal/auth_check_spec.rb

@@ -20,12 +20,7 @@ describe Appsignal::AuthCheck do
   end
 
   def build_uri_query_string(hash)
-    hash.map do |k, v|
-      k.to_s.tap do |s|
-        next unless v
-        s << "=#{v}"
-      end
-    end.join("&")
+    URI.encode_www_form(hash)
   end
 
   describe "#perform" do

data/spec/lib/appsignal/logger_spec.rb

@@ -42,6 +42,20 @@ describe Appsignal::Logger do
         logger.add(::Logger::DEBUG, "Log message")
       end
     end
+
+    context "with a formatter set" do
+      before do
+        logger.formatter = proc do |_level, _timestamp, _appname, message|
+          "formatted: '#{message}'"
+        end
+      end
+
+      it "should log with a level, message and group" do
+        expect(Appsignal::Extension).to receive(:log)
+          .with("other_group", 3, "formatted: 'Log message'", instance_of(Appsignal::Extension::Data))
+        logger.add(::Logger::INFO, "Log message", "other_group")
+      end
+    end
   end
 
   [
@@ -89,6 +103,20 @@ describe Appsignal::Logger do
           end
         end
       end
+
+      context "with a formatter set" do
+        before do
+          logger.formatter = proc do |_level, _timestamp, _appname, message|
+            "formatted: '#{message}'"
+          end
+        end
+
+        it "should log with a level, message and group" do
+          expect(Appsignal::Extension).to receive(:log)
+            .with("group", method[1], "formatted: 'Log message'", instance_of(Appsignal::Extension::Data))
+          logger.send(method[0], "Log message")
+        end
+      end
     end
   end
 end

data/spec/lib/appsignal/probes/mri_spec.rb

@@ -42,10 +42,15 @@ describe Appsignal::Probes::MriProbe do
         allow(GC::Profiler).to receive(:enabled?).and_return(true)
       end
 
-      it "should track vm metrics" do
+      it "should track vm cache metrics" do
         probe.call
-        expect_gauge_value("ruby_vm", :tags => { :metric => :class_serial })
-        expect_gauge_value("ruby_vm", :tags => { :metric => :global_constant_state })
+        if DependencyHelper.ruby_3_2_or_newer?
+          expect_gauge_value("ruby_vm", :tags => { :metric => :constant_cache_invalidations })
+          expect_gauge_value("ruby_vm", :tags => { :metric => :constant_cache_misses })
+        else
+          expect_gauge_value("ruby_vm", :tags => { :metric => :class_serial })
+          expect_gauge_value("ruby_vm", :tags => { :metric => :global_constant_state })
+        end
       end
 
       it "tracks thread counts" do

data/spec/support/helpers/dependency_helper.rb

@@ -13,6 +13,10 @@ module DependencyHelper
     ruby_version >= Gem::Version.new("3.1.0")
   end
 
+  def ruby_3_2_or_newer?
+    ruby_version >= Gem::Version.new("3.2.0")
+  end
+
   def running_jruby?
     Appsignal::System.jruby?
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2022-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -448,7 +448,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com