appsignal 4.5.13-java → 4.5.14-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05ad2b9b80e1a2b333edb705217ea1a5b372c735275c042a48051c8a5b1ffb1a
-  data.tar.gz: abfeb2be7e98cad19da981bcc54206fad3a6a07308ed5d4ac0b03043c471b716
+  metadata.gz: f950926d9f4dd3ecb9adda4fe69e9bd7c9fa85f64a831c93ca980017ce6f392e
+  data.tar.gz: 4197a339909bce0ee679d5969cd842d1ab28a53d36f5f7eee49f85f6aacb7e63
 SHA512:
-  metadata.gz: 06613e5878a38093819be635c9b7a5c994ed16496959764074ca0efb0e498c3a8b380387d52c7376cbb1de63d84219bd15179b878049dc7a80993b83d230eb86
-  data.tar.gz: 26e857ed78d111e6c504715de0a967992a9c2b16cf22defe5bb388516db882104fe296b93375e77457f60b87c938290f1e010c90f4f2b1a8a881a67964e358cb
+  metadata.gz: 2886c2d88e64ada5f66dd71ad3bd2f6190ab49766e75f06c7e921615d22d8384a9687d3bb365f3f7cb92f1e26abd82c6ac414587952cf627e95ff59bca224135
+  data.tar.gz: 4f05b2d6664dfef43dd94a840268b4e78fe239c1bec43ab3ef531ef35f8e14e6e9a32930ea6f06633e68f623a0998c87f331b5ed4b17d1cd869d7a7eed787743

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # AppSignal for Ruby gem Changelog
 
+## 4.5.14
+
+_Published on 2025-05-27._
+
+### Fixed
+
+- Resolve problems with transactions not being properly closed when using libraries that change Fibers during the transactions. Previously, completed transactions would be attempted to be reused when creating a transaction, when the Fiber would be switched during a transaction. (patch [32733b25](https://github.com/appsignal/appsignal-ruby/commit/32733b25ced393cc7ed4bd6f15f3b6b293b133c5))
+- Fix a config error log message when the config is not active and should not validate the config. (patch [0d114b43](https://github.com/appsignal/appsignal-ruby/commit/0d114b435f63fe11bebce26efe282f90e2eb57aa))
+
 ## 4.5.13
 
 _Published on 2025-05-12._

data/lib/appsignal/config.rb

@@ -393,8 +393,12 @@ module Appsignal
       @valid
     end
 
+    def active_for_env?
+      config_hash[:active]
+    end
+
     def active?
-      @valid && config_hash[:active]
+      valid? && active_for_env?
     end
 
     # @api private
@@ -444,13 +448,16 @@ module Appsignal
       merge(options)
     end
 
-    # @return [void]
+    # Apply any overrides for invalid settings.
     # @api private
-    def validate
-      # Apply any overrides for invalid settings.
+    def apply_overrides
       @override_config = determine_overrides
       merge(override_config)
+    end
 
+    # @return [void]
+    # @api private
+    def validate
       # Strip path from endpoint so we're backwards compatible with
       # earlier versions of the gem.
       # TODO: Move to its own method, maybe in `#[]=`?

data/lib/appsignal/transaction.rb

@@ -27,20 +27,25 @@ module Appsignal
       # @param namespace [String] Namespace of the to be created transaction.
       # @return [Transaction]
       def create(namespace)
-        # Check if we already have a running transaction
+        # Reset the transaction if it was already completed but not cleared
+        if Thread.current[:appsignal_transaction]&.completed?
+          Thread.current[:appsignal_transaction] = nil
+        end
+
         if Thread.current[:appsignal_transaction].nil?
           # If not, start a new transaction
           set_current_transaction(Appsignal::Transaction.new(namespace))
         else
+          transaction = current
           # Otherwise, log the issue about trying to start another transaction
           Appsignal.internal_logger.warn(
             "Trying to start new transaction, but a transaction " \
-              "with id '#{current.transaction_id}' is already running. " \
-              "Using transaction '#{current.transaction_id}'."
+              "with id '#{transaction.transaction_id}' is already running. " \
+              "Using transaction '#{transaction.transaction_id}'."
           )
 
           # And return the current transaction instead
-          current
+          transaction
         end
       end
 
@@ -154,6 +159,7 @@ module Appsignal
       @namespace = namespace
       @paused = false
       @discarded = false
+      @completed = false
       @tags = {}
       @breadcrumbs = []
       @store = Hash.new { |hash, key| hash[key] = {} }
@@ -185,6 +191,11 @@ module Appsignal
       false
     end
 
+    # @api private
+    def completed?
+      @completed
+    end
+
     # @api private
     def complete
       if discarded?
@@ -233,6 +244,7 @@ module Appsignal
 
       sample_data if should_sample
 
+      @completed = true
       @ext.complete
     end
 

data/lib/appsignal/version.rb

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

data/lib/appsignal.rb

@@ -133,8 +133,8 @@ module Appsignal
       _load_config!
       _start_logger
 
-      if config.valid?
-        if config.active?
+      if config.active_for_env?
+        if config.valid?
           @started = true
           internal_logger.info "Starting AppSignal #{Appsignal::VERSION} " \
             "(#{$PROGRAM_NAME}, Ruby #{RUBY_VERSION}, #{RUBY_PLATFORM})"
@@ -153,10 +153,10 @@ module Appsignal
           collect_environment_metadata
           @config.freeze
         else
-          internal_logger.info("Not starting, not active for #{config.env}")
+          internal_logger.info("Not starting, no valid config for this environment")
         end
       else
-        internal_logger.error("Not starting, no valid config for this environment")
+        internal_logger.info("Not starting, not active for #{config.env}")
       end
       nil
     end
@@ -166,7 +166,7 @@ module Appsignal
     # @param env_param [String, NilClass] Used by diagnose CLI to pass through
     #   the environment CLI option value.
     # @api private
-    def _load_config!(env_param = nil, &block)
+    def _load_config!(env_param = nil, &block) # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
       # Ensure it's not an empty string if it's a value
       proper_env_param = env_param&.to_s&.strip
       # Unset it if it's an empty string
@@ -206,9 +206,17 @@ module Appsignal
         # This will load the config/appsignal.yml file automatically
         @config ||= Config.new(context.root_path, context.env)
       end
+
       # Allow a block to be given to customize the config and override any
       # loaded config before it's validated.
       block.call(config) if block_given?
+
+      # Apply any config overrides after the user config has been merged
+      config&.apply_overrides
+
+      # Skip validation if not configured as active for this environment
+      return unless config.active_for_env?
+
       # Validate the config, if present
       config&.validate
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 4.5.13
+  version: 4.5.14
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-12 00:00:00.000000000 Z
+date: 2025-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger