Skip to content
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.

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

Add gzip support #223

Merged
merged 6 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ More configuration parameters:
- `port`: listen port (default: 24231)
- `metrics_path`: metrics HTTP endpoint (default: /metrics)
- `aggregated_metrics_path`: metrics HTTP endpoint (default: /aggregated_metrics)
- `content_encoding`: encoding format for the exposed metrics (default: identity). Supported formats are {identity, gzip}

When using multiple workers, each worker binds to port + `fluent_worker_id`.
To scrape metrics from all workers at once, you can access http://localhost:24231/aggregated_metrics.
Expand Down
22 changes: 19 additions & 3 deletions lib/fluent/plugin/in_prometheus.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
require 'fluent/plugin/prometheus_metrics'
require 'net/http'
require 'openssl'
require 'zlib'

module Fluent::Plugin
class PrometheusInput < Fluent::Plugin::Input
Expand Down Expand Up @@ -32,6 +33,9 @@ class PrometheusInput < Fluent::Plugin::Input
config_param :extra_conf, :hash, default: nil, symbolize_keys: true, deprecated: 'See http helper config'
end

desc 'Content encoding of the exposed metrics, Currently supported encoding is identity, gzip. Ref: https://prometheus.io/docs/instrumenting/exposition_formats/#basic-info'
config_param :content_encoding, :enum, list: [:identity, :gzip], default: :identity

def initialize
super
@registry = ::Prometheus::Client.registry
Expand Down Expand Up @@ -184,7 +188,7 @@ def start_webrick
end

def all_metrics
[200, { 'Content-Type' => ::Prometheus::Client::Formats::Text::CONTENT_TYPE }, ::Prometheus::Client::Formats::Text.marshal(@registry)]
response(::Prometheus::Client::Formats::Text.marshal(@registry))
rescue => e
[500, { 'Content-Type' => 'text/plain' }, e.to_s]
end
Expand All @@ -197,8 +201,7 @@ def all_workers_metrics
full_result.add_metrics(resp.body)
end
end

[200, { 'Content-Type' => ::Prometheus::Client::Formats::Text::CONTENT_TYPE }, full_result.get_metrics]
response(full_result.get_metrics)
rescue => e
[500, { 'Content-Type' => 'text/plain' }, e.to_s]
end
Expand Down Expand Up @@ -226,5 +229,18 @@ def do_request(host:, port:, secure:)
yield(http)
end
end

def response(metrics)
body = nil
case @content_encoding
when :gzip
gzip = Zlib::GzipWriter.new(StringIO.new)
gzip << metrics
body = gzip.close.string
when :identity
body = metrics
end
[200, { 'Content-Type' => ::Prometheus::Client::Formats::Text::CONTENT_TYPE, 'Content-Encoding' => @content_encoding.to_s }, body]
end
end
end
56 changes: 56 additions & 0 deletions spec/fluent/plugin/in_prometheus_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
require 'fluent/test/driver/input'

require 'net/http'
require 'zlib'

describe Fluent::Plugin::PrometheusInput do
CONFIG = %[
Expand Down Expand Up @@ -45,6 +46,24 @@
expect(driver.instance.metrics_path).to eq('/_test')
end
end

describe 'content_encoding_identity' do
let(:config) { CONFIG + %[
content_encoding identity
] }
it 'should be configurable' do
expect(driver.instance.content_encoding).to eq(:identity)
end
end

describe 'content_encoding_gzip' do
let(:config) { CONFIG + %[
content_encoding gzip
] }
it 'should be configurable' do
expect(driver.instance.content_encoding).to eq(:gzip)
end
end
end

describe '#start' do
Expand Down Expand Up @@ -197,6 +216,43 @@
end
end
end

context 'response content_encoding identity' do
let(:config) { LOCAL_CONFIG + %[
content_encoding identity
] }
it 'exposes metric' do
driver.run(timeout: 1) do
registry = driver.instance.instance_variable_get(:@registry)
registry.counter(:test,docstring: "Testing metrics") unless registry.exist?(:test)
Net::HTTP.start("127.0.0.1", port) do |http|
req = Net::HTTP::Get.new("/metrics")
req['accept-encoding'] = nil
res = http.request(req)
Athishpranav2003 marked this conversation as resolved.
Show resolved Hide resolved
expect(res.body).to include("test Testing metrics")
end
end
end
end

context 'response content_encoding gzip' do
let(:config) { LOCAL_CONFIG + %[
content_encoding gzip
] }
it 'exposes metric' do
driver.run(timeout: 1) do
registry = driver.instance.instance_variable_get(:@registry)
registry.counter(:test,docstring: "Testing metrics") unless registry.exist?(:test)
Net::HTTP.start("127.0.0.1", port) do |http|
req = Net::HTTP::Get.new("/metrics")
req['accept-encoding'] = nil
res = http.request(req)
gzip = Zlib::GzipReader.new(StringIO.new(res.body.to_s))
expect(gzip.read).to include("test Testing metrics")
end
end
end
end
end

describe '#run_multi_workers' do
Expand Down
Loading