speedshop-cloudwatch 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19039fb6a3ef58a84cae232f0c6a501451c2ee7d52a49762aca926f9e22f733c
-  data.tar.gz: f8084e387ec56912545f0c4b04edf6f26210f57fb015189578311ce5dfc421d2
+  metadata.gz: a4d2d47eedd3f9ad965073f7569d707bee70f2b4bb35f7b7f97f4197d9016b9c
+  data.tar.gz: d2bc25a79ba9893fa45a8a8843949ef42a7e70b5ab054ced8031446148bed927
 SHA512:
-  metadata.gz: 2b62fe5780fd5646a230f51c8b5d4cd4dfb2ef47915cf9ddd983dbe0af00c97d5b52106c4e74729b771c3466a4d872ef2965653c5f2e3606a405158a71f65ffd
-  data.tar.gz: e49872a3eb6a96dc6a51f14defcf77b6139d3a2bb7479e0c33600fbfb956f291337ab32f549e7beb40befa3094f3a51ee6859fd10008b42b7784c9f24c37ebc7
+  metadata.gz: ae73508f29611fba12c522b3e84d82331026638892d2b540ede54a951a9e5314254c59a1620f5d423c0f592a7017f526233b938873107348231faf0a8db1c4b6
+  data.tar.gz: eb65e33a190b8d4a33686dd2c63f59ba504b0f585a2cb3d730f09274e89809acfa9ba0034caaef272b4f02fe3a0029c1373f03f684c9d3db2e03e4f1e9b8eab2

data/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.1] - 2026-06-09
+
+### Fixed
+- Improved Rack request queue time parsing for common `X-Request-Start` and `X-Queue-Start` formats, including `t=` prefixes, seconds, milliseconds, microseconds, and comma-separated header values.
+- Subtracted Puma request body wait time from Rack queue time when `env["puma.request_body_wait"]` is available, so slow uploads are not counted as upstream queueing.
+
 ## [0.2.0] - 2026-04-13
 
 ### Added
@@ -21,5 +27,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial public release.
 
+[0.2.1]: https://github.com/speedshop/speedshop-cloudwatch/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/speedshop/speedshop-cloudwatch/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/speedshop/speedshop-cloudwatch/releases/tag/v0.1.0

data/README.md

@@ -144,7 +144,9 @@ If you're using Rails, we'll automatically insert the correct middleware into th
 
 If you're using some other Rack-based framework, insert the `Speedshop::Cloudwatch::Rack` high up (i.e. first) in the stack.
 
-You will need a reverse proxy, such as nginx, adding an `X-Request-Start` or `X-Queue-Start` header (containing the time since the Unix epoch in milliseconds) to incoming requests. See [New Relic's instructions](https://docs.newrelic.com/docs/apm/applications-menu/features/configure-request-queue-reporting/) for more about how to do this.
+You will need a reverse proxy, such as nginx, adding an `X-Request-Start` or `X-Queue-Start` header to incoming requests. The header may use common queue-time formats such as epoch milliseconds (`1512379167574`), seconds with decimals (`t=1512379167.574`), or microseconds (`t=1570633834463123`). See [New Relic's instructions](https://docs.newrelic.com/docs/apm/applications-menu/features/configure-request-queue-reporting/) for more about how to do this.
+
+When Puma exposes `env["puma.request_body_wait"]`, we subtract it from queue time so slow request-body uploads are not counted as upstream queueing.
 
 We report the following metrics:
 

data/lib/speedshop/cloudwatch/metrics.rb

@@ -162,7 +162,7 @@ module Speedshop
           description: "Time a request spent waiting in the reverse proxy before " \
                        "reaching the application. High values indicate requests " \
                        "backing up before reaching your application server.",
-          source: "(Time.now.to_f * 1000) - HTTP_X_REQUEST_START"
+          source: "parsed X-Request-Start/X-Queue-Start timestamp minus Puma request body wait"
         )
       ],
 

data/lib/speedshop/cloudwatch/observations/rack.rb

@@ -4,17 +4,57 @@ module Speedshop
   module Cloudwatch
     module Observations
       module Rack
+        class HeaderTimestampParser
+          MIN_EPOCH = Time.utc(2000, 1, 1).to_f
+          FUTURE_TOLERANCE = 30.0
+          DIVISORS = [1_000_000.0, 1_000.0, 1.0].freeze
+          NUMBER_RE = /[+-]?(?:\d+(?:\.\d+)?|\.\d+)/
+          T_EQUALS_RE = /t\s*=\s*(#{NUMBER_RE.source})/i
+
+          def parse(value, now:)
+            header_value = value.to_s.split(",", 2).first.to_s.strip
+            return if header_value.empty?
+
+            token = header_value[T_EQUALS_RE, 1] || header_value[NUMBER_RE, 0]
+            normalize(Float(token), now) if token
+          rescue ArgumentError, TypeError
+          end
+
+          private
+
+          def normalize(raw, now)
+            max = now + FUTURE_TOLERANCE
+            divisor = DIVISORS.find { |d| (raw / d).between?(MIN_EPOCH, max) }
+            raw / divisor if divisor
+          end
+        end
+
         module_function
 
         def request_queue_time(env, now_ms: current_time_ms)
-          header = env["HTTP_X_REQUEST_START"] || env["HTTP_X_QUEUE_START"]
-          return unless header
+          now = now_ms / 1_000.0
+          request_start = header_timestamp_parser.parse(env["HTTP_X_REQUEST_START"], now: now) ||
+            header_timestamp_parser.parse(env["HTTP_X_QUEUE_START"], now: now)
+          return unless request_start
 
-          now_ms - header.gsub("t=", "").to_f
+          queue_time_ms = (now - request_start) * 1_000.0
+          return if queue_time_ms.negative?
+
+          [queue_time_ms - (request_body_wait_ms(env) || 0), 0.0].max
         end
 
         def current_time_ms
-          Time.now.to_f * 1000
+          Time.now.to_f * 1_000.0
+        end
+
+        def header_timestamp_parser
+          @header_timestamp_parser ||= HeaderTimestampParser.new
+        end
+
+        def request_body_wait_ms(env)
+          wait_ms = Float(env["puma.request_body_wait"])
+          wait_ms if wait_ms.finite? && !wait_ms.negative?
+        rescue ArgumentError, TypeError
         end
       end
     end

data/lib/speedshop/cloudwatch/version.rb

@@ -2,6 +2,6 @@
 
 module Speedshop
   module Cloudwatch
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: speedshop-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Nate Berkopec
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatch
@@ -94,7 +93,6 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/nateberkopec/speedshop-cloudwatch
   source_code_uri: https://github.com/nateberkopec/speedshop-cloudwatch
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -109,8 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Ruby application integration with AWS CloudWatch for Puma, Rack, Sidekiq,
   and ActiveJob