Skip to content

Fix Ruby 4.0 compatibility: replace CGI with URI in DirectFileStore #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dannote wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Ruby 4.0 compatibility: replace CGI with URI in DirectFileStore #330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions lib/prometheus/client/data_stores/direct_file_store.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require 'fileutils'
require "cgi"
require "uri"

module Prometheus
module Client
Expand Down Expand Up @@ -133,12 +133,9 @@ def all_values
begin
store = FileMappedDict.new(file_path, true)
store.all_values.each do |(labelset_qs, v, ts)|
# Labels come as a query string, and CGI::parse returns arrays for each key
# "foo=bar&x=y" => { "foo" => ["bar"], "x" => ["y"] }
# Turn the keys back into symbols, and remove the arrays
label_set = CGI::parse(labelset_qs).map do |k, vs|
[k.to_sym, vs.first]
end.to_h
# Labels come as a query string
# "foo=bar&x=y" => { foo: "bar", x: "y" }
label_set = URI.decode_www_form(labelset_qs).to_h.transform_keys(&:to_sym)

stores_data[label_set] << [v, ts]
end
Expand All @@ -165,7 +162,7 @@ def store_key(labels)
labels[:pid] = process_id
end

labels.to_a.sort.map{|k,v| "#{CGI::escape(k.to_s)}=#{CGI::escape(v.to_s)}"}.join('&')
URI.encode_www_form(labels.to_a.sort)
end

def internal_store
Expand Down