Merge upstream and update generated code for v1800 and 2025-05-28.preview

This commit is contained in:
Stripe OpenAPI 2025-06-17 18:00:58 +00:00
commit cec1c8192b
2 changed files with 35 additions and 33 deletions

View File

@ -5,6 +5,5 @@ module Stripe
module ApiVersion module ApiVersion
CURRENT = "2025-06-30.preview" CURRENT = "2025-06-30.preview"
CURRENT_MAJOR = "preview" CURRENT_MAJOR = "preview"
CURRENT_MONTHLY = "2025-06-30"
end end
end end

View File

@ -1530,43 +1530,46 @@ module Stripe
assert(trace_payload["last_request_metrics"]["usage"].nil?) assert(trace_payload["last_request_metrics"]["usage"].nil?)
end end
should "check for thread safety" do # TODO: (http://go/j/DEVSDK-2318): This test fails intermittently in jruby/truffle
Stripe.enable_telemetry = true # so we have thread safety issues. Commenting out until we can
metrics = Queue.new # fix it.
to_return = 10.times.map do |i| # should "check for thread safety" do
{ body: "{}", headers: { "Request-ID": "req_#{i}" } } # Stripe.enable_telemetry = true
end # metrics = Queue.new
# to_return = 10.times.map do |i|
# { body: "{}", headers: { "Request-ID": "req_#{i}" } }
# end
stub_request(:any, /.*/) # stub_request(:any, /.*/)
.with do |req| # .with do |req|
metrics_header = req.headers["X-Stripe-Client-Telemetry"] # metrics_header = req.headers["X-Stripe-Client-Telemetry"]
metrics.push(JSON.parse(metrics_header)["last_request_metrics"]["request_id"]) if metrics_header # metrics.push(JSON.parse(metrics_header)["last_request_metrics"]["request_id"]) if metrics_header
true # true
end.to_return(to_return) # end.to_return(to_return)
t1 = Thread.start do # t1 = Thread.start do
Stripe::Charge.list # Stripe::Charge.list
Stripe::Charge.list # Stripe::Charge.list
Stripe::Charge.list # Stripe::Charge.list
Stripe::Charge.list # Stripe::Charge.list
Stripe::Charge.list # Stripe::Charge.list
end # end
t2 = Thread.start do # t2 = Thread.start do
Stripe::Charge.list # Stripe::Charge.list
Stripe::Charge.list # Stripe::Charge.list
Stripe::Charge.list # Stripe::Charge.list
Stripe::Charge.list # Stripe::Charge.list
Stripe::Charge.list # Stripe::Charge.list
end # end
t1.join # t1.join
t2.join # t2.join
expected_size = metrics.size # expected_size = metrics.size
metrics_array = Array.new(metrics.size) { metrics.pop } # metrics_array = Array.new(metrics.size) { metrics.pop }
assert_equal expected_size, metrics_array.uniq.size # assert_equal expected_size, metrics_array.uniq.size
end # end
end end
context "instrumentation" do context "instrumentation" do