appsignal 4.2.0-java → 4.2.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6bfdc67475b0305ea6351a4d7ef572bbbd10a6e99db4eb7693bd371fb886b68
-  data.tar.gz: a2f57f3c3604fb05953949114cf2e3a315c0ab61af40c0d50ee59a2a0c23a87a
+  metadata.gz: 593b01e03ea19eab757769a49b167a62ffba836cb76cbd042905a8612801cd26
+  data.tar.gz: 40a601b88ad6f2922ed089aee5c2775a9f232a446cf45a2e749b710763672f50
 SHA512:
-  metadata.gz: 313fd85eabe8246bd2a9c6c98865cf67ae7674d42ef0f6ef0787429ae14b054c51050a40184c157f0cbb8586613937aedd1447cf672c6d911feaed6faaba408c
-  data.tar.gz: 1243f5f9894c7c7750bbd991a4e9dc7b6b8c5d80f4fd68e77798cccb97b41dc7efd7039e4e3176178f9fda0804c67643f2770098d34ff8c4105f8005320a6799
+  metadata.gz: 42dbba0d05e86174731ba923bb17f166b1aa20e022ac0e4132facb3dc6e4b7559b116042648956dc913491e80befec5e84d154a0446cda9d8fb390c1f14d8568
+  data.tar.gz: efa4ee5f181c43a483845ab92dc641aa11e23a19e375931f44a7e0d33811caf5a1f0f41fcb71010f0ae67efb35cb87577004f01563ce1557dafa6a3dd8423b7b

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # AppSignal for Ruby gem Changelog
 
