appsignal 3.6.1-java → 3.6.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73f661b3ecb2fd8f52080f6a08b4f125c2b217f6e50c739cf474cad7c7f4d4fa
-  data.tar.gz: 7729d6172b3f0df044241548f347e2d22bdd0b295454a9bae93cfbc6f72119db
+  metadata.gz: '087bfd6a23d24ba7a74aeb4307eef319da3613b6d6843dc61a7995715d242958'
+  data.tar.gz: 63ec67e524abc5fac18bb85746b0f45b3dcb3aa05870b23fb46d8cf44381054c
 SHA512:
-  metadata.gz: 58f99d19036363569ba38fd5c07af32b24b6814d538c8ad639b7150ea463d42277e4508618094e6ed9055896be1b29ec2461d50db58fdadbbdcbf5c7b75eff69
-  data.tar.gz: 252ed529380e877ba34d3a5b7d921f042835e5d9baab95010fda67d195aa0ee647895f8d0c12a18a086bfc7594179155c83c3635eb3afd66ef265a3fa484a36b
+  metadata.gz: 3b44722132c864d47321fa58a3c8493fdb51a734b988d994f0d2f269152372ae9df9844abb4158870020f9f30fe3b386e0a97fbe757300412b637bb069fe4d68
+  data.tar.gz: e7b735d7384c2c9ef43141b1eb2d2eb2704c9a42d23185fd7748bdb09e786afcf2717b2a8b80ad0401503f9f65b9dd510bbdc3545e48ce40a7e8a0f6ef5ee375

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.6.3
+
+_Published on 2024-03-20._
+
+### Added
+
+- [e50433fb](https://github.com/appsignal/appsignal-ruby/commit/e50433fbcb109ef741a889b0b7e78f16b884bd81) patch - Implement CPU count configuration option. Use it to override the auto-detected, cgroups-provided number of CPUs that is used to calculate CPU usage percentages.
+  
+  To set it, use the the `cpu_count`
+  configuration option or the `APPSIGNAL_CPU_COUNT` environment variable.
+
+### Fixed
+
+- [c6dd9779](https://github.com/appsignal/appsignal-ruby/commit/c6dd9779bb50dd9385da8962ccf1057ca1a44c7a) patch - Add request parameters, path and method tags to errors reported in controllers via the Rails error reporter.
+
+## 3.6.2
+
+_Published on 2024-03-08._
+
+### Fixed
+
+- [c3921865](https://github.com/appsignal/appsignal-ruby/commit/c392186573a72fd9afe22299fabcd14dcfe96139) patch - Revert Rack middleware changes (see [changelog](https://github.com/appsignal/appsignal-ruby/blob/main/CHANGELOG.md#360)) to fix issues relating to Unicorn broken pipe errors and multiple requests merging into a single sample.
+
 ## 3.6.1
 
 _Published on 2024-03-05._
@@ -1451,7 +1474,7 @@ Yanked
 - Support for arrays, literal value types and function arguments in sql lexer
 
 ## 1.2.2
-- Handle out of range numbers in queue lenght and metrics api
+- Handle out of range numbers in queue length and metrics api
 
 ## 1.2.1
 - Use Dir.pwd in CLI install wizard
@@ -1476,7 +1499,7 @@ Yanked
 ## 1.1.7
 - Make logging resilient for closing FD's (daemons gem does this)
 - Add support for using Resque through ActiveJob
-- Rescue more expections in json generation
+- Rescue more exceptions in json generation
 
 ## 1.1.6
 - Generic Rack instrumentation middleware
@@ -1526,7 +1549,7 @@ Yanked
 - Improved sql sanitization
 - Improved mongoid/mongodb sanitization
 - Minor performance improvements
-- Better handling for non-utf8 convertable strings
+- Better handling for non-utf8 convertible strings
 - Make gem installable (but not functional) on JRuby
 
 ## 1.0.4
@@ -1707,7 +1730,7 @@ Yanked
 Yanked
 
 ## 0.8.8
-- Explicitely require securerandom
+- Explicitly require securerandom
 
 ## 0.8.7
 - Dup process action event to avoid threading issue

data/Rakefile

@@ -219,7 +219,7 @@ namespace :build do
     Gem::PackageTask.new(base_gemspec, &block)
   rescue StandardError => e
     puts "Warning: An error occurred defining `build:#{task_name}:gem` Rake task."
-    puts "This task will not be availble."
+    puts "This task will not be available."
     if ENV["DEBUG"]
       puts "#{e}: #{e.message}"
       puts e.backtrace

data/ext/agent.rb

@@ -6,7 +6,7 @@
 # Modifications to this file will be overwritten with the next agent release.
 
 APPSIGNAL_AGENT_CONFIG = {
-  "version" => "0.33.2",
+  "version" => "0.34.1",
   "mirrors" => [
     "https://appsignal-agent-releases.global.ssl.fastly.net",
     "https://d135dj0rjqvssy.cloudfront.net"
@@ -14,131 +14,131 @@ APPSIGNAL_AGENT_CONFIG = {
   "triples" => {
     "x86_64-darwin" => {
       "static" => {
-        "checksum" => "0864691f001133fa479b34b00a682e76f374c40c161e7715756a3c036e3c8798",
+        "checksum" => "351f3dae916d3e84177d8cc35eaeaca5345f4deca9e0925a29353915cc0530d2",
         "filename" => "appsignal-x86_64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "5141528c4293e4bd619107ae79afc8e07fdc8b33835899c5cf3f82ab3d31de8f",
+        "checksum" => "91ecacdf5e826dd21d5da26c07c5ecffd668cb16eaf15388d08a223425e716bb",
         "filename" => "appsignal-x86_64-darwin-all-dynamic.tar.gz"
       }
     },
     "universal-darwin" => {
       "static" => {
-        "checksum" => "0864691f001133fa479b34b00a682e76f374c40c161e7715756a3c036e3c8798",
+        "checksum" => "351f3dae916d3e84177d8cc35eaeaca5345f4deca9e0925a29353915cc0530d2",
         "filename" => "appsignal-x86_64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "5141528c4293e4bd619107ae79afc8e07fdc8b33835899c5cf3f82ab3d31de8f",
+        "checksum" => "91ecacdf5e826dd21d5da26c07c5ecffd668cb16eaf15388d08a223425e716bb",
         "filename" => "appsignal-x86_64-darwin-all-dynamic.tar.gz"
       }
     },
     "aarch64-darwin" => {
       "static" => {
-        "checksum" => "13506e5911523e7107a8cb714e18b3bcb690f3eeef88bf9aff54777ba540fdc4",
+        "checksum" => "fd7359232fbd65f10ee565fcf65f4afa6d7a2ba1a8dead200c34736ca942df16",
         "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "9d4deef17f42dc54981344a5af6b872e06dbd3d317be68b6abeb2403ffd65e23",
+        "checksum" => "a53ed8cc13d2821a4eee1ea7e4e58346125f27309973d4a2e8f059f129e927e2",
         "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
       }
     },
     "arm64-darwin" => {
       "static" => {
-        "checksum" => "13506e5911523e7107a8cb714e18b3bcb690f3eeef88bf9aff54777ba540fdc4",
+        "checksum" => "fd7359232fbd65f10ee565fcf65f4afa6d7a2ba1a8dead200c34736ca942df16",
         "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "9d4deef17f42dc54981344a5af6b872e06dbd3d317be68b6abeb2403ffd65e23",
+        "checksum" => "a53ed8cc13d2821a4eee1ea7e4e58346125f27309973d4a2e8f059f129e927e2",
         "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
       }
     },
     "arm-darwin" => {
       "static" => {
-        "checksum" => "13506e5911523e7107a8cb714e18b3bcb690f3eeef88bf9aff54777ba540fdc4",
+        "checksum" => "fd7359232fbd65f10ee565fcf65f4afa6d7a2ba1a8dead200c34736ca942df16",
         "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "9d4deef17f42dc54981344a5af6b872e06dbd3d317be68b6abeb2403ffd65e23",
+        "checksum" => "a53ed8cc13d2821a4eee1ea7e4e58346125f27309973d4a2e8f059f129e927e2",
         "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
       }
     },
     "aarch64-linux" => {
       "static" => {
-        "checksum" => "76702b5755d5bb45cc05df17dd38389b7e20e105a52324120a45ae1b481c7881",
+        "checksum" => "dfbab18b7faa24684bf0ab57666b6b493356a3da43ecdba2e992b2d6d513cf31",
         "filename" => "appsignal-aarch64-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "bf518ce2cb4a9041fe819b6bf43e1bc793fe52b3e73527687d7812618c8e7407",
+        "checksum" => "865b8f034aa680aa6cdfe77cf117f071f9b5857c92cc7b6f36decfd5b2293b27",
         "filename" => "appsignal-aarch64-linux-all-dynamic.tar.gz"
       }
     },
     "i686-linux" => {
       "static" => {
-        "checksum" => "22cbda11a8d801d75e9394033f5cf28f0ddcff66a2138720f827441bdcf919c2",
+        "checksum" => "ce4a819f3eaa4590795497915e4a20b3fe281a0821364b80d26ffd1391af67a8",
         "filename" => "appsignal-i686-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "157492663e434421499f9cc0b510178387c8968e53bdc6e216db374b86d5c3dc",
+        "checksum" => "195d570b7f6b1ea5d2ced90dc12d68a6627e1886d078258b5483163e52afc620",
         "filename" => "appsignal-i686-linux-all-dynamic.tar.gz"
       }
     },
     "x86-linux" => {
       "static" => {
-        "checksum" => "22cbda11a8d801d75e9394033f5cf28f0ddcff66a2138720f827441bdcf919c2",
+        "checksum" => "ce4a819f3eaa4590795497915e4a20b3fe281a0821364b80d26ffd1391af67a8",
         "filename" => "appsignal-i686-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "157492663e434421499f9cc0b510178387c8968e53bdc6e216db374b86d5c3dc",
+        "checksum" => "195d570b7f6b1ea5d2ced90dc12d68a6627e1886d078258b5483163e52afc620",
         "filename" => "appsignal-i686-linux-all-dynamic.tar.gz"
       }
     },
     "x86_64-linux" => {
       "static" => {
-        "checksum" => "8ff0b1d7bf0cfc1c66e918545a9ab5c29be35c371cde48f64a01c725290599ed",
+        "checksum" => "e55f9ecb4e4b51e9232918216487712b63a7cfea9710763f61077e8d40d53dbe",
         "filename" => "appsignal-x86_64-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "a186c18536c3b7ec4802e852a62154cc976dcb5f554c3d0d8472d5cd7131b02b",
+        "checksum" => "b5edf38f4ac2725907995518a1d09dc09c70cae600d1d3a287e0b6404c2301d2",
         "filename" => "appsignal-x86_64-linux-all-dynamic.tar.gz"
       }
     },
     "x86_64-linux-musl" => {
       "static" => {
-        "checksum" => "a5e0af3e5e1ad908792e79c7c46b59119272e9836e5ea96791c78e3cb12ed132",
+        "checksum" => "8963ebc98405648205a6d8aa371bafa49cb33cd104e0c3e6cc1856ba41fe3d8c",
         "filename" => "appsignal-x86_64-linux-musl-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "17c108a83dff86b2531bf7f348481bb31ece53b4cc62615ca0a34332c0df2970",
+        "checksum" => "6b5bab353f1597e64d0dc7638f02e8a0c4da2b341991f8e8efb251d8f94878a2",
         "filename" => "appsignal-x86_64-linux-musl-all-dynamic.tar.gz"
       }
     },
     "aarch64-linux-musl" => {
       "static" => {
-        "checksum" => "92460560115d540a8140cbc360bd98beba8477e8a73eafd20ee611543b4528df",
+        "checksum" => "34bb72678b896a2a8289a97611a61a297b5a0e6110f5085a683ad93857cdf26c",
         "filename" => "appsignal-aarch64-linux-musl-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "d4749b10a1803080e0b1b0d8f95ef9d1fef0aa694fa0fc405df97812937d8e7c",
+        "checksum" => "999e0bdc36613f9e016b01d4a00fab864b5996472e32ff1e03a0019877cd5e5d",
         "filename" => "appsignal-aarch64-linux-musl-all-dynamic.tar.gz"
       }
     },
     "x86_64-freebsd" => {
       "static" => {
-        "checksum" => "8d8733c2adc0f750553be11b5e54fd614b13207be67863d95c57e4739021a92f",
+        "checksum" => "68e882ba3bc87328953d9bfbb676b00d4199756a7090d5cdc265a4b32d857cc5",
         "filename" => "appsignal-x86_64-freebsd-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "8a9cbdc645b3833766458a252c2a8fefda76c62fceee8be795b286d65cc513c6",
+        "checksum" => "3e770a387ada2e12052929c6f4ea141d05bd3dec5337ca53bbcf1078a6a2537d",
         "filename" => "appsignal-x86_64-freebsd-all-dynamic.tar.gz"
       }
     },
     "amd64-freebsd" => {
       "static" => {
-        "checksum" => "8d8733c2adc0f750553be11b5e54fd614b13207be67863d95c57e4739021a92f",
+        "checksum" => "68e882ba3bc87328953d9bfbb676b00d4199756a7090d5cdc265a4b32d857cc5",
         "filename" => "appsignal-x86_64-freebsd-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "8a9cbdc645b3833766458a252c2a8fefda76c62fceee8be795b286d65cc513c6",
+        "checksum" => "3e770a387ada2e12052929c6f4ea141d05bd3dec5337ca53bbcf1078a6a2537d",
         "filename" => "appsignal-x86_64-freebsd-all-dynamic.tar.gz"
       }
     }

data/lib/appsignal/auth_check.rb

@@ -40,7 +40,7 @@ module Appsignal
     # @return [Array<String/nil, String>] response tuple.
     #   - First value is the response status code.
     #   - Second value is a description of the response and the exception error
-    #     message if an exception occured.
+    #     message if an exception occurred.
     def perform_with_result
       status = perform
       result =

data/lib/appsignal/config.rb

@@ -70,6 +70,7 @@ module Appsignal
       "APPSIGNAL_APP_NAME" => :name,
       "APPSIGNAL_BIND_ADDRESS" => :bind_address,
       "APPSIGNAL_CA_FILE_PATH" => :ca_file_path,
+      "APPSIGNAL_CPU_COUNT" => :cpu_count,
       "APPSIGNAL_DEBUG" => :debug,
       "APPSIGNAL_DNS_SERVERS" => :dns_servers,
       "APPSIGNAL_ENABLE_ALLOCATION_TRACKING" => :enable_allocation_tracking,
@@ -167,6 +168,9 @@ module Appsignal
       APPSIGNAL_IGNORE_NAMESPACES
       APPSIGNAL_REQUEST_HEADERS
     ].freeze
+    ENV_FLOAT_KEYS = %w[
+      APPSIGNAL_CPU_COUNT
+    ].freeze
 
     # @attribute [r] system_config
     #   Config detected on the system level.
@@ -344,6 +348,7 @@ module Appsignal
       ENV["_APPSIGNAL_APP_PATH"]                     = root_path.to_s
       ENV["_APPSIGNAL_BIND_ADDRESS"]                 = config_hash[:bind_address].to_s
       ENV["_APPSIGNAL_CA_FILE_PATH"]                 = config_hash[:ca_file_path].to_s
+      ENV["_APPSIGNAL_CPU_COUNT"]                    = config_hash[:cpu_count].to_s
       ENV["_APPSIGNAL_DEBUG_LOGGING"]                = config_hash[:debug].to_s
       ENV["_APPSIGNAL_DNS_SERVERS"]                  = config_hash[:dns_servers].join(",")
       ENV["_APPSIGNAL_ENABLE_HOST_METRICS"]          = config_hash[:enable_host_metrics].to_s
@@ -444,7 +449,7 @@ module Appsignal
             "'APPSIGNAL_INACTIVE_ON_CONFIG_FILE_ERROR=1' in your system " \
             "environment."
         end
-      message = "An error occured while loading the AppSignal config file. " \
+      message = "An error occurred while loading the AppSignal config file. " \
         "#{extra_message}\n" \
         "File: #{config_file.inspect}\n" \
         "#{e.class.name}: #{e}"
@@ -501,6 +506,14 @@ module Appsignal
         config[ENV_TO_KEY_MAPPING[var]] = env_var.split(",")
       end
 
+      # Configuration with float type
+      ENV_FLOAT_KEYS.each do |var|
+        env_var = ENV.fetch(var, nil)
+        next unless env_var
+
+        config[ENV_TO_KEY_MAPPING[var]] = env_var.to_f
+      end
+
       config
     end
 

data/lib/appsignal/event_formatter/sequel/sql_formatter.rb

@@ -4,7 +4,7 @@ module Appsignal
   class EventFormatter
     # @api private
     module Sequel
-      # Compatability with the sequel-rails gem.
+      # Compatibility with the sequel-rails gem.
       # The sequel-rails gem adds its own ActiveSupport::Notifications events
       # that conflict with our own sequel instrumentor. Without this event
       # formatter the sequel-rails events are recorded without the SQL query

data/lib/appsignal/integrations/railtie.rb

@@ -60,9 +60,13 @@ module Appsignal
           return unless handled
 
           Appsignal.send_error(error) do |transaction|
-            namespace, action_name, tags, custom_data = context_for(context.dup)
+            namespace, action_name, path, method, params, tags, custom_data =
+              context_for(context.dup)
             transaction.set_namespace(namespace) if namespace
             transaction.set_action(action_name) if action_name
+            transaction.set_metadata("path", path)
+            transaction.set_metadata("method", method)
+            transaction.params = params
             transaction.set_sample_data("custom_data", custom_data) if custom_data
 
             tags[:severity] = severity
@@ -81,9 +85,17 @@ module Appsignal
           # Fetch the namespace and action name based on the Rails execution
           # context.
           controller = context.delete(:controller)
+          path = nil
+          method = nil
+          params = nil
           if controller
             namespace = Appsignal::Transaction::HTTP_REQUEST
             action_name = "#{controller.class.name}##{controller.action_name}"
+            unless controller.request.nil?
+              path = controller.request.path
+              method = controller.request.method
+              params = controller.request.filtered_parameters
+            end
           end
           # ActiveJob transaction naming relies on the current AppSignal
           # transaction namespace and action name copying done after this.
@@ -115,7 +127,7 @@ module Appsignal
           end
           tags.merge!(context)
 
-          [namespace, action_name, tags, custom_data]
+          [namespace, action_name, path, method, params, tags, custom_data]
         end
       end
     end

data/lib/appsignal/logger.rb

@@ -64,7 +64,7 @@ module Appsignal
     alias log add
 
     # Log a debug level message
-    # @param message Mesage to log
+    # @param message Message to log
     # @param attributes Attributes to tag the log with
     # @return [void]
     def debug(message = nil, attributes = {})
@@ -77,7 +77,7 @@ module Appsignal
     end
 
     # Log an info level message
-    # @param message Mesage to log
+    # @param message Message to log
     # @param attributes Attributes to tag the log with
     # @return [void]
     def info(message = nil, attributes = {})
@@ -90,7 +90,7 @@ module Appsignal
     end
 
     # Log a warn level message
-    # @param message Mesage to log
+    # @param message Message to log
     # @param attributes Attributes to tag the log with
     # @return [void]
     def warn(message = nil, attributes = {})
@@ -103,7 +103,7 @@ module Appsignal
     end
 
     # Log an error level message
-    # @param message Mesage to log
+    # @param message Message to log
     # @param attributes Attributes to tag the log with
     # @return [void]
     def error(message = nil, attributes = {})
@@ -116,7 +116,7 @@ module Appsignal
     end
 
     # Log a fatal level message
-    # @param message Mesage to log
+    # @param message Message to log
     # @param attributes Attributes to tag the log with
     # @return [void]
     def fatal(message = nil, attributes = {})

data/lib/appsignal/rack/generic_instrumentation.rb

@@ -16,9 +16,7 @@ module Appsignal
         if Appsignal.active?
           call_with_appsignal_monitoring(env)
         else
-          nil_transaction = Appsignal::Transaction::NilTransaction.new
-          status, headers, obody = @app.call(env)
-          [status, headers, Appsignal::Rack::BodyWrapper.wrap(obody, nil_transaction)]
+          @app.call(env)
         end
       end
 
@@ -29,30 +27,19 @@ module Appsignal
           Appsignal::Transaction::HTTP_REQUEST,
           request
         )
-        # We need to complete the transaction if there is an exception inside the `call`
-        # of the app. If there isn't one and the app returns us a Rack response triplet, we let
-        # the BodyWrapper complete the transaction when #close gets called on it
-        # (guaranteed by the webserver)
-        complete_transaction_without_body = false
         begin
           Appsignal.instrument("process_action.generic") do
-            status, headers, obody = @app.call(env)
-            [status, headers, Appsignal::Rack::BodyWrapper.wrap(obody, transaction)]
+            @app.call(env)
           end
         rescue Exception => error # rubocop:disable Lint/RescueException
           transaction.set_error(error)
-          complete_transaction_without_body = true
           raise error
         ensure
-          default_action = env["appsignal.route"] || env["appsignal.action"] || "unknown"
-          transaction.set_action_if_nil(default_action)
+          transaction.set_action_if_nil(env["appsignal.route"] || "unknown")
           transaction.set_metadata("path", request.path)
           transaction.set_metadata("method", request.request_method)
           transaction.set_http_or_background_queue_start
-
-          # Transaction gets completed when the body gets read out, except in cases when
-          # the app failed before returning us the Rack response triplet.
-          Appsignal::Transaction.complete_current! if complete_transaction_without_body
+          Appsignal::Transaction.complete_current!
         end
       end
     end

data/lib/appsignal/rack/rails_instrumentation.rb

@@ -16,9 +16,7 @@ module Appsignal
         if Appsignal.active?
           call_with_appsignal_monitoring(env)
         else
-          nil_transaction = Appsignal::Transaction::NilTransaction.new
-          status, headers, obody = @app.call(env)
-          [status, headers, Appsignal::Rack::BodyWrapper.wrap(obody, nil_transaction)]
+          @app.call(env)
         end
       end
 
@@ -30,17 +28,10 @@ module Appsignal
           request,
           :params_method => :filtered_parameters
         )
-        # We need to complete the transaction if there is an exception exception inside the `call`
-        # of the app. If there isn't one and the app returns us a Rack response triplet, we let
-        # the BodyWrapper complete the transaction when #close gets called on it
-        # (guaranteed by the webserver)
-        complete_transaction_without_body = false
         begin
-          status, headers, obody = @app.call(env)
-          [status, headers, Appsignal::Rack::BodyWrapper.wrap(obody, transaction)]
+          @app.call(env)
         rescue Exception => error # rubocop:disable Lint/RescueException
           transaction.set_error(error)
-          complete_transaction_without_body = true
           raise error
         ensure
           controller = env["action_controller.instance"]
@@ -54,10 +45,7 @@ module Appsignal
           rescue => error
             Appsignal.internal_logger.error("Unable to report HTTP request method: '#{error}'")
           end
-
-          # Transaction gets completed when the body gets read out, except in cases when
-          # the app failed before returning us the Rack response triplet.
-          Appsignal::Transaction.complete_current! if complete_transaction_without_body
+          Appsignal::Transaction.complete_current!
         end
       end
 

data/lib/appsignal/rack/sinatra_instrumentation.rb

@@ -42,9 +42,7 @@ module Appsignal
         if Appsignal.active?
           call_with_appsignal_monitoring(env)
         else
-          nil_transaction = Appsignal::Transaction::NilTransaction.new
-          status, headers, obody = @app.call(env)
-          [status, headers, Appsignal::Rack::BodyWrapper.wrap(obody, nil_transaction)]
+          @app.call(env)
         end
       end
 
@@ -58,19 +56,12 @@ module Appsignal
           request,
           options
         )
-        # We need to complete the transaction if there is an exception exception inside the `call`
-        # of the app. If there isn't one and the app returns us a Rack response triplet, we let
-        # the BodyWrapper complete the transaction when #close gets called on it
-        # (guaranteed by the webserver)
-        complete_transaction_without_body = false
         begin
           Appsignal.instrument("process_action.sinatra") do
-            status, headers, obody = @app.call(env)
-            [status, headers, Appsignal::Rack::BodyWrapper.wrap(obody, transaction)]
+            @app.call(env)
           end
         rescue Exception => error # rubocop:disable Lint/RescueException
           transaction.set_error(error)
-          complete_transaction_without_body = true
           raise error
         ensure
           # If raise_error is off versions of Sinatra don't raise errors, but store
@@ -82,10 +73,7 @@ module Appsignal
           transaction.set_metadata("path", request.path)
           transaction.set_metadata("method", request.request_method)
           transaction.set_http_or_background_queue_start
-
-          # Transaction gets completed when the body gets read out, except in cases when
-          # the app failed before returning us the Rack response triplet.
-          Appsignal::Transaction.complete_current! if complete_transaction_without_body
+          Appsignal::Transaction.complete_current!
         end
       end
 

data/lib/appsignal/rack/streaming_listener.rb

@@ -16,9 +16,7 @@ module Appsignal
         if Appsignal.active?
           call_with_appsignal_monitoring(env)
         else
-          nil_transaction = Appsignal::Transaction::NilTransaction.new
-          status, headers, obody = @app.call(env)
-          [status, headers, Appsignal::Rack::BodyWrapper.wrap(obody, nil_transaction)]
+          @app.call(env)
         end
       end
 
@@ -30,35 +28,46 @@ module Appsignal
           request
         )
 
-        # We need to complete the transaction if there is an exception exception inside the `call`
-        # of the app. If there isn't one and the app returns us a Rack response triplet, we let
-        # the BodyWrapper complete the transaction when #close gets called on it
-        # (guaranteed by the webserver)
-        complete_transaction_without_body = false
-
         # Instrument a `process_action`, to set params/action name
-        begin
+        status, headers, body =
           Appsignal.instrument("process_action.rack") do
-            status, headers, obody = @app.call(env)
-            [status, headers, Appsignal::Rack::BodyWrapper.wrap(obody, transaction)]
+            @app.call(env)
+          rescue Exception => e # rubocop:disable Lint/RescueException
+            transaction.set_error(e)
+            raise e
+          ensure
+            transaction.set_action_if_nil(env["appsignal.action"])
+            transaction.set_metadata("path", request.path)
+            transaction.set_metadata("method", request.request_method)
+            transaction.set_http_or_background_queue_start
           end
-        rescue Exception => error # rubocop:disable Lint/RescueException
-          transaction.set_error(error)
-          complete_transaction_without_body = true
-          raise error
-        ensure
-          transaction.set_action_if_nil(env["appsignal.action"])
-          transaction.set_metadata("path", request.path)
-          transaction.set_metadata("method", request.request_method)
-          transaction.set_http_or_background_queue_start
 
-          # Transaction gets completed when the body gets read out, except in cases when
-          # the app failed before returning us the Rack response triplet.
-          Appsignal::Transaction.complete_current! if complete_transaction_without_body
-        end
+        # Wrap the result body with our StreamWrapper
+        [status, headers, StreamWrapper.new(body, transaction)]
       end
     end
   end
 
-  StreamWrapper = Rack::EnumerableBodyWrapper
+  class StreamWrapper
+    def initialize(stream, transaction)
+      @stream = stream
+      @transaction = transaction
+    end
+
+    def each(&block)
+      @stream.each(&block)
+    rescue Exception => e # rubocop:disable Lint/RescueException
+      @transaction.set_error(e)
+      raise e
+    end
+
+    def close
+      @stream.close if @stream.respond_to?(:close)
+    rescue Exception => e # rubocop:disable Lint/RescueException
+      @transaction.set_error(e)
+      raise e
+    ensure
+      Appsignal::Transaction.complete_current!
+    end
+  end
 end

data/lib/appsignal/version.rb

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

data/lib/appsignal.rb

@@ -305,6 +305,5 @@ require "appsignal/garbage_collection"
 require "appsignal/integrations/railtie" if defined?(::Rails)
 require "appsignal/transaction"
 require "appsignal/version"
-require "appsignal/rack/body_wrapper"
 require "appsignal/rack/generic_instrumentation"
 require "appsignal/transmitter"

data/lib/puma/plugin/appsignal.rb

@@ -18,7 +18,7 @@ Puma::Plugin.create do # rubocop:disable Metrics/BlockLength
 
       loop do
         # Implement similar behavior to minutely probes.
-        # Initial sleep to wait until the app is fully initalized.
+        # Initial sleep to wait until the app is fully initialized.
         # Then loop every 60 seconds and collect the Puma stats as AppSignal
         # metrics.
         sleep sleep_time