From 4a799593d174cb47e345f6d7b7db42e5f6f2ff29 Mon Sep 17 00:00:00 2001 From: Samuel Williams Date: Wed, 22 Jul 2026 12:47:57 +1200 Subject: [PATCH 1/4] Add traces test dependency --- gems.rb | 1 + releases.md | 1 + test/traces/provider/falcon/middleware.rb | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gems.rb b/gems.rb index f5faafbe..3b465060 100644 --- a/gems.rb +++ b/gems.rb @@ -50,6 +50,7 @@ gem "rubocop" gem "rubocop-md" gem "rubocop-socketry" + gem "traces" gem "sus-fixtures-async" gem "sus-fixtures-async-http" diff --git a/releases.md b/releases.md index 7b76ef11..e6d833ed 100644 --- a/releases.md +++ b/releases.md @@ -3,6 +3,7 @@ ## Unreleased - Move Falcon middleware trace providers to `traces/provider/falcon/middleware`. + - Add `traces` to the test dependencies for Falcon middleware trace provider tests. ## v0.55.5 diff --git a/test/traces/provider/falcon/middleware.rb b/test/traces/provider/falcon/middleware.rb index ed5c2243..7c2b3449 100644 --- a/test/traces/provider/falcon/middleware.rb +++ b/test/traces/provider/falcon/middleware.rb @@ -21,7 +21,8 @@ def expect_trace(name, expected_attributes) expect(attributes).to be == expected_attributes expect(block).not.to be == nil - original.call(actual_name, attributes: attributes, &block) + Traces.trace_context = Traces::Context.local + block.call end end end From 460fe54c5bb352c78c509a244292a2c725beceb7 Mon Sep 17 00:00:00 2001 From: Samuel Williams Date: Wed, 22 Jul 2026 13:29:02 +1200 Subject: [PATCH 2/4] Fix trace middleware test helper --- test/traces/provider/falcon/middleware.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/traces/provider/falcon/middleware.rb b/test/traces/provider/falcon/middleware.rb index 7c2b3449..e3362e8a 100644 --- a/test/traces/provider/falcon/middleware.rb +++ b/test/traces/provider/falcon/middleware.rb @@ -15,14 +15,17 @@ def reset_trace_context! end def expect_trace(name, expected_attributes) + trace = Traces.method(:trace) + mock(Traces) do |mock| - mock.wrap(:trace) do |original, actual_name, attributes: nil, &block| + mock.replace(:trace) do |actual_name, attributes: nil, &block| expect(actual_name).to be == name expect(attributes).to be == expected_attributes expect(block).not.to be == nil - Traces.trace_context = Traces::Context.local - block.call + trace.call(actual_name, attributes: attributes) do + block.call + end end end end From ee21198641ac016b439b292c984f5928cc9e9a6a Mon Sep 17 00:00:00 2001 From: Samuel Williams Date: Wed, 22 Jul 2026 13:29:47 +1200 Subject: [PATCH 3/4] Simplify trace helper delegation --- test/traces/provider/falcon/middleware.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/traces/provider/falcon/middleware.rb b/test/traces/provider/falcon/middleware.rb index e3362e8a..4100474d 100644 --- a/test/traces/provider/falcon/middleware.rb +++ b/test/traces/provider/falcon/middleware.rb @@ -23,9 +23,7 @@ def expect_trace(name, expected_attributes) expect(attributes).to be == expected_attributes expect(block).not.to be == nil - trace.call(actual_name, attributes: attributes) do - block.call - end + trace.call(actual_name, attributes: attributes, &block) end end end From a193c436f8468495607452999a081efc8ddb9279 Mon Sep 17 00:00:00 2001 From: Samuel Williams Date: Wed, 22 Jul 2026 13:41:52 +1200 Subject: [PATCH 4/4] Restore trace middleware test helper --- test/traces/provider/falcon/middleware.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/traces/provider/falcon/middleware.rb b/test/traces/provider/falcon/middleware.rb index 4100474d..ed5c2243 100644 --- a/test/traces/provider/falcon/middleware.rb +++ b/test/traces/provider/falcon/middleware.rb @@ -15,15 +15,13 @@ def reset_trace_context! end def expect_trace(name, expected_attributes) - trace = Traces.method(:trace) - mock(Traces) do |mock| - mock.replace(:trace) do |actual_name, attributes: nil, &block| + mock.wrap(:trace) do |original, actual_name, attributes: nil, &block| expect(actual_name).to be == name expect(attributes).to be == expected_attributes expect(block).not.to be == nil - trace.call(actual_name, attributes: attributes, &block) + original.call(actual_name, attributes: attributes, &block) end end end