+## 4.2.2
+
+_Published on 2024-12-16._
+
+### Added
+
+- Support Rails/ActiveSupport tagged logging. When tags are set in apps using `Rails.logger.tagged { ... }` or with the `Rails.application.config.log_tags = [...]` config option, these tags are now included in the collected log messages.
+
+  ```ruby
+  Rails.logger.tagged(["Tag 1", "Tag 2"]) { Rails.logger.info("My message") }
+  ```
+
+  Reports this log message:
+
+  > [Tag 1] [Tag 2] My message
+
+  (patch [41e1e8f0](https://github.com/appsignal/appsignal-ruby/commit/41e1e8f076025da2420cb43c53b5f7211ae45de8))
+
+### Fixed
+
+- Fix a thread safety issue where sending check-in events simultaneously from different threads would cause several check-in schedulers to be initialised internally. This could cause some of the scheduled check-in events to never be sent to AppSignal when `Appsignal.stop` is called. (patch [c372a3f9](https://github.com/appsignal/appsignal-ruby/commit/c372a3f998b78ef5ef259be39fe198433d6ca95e))
+
+## 4.2.1
+
+_Published on 2024-12-04._
+
+### Changed
+
+- Minimize difference between Rack transaction duration and total child event durations. (patch [95c37802](https://github.com/appsignal/appsignal-ruby/commit/95c3780291241fa6de8d2c0ae9bb09d3ce42d18d))
+
 ## 4.2.0
 
 _Published on 2024-11-13._

data/build_matrix.yml

@@ -88,6 +88,7 @@ matrix:
       - "rails-8.0"
 
   ruby:
+    - ruby: "3.4.0-rc1"
     - ruby: "3.3.4"
     - ruby: "3.2.5"
     - ruby: "3.1.6"
@@ -102,6 +103,7 @@ matrix:
     - gem: "dry-monitor"
       only:
         ruby:
+          - "3.4.0-rc1"
           - "3.3.4"
           - "3.2.5"
           - "3.1.6"
@@ -110,6 +112,7 @@ matrix:
     - gem: "hanami-2.0"
       only:
         ruby:
+          - "3.4.0-rc1"
           - "3.3.4"
           - "3.2.5"
           - "3.1.6"
@@ -117,6 +120,7 @@ matrix:
     - gem: "hanami-2.1"
       only:
         ruby:
+          - "3.4.0-rc1"
           - "3.3.4"
           - "3.2.5"
           - "3.1.6"
@@ -124,6 +128,7 @@ matrix:
     - gem: "hanami-2.2"
       only:
         ruby:
+          - "3.4.0-rc1"
           - "3.3.4"
           - "3.2.5"
           - "3.1.6"
@@ -132,6 +137,7 @@ matrix:
     - gem: "psych-3"
       only:
         ruby:
+          - "3.4.0-rc1"
           - "3.3.4"
           - "3.2.5"
           - "3.1.6"
@@ -140,6 +146,7 @@ matrix:
     - gem: "psych-4"
       only:
         ruby:
+          - "3.4.0-rc1"
           - "3.3.4"
           - "3.2.5"
           - "3.1.6"
@@ -165,6 +172,7 @@ matrix:
     - gem: "rails-7.0"
       only:
         ruby:
+          - "3.4.0-rc1"
           - "3.3.4"
           - "3.2.5"
           - "3.1.6"
@@ -174,6 +182,7 @@ matrix:
     - gem: "rails-7.1"
       only:
         ruby:
+          - "3.4.0-rc1"
           - "3.3.4"
           - "3.2.5"
           - "3.1.6"
@@ -182,6 +191,7 @@ matrix:
     - gem: "rails-7.2"
       only:
         ruby:
+          - "3.4.0-rc1"
           - "3.3.4"
           - "3.2.5"
           - "3.1.6"
@@ -189,6 +199,7 @@ matrix:
     - gem: "rails-8.0"
       only:
         ruby:
+          - "3.4.0-rc1"
           - "3.3.4"
           - "3.2.5"
     - gem: "sequel"

data/lib/appsignal/check_in/scheduler.rb

@@ -95,7 +95,11 @@ module Appsignal
         description = Event.describe(events)
 
         begin
-          response = CheckIn.transmitter.transmit(events, :format => :ndjson)
+          @transmitter ||= Transmitter.new(
+            "#{Appsignal.config[:logging_endpoint]}/check_ins/json"
+          )
+
+          response = @transmitter.transmit(events, :format => :ndjson)
 
           if (200...300).include?(response.code.to_i)
             Appsignal.internal_logger.debug("Transmitted #{description}")

data/lib/appsignal/check_in.rb

@@ -3,6 +3,8 @@
 module Appsignal
   module CheckIn
     HEARTBEAT_CONTINUOUS_INTERVAL_SECONDS = 30
+    NEW_SCHEDULER_MUTEX = Mutex.new
+
     class << self
       # @api private
       def continuous_heartbeats
@@ -82,16 +84,15 @@ module Appsignal
         scheduler.schedule(event)
       end
 
-      # @api private
-      def transmitter
-        @transmitter ||= Transmitter.new(
-          "#{Appsignal.config[:logging_endpoint]}/check_ins/json"
-        )
-      end
-
       # @api private
       def scheduler
-        @scheduler ||= Scheduler.new
+        return @scheduler if @scheduler
+
+        NEW_SCHEDULER_MUTEX.synchronize do
+          @scheduler ||= Scheduler.new
+        end
+
+        @scheduler
       end
 
       # @api private

data/lib/appsignal/logger.rb

@@ -37,6 +37,8 @@ module Appsignal
       @format = format
       @mutex = Mutex.new
       @default_attributes = attributes
+      @appsignal_attributes = {}
+      @tags = []
     end
 
     # We support the various methods in the Ruby
@@ -57,6 +59,11 @@ module Appsignal
       end
       return if message.nil?
 
+      if @tags.any?
+        formatted_tags = @tags.map { |tag| "[#{tag}]" }
+        message = "#{formatted_tags.join(" ")} #{message}"
+      end
+
       message = formatter.call(severity, Time.now, group, message) if formatter
 
       unless message.is_a?(String)
@@ -143,6 +150,29 @@ module Appsignal
       add_with_attributes(FATAL, message, @group, attributes)
     end
 
+    # Listen to ActiveSupport tagged logging tags set with `Rails.logger.tagged`.
+    def tagged(tags)
+      @tags.append(*tags)
+      yield self
+    ensure
+      @tags.pop(tags.length)
+    end
+
+    # Listen to ActiveSupport tagged logging tags set with `Rails.config.log_tags`.
+    def push_tags(tags)
+      @tags.append(*tags)
+    end
+
+    # Remove a set of ActiveSupport tagged logging tags set with `Rails.config.log_tags`.
+    def pop_tags(count = 1)
+      @tags.pop(count)
+    end
+
+    # Remove all ActiveSupport tagged logging tags set with `Rails.config.log_tags`.
+    def clear_tags!
+      @tags.clear
+    end
+
     # When using ActiveSupport::TaggedLogging without the broadcast feature,
     # the passed logger is required to respond to the `silence` method.
     # In our case it behaves as the broadcast feature of the Rails logger, but
@@ -159,17 +189,13 @@ module Appsignal
 
     private
 
-    attr_reader :default_attributes
+    attr_reader :default_attributes, :appsignal_attributes
 
     def add_with_attributes(severity, message, group, attributes)
-      Thread.current[:appsignal_logger_attributes] = default_attributes.merge(attributes)
+      @appsignal_attributes = default_attributes.merge(attributes)
       add(severity, message, group)
     ensure
-      Thread.current[:appsignal_logger_attributes] = nil
-    end
-
-    def appsignal_attributes
-      Thread.current.fetch(:appsignal_logger_attributes, {})
+      @appsignal_attributes = {}
     end
   end
 end

data/lib/appsignal/probes/sidekiq.rb

@@ -59,7 +59,11 @@ module Appsignal
         is_sidekiq7 = self.class.sidekiq7_and_greater?
         @adapter = is_sidekiq7 ? Sidekiq7Adapter : Sidekiq6Adapter
 
-        config_string = " with config: #{config}" unless config.empty?
+        unless config.empty?
+          formatted_config =
+            config.map { |key, value| "#{key}: #{value.inspect}" }.join(", ")
+          config_string = " with config: #{formatted_config}"
+        end
         Appsignal.internal_logger.debug("Initializing Sidekiq probe#{config_string}")
         require "sidekiq/api"
       end

data/lib/appsignal/rack/event_handler.rb

@@ -59,6 +59,7 @@ module Appsignal
           return unless request_handler?(request.env[APPSIGNAL_EVENT_HANDLER_ID])
 
           transaction = Appsignal::Transaction.create(Appsignal::Transaction::HTTP_REQUEST)
+          transaction.start_event
           request.env[APPSIGNAL_TRANSACTION] = transaction
 
           request.env[RACK_AFTER_REPLY] ||= []
@@ -83,7 +84,6 @@ module Appsignal
             # One such scenario is when a Puma "lowlevel_error" occurs.
             Appsignal::Transaction.complete_current!
           end
-          transaction.start_event
         end
       end
 

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "4.2.0"
+  VERSION = "4.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.2
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 2024-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger