appsignal 3.3.4 → 3.3.6

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.3.6
+
+### Changed
+
+- [962d069c](https://github.com/appsignal/appsignal-ruby/commit/962d069ce46fd7bf404a2ce28343e1f650ce3b37) patch - Bump agent to 8d042e2.
+  
+  - Support multiple log formats.
+
+## 3.3.5
+
+### Changed
+
+- [fc85adde](https://github.com/appsignal/appsignal-ruby/commit/fc85adde11d7a35b1ca64c0f0714c6fcdd570590) patch - Bump agent to 0d593d5.
+  
+  - Report shared memory metric state.
+
 ## 3.3.4
 
 ### Added

data/build_matrix.yml

@@ -199,9 +199,9 @@ matrix:
       gems: "minimal"
     - ruby: "2.6.9"
     - ruby: "2.7.7"
-    - ruby: "3.0.4"
-    - ruby: "3.1.2"
-    - ruby: "3.2.0"
+    - 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"
@@ -214,23 +214,23 @@ matrix:
     - gem: "hanami"
       only:
         ruby:
-          - "3.0.4"
-          - "3.1.2"
-          - "3.2.0"
+          - "3.0.5"
+          - "3.1.3"
+          - "3.2.1"
     - gem: "http5"
     - gem: "padrino"
     - gem: "psych-3"
       only:
         ruby:
-          - "3.0.4"
-          - "3.1.2"
-          - "3.2.0"
+          - "3.0.5"
+          - "3.1.3"
+          - "3.2.1"
     - gem: "psych-4"
       only:
         ruby:
-          - "3.0.4"
-          - "3.1.2"
-          - "3.2.0"
+          - "3.0.5"
+          - "3.1.3"
+          - "3.2.1"
     - gem: "que"
     - gem: "que_beta"
     - gem: "rails-3.2"
@@ -293,7 +293,7 @@ matrix:
           - "2.5.8"
           - "2.6.9"
           - "2.7.7"
-          - "3.0.4"
+          - "3.0.5"
           - "jruby-9.4.0.0"
     - gem: "rails-6.1"
       only:
@@ -301,17 +301,17 @@ matrix:
           - "2.5.8"
           - "2.6.9"
           - "2.7.7"
-          - "3.0.4"
-          - "3.1.2"
-          - "3.2.0"
+          - "3.0.5"
+          - "3.1.3"
+          - "3.2.1"
           - "jruby-9.4.0.0"
     - gem: "rails-7.0"
       only:
         ruby:
           - "2.7.7"
-          - "3.0.4"
-          - "3.1.2"
-          - "3.2.0"
+          - "3.0.5"
+          - "3.1.3"
+          - "3.2.1"
           - "jruby-9.4.0.0"
     - gem: "resque-1"
       bundler: "1.17.3"

data/ext/agent.rb

@@ -4,7 +4,7 @@
 # Modifications to this file will be overwritten with the next agent release.
 
 APPSIGNAL_AGENT_CONFIG = {
-  "version" => "b5fe1ad",
+  "version" => "8d042e2",
   "mirrors" => [
     "https://appsignal-agent-releases.global.ssl.fastly.net",
     "https://d135dj0rjqvssy.cloudfront.net"
@@ -12,131 +12,131 @@ APPSIGNAL_AGENT_CONFIG = {
   "triples" => {
     "x86_64-darwin" => {
       "static" => {
-        "checksum" => "972b26f9b555706ec0663a6fdc520574db26eafa878ade20e58414c64b2ec6fe",
+        "checksum" => "e0142859f35e31b52dcc57418636c05bcb21940ad499bbe255f90a1cf7359bf7",
         "filename" => "appsignal-x86_64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "3c3a0a412e2c489aebb1db930b0470e470d19d18adab05f0a48ab11ef5c9c6a8",
+        "checksum" => "43b01ab821eddb9fda03cedf59ab4bd8ebfca4c0cf011daa0233802fff69fc0b",
         "filename" => "appsignal-x86_64-darwin-all-dynamic.tar.gz"
       }
     },
     "universal-darwin" => {
       "static" => {
-        "checksum" => "972b26f9b555706ec0663a6fdc520574db26eafa878ade20e58414c64b2ec6fe",
+        "checksum" => "e0142859f35e31b52dcc57418636c05bcb21940ad499bbe255f90a1cf7359bf7",
         "filename" => "appsignal-x86_64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "3c3a0a412e2c489aebb1db930b0470e470d19d18adab05f0a48ab11ef5c9c6a8",
+        "checksum" => "43b01ab821eddb9fda03cedf59ab4bd8ebfca4c0cf011daa0233802fff69fc0b",
         "filename" => "appsignal-x86_64-darwin-all-dynamic.tar.gz"
       }
     },
     "aarch64-darwin" => {
       "static" => {
-        "checksum" => "6ca2ae0644fd9bb6ba48226f23862187ba4c449fe4ba78ad90556f373a5e63d1",
+        "checksum" => "5a1ab02452497b29222d580f3e9d3649eb547b8c90338858462d4f221dd18ff9",
         "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "d9f3f12a25cff05768e4185336f58f6899502fc0a9c6e8c2384a286e340f2cc1",
+        "checksum" => "ea6ee98125ae521f3a79c47d942cf9b689a43e48fd172eab62d3dc80a7fea033",
         "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
       }
     },
     "arm64-darwin" => {
       "static" => {
-        "checksum" => "6ca2ae0644fd9bb6ba48226f23862187ba4c449fe4ba78ad90556f373a5e63d1",
+        "checksum" => "5a1ab02452497b29222d580f3e9d3649eb547b8c90338858462d4f221dd18ff9",
         "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "d9f3f12a25cff05768e4185336f58f6899502fc0a9c6e8c2384a286e340f2cc1",
+        "checksum" => "ea6ee98125ae521f3a79c47d942cf9b689a43e48fd172eab62d3dc80a7fea033",
         "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
       }
     },
     "arm-darwin" => {
       "static" => {
-        "checksum" => "6ca2ae0644fd9bb6ba48226f23862187ba4c449fe4ba78ad90556f373a5e63d1",
+        "checksum" => "5a1ab02452497b29222d580f3e9d3649eb547b8c90338858462d4f221dd18ff9",
         "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "d9f3f12a25cff05768e4185336f58f6899502fc0a9c6e8c2384a286e340f2cc1",
+        "checksum" => "ea6ee98125ae521f3a79c47d942cf9b689a43e48fd172eab62d3dc80a7fea033",
         "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
       }
     },
     "aarch64-linux" => {
       "static" => {
-        "checksum" => "1c80e4d09f8ffb6e8dc279b3174ce64f764689c4696acf73858f6bcc5bd17d1f",
+        "checksum" => "0e85a0a13b9457c4ee1f316e92e8d95de9125bbaff90ceb826bcefaaffa413d9",
         "filename" => "appsignal-aarch64-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "9beb58c701212586fbc3b147294ad3b5e4da35a4800dd0a6d9630700ba96f3c3",
+        "checksum" => "77103ab5c9907334998c48464fd742ab21fcbead58195cb6afcfc4797514f34c",
         "filename" => "appsignal-aarch64-linux-all-dynamic.tar.gz"
       }
     },
     "i686-linux" => {
       "static" => {
-        "checksum" => "4974d598e22bc7446b0687916e08d03fbd6269407eb5d8be586a80d74020842b",
+        "checksum" => "0e8a0490ca960bb8e57183156ed4999afbd70cf13c640fe96f9b0e25556075f1",
         "filename" => "appsignal-i686-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "67ac4ac7b9fa44945e0a49a2843f285814046b7f587f9deb58e03b65bead456e",
+        "checksum" => "f19947288f3638f15eeaf8f6ee9aecae6f1f777e4e68820c88bf4fb6941856b9",
         "filename" => "appsignal-i686-linux-all-dynamic.tar.gz"
       }
     },
     "x86-linux" => {
       "static" => {
-        "checksum" => "4974d598e22bc7446b0687916e08d03fbd6269407eb5d8be586a80d74020842b",
+        "checksum" => "0e8a0490ca960bb8e57183156ed4999afbd70cf13c640fe96f9b0e25556075f1",
         "filename" => "appsignal-i686-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "67ac4ac7b9fa44945e0a49a2843f285814046b7f587f9deb58e03b65bead456e",
+        "checksum" => "f19947288f3638f15eeaf8f6ee9aecae6f1f777e4e68820c88bf4fb6941856b9",
         "filename" => "appsignal-i686-linux-all-dynamic.tar.gz"
       }
     },
     "x86_64-linux" => {
       "static" => {
-        "checksum" => "928d57d8a55e90432884ae86e8711c73b49cc76e486320526d54dc466b37070d",
+        "checksum" => "4eec193edeae76e0793789846112ac9127870c90a8ae6e47aa2a8490163733aa",
         "filename" => "appsignal-x86_64-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "6621756bea5ea1f4113387251acc9d5810b6a6eebcec20153a1e0dc78be0ecba",
+        "checksum" => "dcbc99ba30038f03f91232e5a25d76f27fae1a85a1b692e4935c62720e60b4ae",
         "filename" => "appsignal-x86_64-linux-all-dynamic.tar.gz"
       }
     },
     "x86_64-linux-musl" => {
       "static" => {
-        "checksum" => "7bdb2a2c78e3d0bc5c97c0ab393a1009bf2f7f8b5596605b044c2e6adb822be4",
+        "checksum" => "d91d1ed6e775cc00319fca0a4144dff064d31fb6a8a28dbb5027add44e4dab02",
         "filename" => "appsignal-x86_64-linux-musl-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "680505d9ca34603058b6061a21136e147212028009047a27b7cb73d7c1204a88",
+        "checksum" => "87a704506c488a9f6fd582b2191085af9dc3c1ffb10eaa8586691474fc42f595",
         "filename" => "appsignal-x86_64-linux-musl-all-dynamic.tar.gz"
       }
     },
     "aarch64-linux-musl" => {
       "static" => {
-        "checksum" => "54344c422743ae92194956efd962b56b0fb5b9536d54e701ff2e82806898aa0f",
+        "checksum" => "0ff6702bd976871f610f39ff6c2dd73c4535b12c15c81c0d0afab7650e75922d",
         "filename" => "appsignal-aarch64-linux-musl-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "613a107bbf924208852459880b253f09118d0835540fe258f44e36c7fa85ff70",
+        "checksum" => "516656660666791a5158765fdc8181f12c2c08763f257740c6e04d97cdcdb6c2",
         "filename" => "appsignal-aarch64-linux-musl-all-dynamic.tar.gz"
       }
     },
     "x86_64-freebsd" => {
       "static" => {
-        "checksum" => "aaee1c86f0b16579a6a14914249b5c2d0e0328c26a5df0b2f704199600f3d93f",
+        "checksum" => "d973edc7f13cdad2993c415f17a680a4de3288ce57fc5ae0c69ef3a1ccbb2856",
         "filename" => "appsignal-x86_64-freebsd-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "f151d00ffd4a08c1005372908bc7e49a818c2ee0d6134c828b4f9b93a66f92d7",
+        "checksum" => "6720b701bb41257c4fcdb189c7196241c5e43a0a0f20f1614a1a8978e117f5c9",
         "filename" => "appsignal-x86_64-freebsd-all-dynamic.tar.gz"
       }
     },
     "amd64-freebsd" => {
       "static" => {
-        "checksum" => "aaee1c86f0b16579a6a14914249b5c2d0e0328c26a5df0b2f704199600f3d93f",
+        "checksum" => "d973edc7f13cdad2993c415f17a680a4de3288ce57fc5ae0c69ef3a1ccbb2856",
         "filename" => "appsignal-x86_64-freebsd-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "f151d00ffd4a08c1005372908bc7e49a818c2ee0d6134c828b4f9b93a66f92d7",
+        "checksum" => "6720b701bb41257c4fcdb189c7196241c5e43a0a0f20f1614a1a8978e117f5c9",
         "filename" => "appsignal-x86_64-freebsd-all-dynamic.tar.gz"
       }
     }

data/ext/appsignal_extension.c

@@ -720,11 +720,12 @@ static VALUE close_span(VALUE self) {
   return Qnil;
 }
 
-static VALUE a_log(VALUE self, VALUE group, VALUE severity, VALUE message, VALUE attributes) {
+static VALUE a_log(VALUE self, VALUE group, VALUE severity, VALUE format, VALUE message, VALUE attributes) {
   appsignal_data_t* attributes_data;
 
   Check_Type(group, T_STRING);
   Check_Type(severity, T_FIXNUM);
+  Check_Type(format, T_FIXNUM);
   Check_Type(message, T_STRING);
   Check_Type(attributes, RUBY_T_DATA);
 
@@ -733,6 +734,7 @@ static VALUE a_log(VALUE self, VALUE group, VALUE severity, VALUE message, VALUE
   appsignal_log(
       make_appsignal_string(group),
       FIX2INT(severity),
+      FIX2INT(format),
       make_appsignal_string(message),
       attributes_data
    );
@@ -859,7 +861,7 @@ void Init_appsignal_extension(void) {
   // Diagnostics
   rb_define_singleton_method(Extension, "diagnose", diagnose, 0);
   // Logging
-  rb_define_singleton_method(Extension, "log", a_log, 4);
+  rb_define_singleton_method(Extension, "log", a_log, 5);
 
   // Server state
   rb_define_singleton_method(Extension, "get_server_state", get_server_state, 1);

data/lib/appsignal/logger.rb

@@ -6,15 +6,20 @@ require "set"
 module Appsignal
   # Logger that flushes logs to the AppSignal logging service
   class Logger < ::Logger # rubocop:disable Metrics/ClassLength
+    PLAINTEXT = 0
+    LOGFMT = 1
+    JSON = 2
+
     # Create a new logger instance
     #
     # @param group Name of the group for this logger.
     # @param level Log level to filter with
     # @return [void]
-    def initialize(group, level = INFO)
+    def initialize(group, level: INFO, format: PLAINTEXT)
       raise TypeError, "group must be a string" unless group.is_a? String
       @group = group
       @level = level
+      @format = format
     end
 
     # We support the various methods in the Ruby
@@ -51,6 +56,7 @@ module Appsignal
       Appsignal::Extension.log(
         group,
         severity_number,
+        @format,
         message,
         Appsignal::Utils::Data.generate({})
       )
@@ -69,6 +75,7 @@ module Appsignal
       Appsignal::Extension.log(
         @group,
         2,
+        @format,
         message,
         Appsignal::Utils::Data.generate(attributes)
       )
@@ -86,6 +93,7 @@ module Appsignal
       Appsignal::Extension.log(
         @group,
         3,
+        @format,
         message,
         Appsignal::Utils::Data.generate(attributes)
       )
@@ -103,6 +111,7 @@ module Appsignal
       Appsignal::Extension.log(
         @group,
         5,
+        @format,
         message,
         Appsignal::Utils::Data.generate(attributes)
       )
@@ -120,6 +129,7 @@ module Appsignal
       Appsignal::Extension.log(
         @group,
         6,
+        @format,
         message,
         Appsignal::Utils::Data.generate(attributes)
       )
@@ -137,6 +147,7 @@ module Appsignal
       Appsignal::Extension.log(
         @group,
         7,
+        @format,
         message,
         Appsignal::Utils::Data.generate(attributes)
       )

data/lib/appsignal/version.rb

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

data/spec/lib/appsignal/logger_spec.rb

@@ -1,23 +1,22 @@
 describe Appsignal::Logger do
-  let(:level) { ::Logger::DEBUG }
-  let(:logger) { Appsignal::Logger.new("group", level) }
+  let(:logger) { Appsignal::Logger.new("group", :level => ::Logger::DEBUG) }
 
   it "should not create a logger with a nil group" do
     expect do
-      Appsignal::Logger.new(nil, level)
+      Appsignal::Logger.new(nil)
     end.to raise_error(TypeError)
   end
 
   describe "#add" do
     it "should log with a level and message" do
       expect(Appsignal::Extension).to receive(:log)
-        .with("group", 3, "Log message", instance_of(Appsignal::Extension::Data))
+        .with("group", 3, 0, "Log message", instance_of(Appsignal::Extension::Data))
       logger.add(::Logger::INFO, "Log message")
     end
 
     it "should log with a block" do
       expect(Appsignal::Extension).to receive(:log)
-        .with("group", 3, "Log message", instance_of(Appsignal::Extension::Data))
+        .with("group", 3, 0, "Log message", instance_of(Appsignal::Extension::Data))
       logger.add(::Logger::INFO) do
         "Log message"
       end
@@ -25,7 +24,7 @@ describe Appsignal::Logger do
 
     it "should log with a level, message and group" do
       expect(Appsignal::Extension).to receive(:log)
-        .with("other_group", 3, "Log message", instance_of(Appsignal::Extension::Data))
+        .with("other_group", 3, 0, "Log message", instance_of(Appsignal::Extension::Data))
       logger.add(::Logger::INFO, "Log message", "other_group")
     end
 
@@ -34,8 +33,8 @@ describe Appsignal::Logger do
       logger.add(::Logger::INFO, nil)
     end
 
-    context "with debug log level" do
-      let(:level) { ::Logger::INFO }
+    context "with info log level" do
+      let(:logger) { Appsignal::Logger.new("group", :level => ::Logger::INFO) }
 
       it "should skip logging if the level is too low" do
         expect(Appsignal::Extension).not_to receive(:log)
@@ -43,6 +42,16 @@ describe Appsignal::Logger do
       end
     end
 
+    context "with a format set" do
+      let(:logger) { Appsignal::Logger.new("group", :format => Appsignal::Logger::LOGFMT) }
+
+      it "should log and pass the format flag" do
+        expect(Appsignal::Extension).to receive(:log)
+          .with("group", 3, 1, "Log message", instance_of(Appsignal::Extension::Data))
+        logger.add(::Logger::INFO, "Log message")
+      end
+    end
+
     context "with a formatter set" do
       before do
         logger.formatter = proc do |_level, _timestamp, _appname, message|
@@ -52,7 +61,7 @@ describe Appsignal::Logger do
 
       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))
+          .with("other_group", 3, 0, "formatted: 'Log message'", instance_of(Appsignal::Extension::Data))
         logger.add(::Logger::INFO, "Log message", "other_group")
       end
     end
@@ -71,7 +80,7 @@ describe Appsignal::Logger do
           .with({})
           .and_call_original
         expect(Appsignal::Extension).to receive(:log)
-          .with("group", method[1], "Log message", instance_of(Appsignal::Extension::Data))
+          .with("group", method[1], 0, "Log message", instance_of(Appsignal::Extension::Data))
 
         logger.send(method[0], "Log message")
       end
@@ -81,7 +90,7 @@ describe Appsignal::Logger do
           .with({})
           .and_call_original
         expect(Appsignal::Extension).to receive(:log)
-          .with("group", method[1], "Log message", instance_of(Appsignal::Extension::Data))
+          .with("group", method[1], 0, "Log message", instance_of(Appsignal::Extension::Data))
 
         logger.send(method[0]) do
           "Log message"
@@ -95,7 +104,7 @@ describe Appsignal::Logger do
 
       if method[2]
         context "with a lower log level" do
-          let(:level) { method[2] }
+          let(:logger) { Appsignal::Logger.new("group", :level => method[2]) }
 
           it "should skip logging if the level is too low" do
             expect(Appsignal::Extension).not_to receive(:log)
@@ -113,7 +122,7 @@ describe Appsignal::Logger do
 
         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))
+            .with("group", method[1], 0, "formatted: '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.4
+  version: 3.3.6
 platform: ruby
 authors:
 - Robert Beekman
 - Thijs Cadier
 - Tom de Bruijn
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -422,7 +422,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
@@ -439,7 +439,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
 test_files: