Skip to content

[9.2] (backport #18515) Fix, clean batch metrics on pipeline shutdown #18520

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

Merged
andsel merged 1 commit into from
Dec 23, 2025
Merged

[9.2] (backport #18515) Fix, clean batch metrics on pipeline shutdown #18520

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions logstash-core/lib/logstash/java_pipeline.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,7 @@ def clear_pipeline_metrics
collector.clear("stats/pipelines/#{pipeline_id}/plugins")
collector.clear("stats/pipelines/#{pipeline_id}/events")
collector.clear("stats/pipelines/#{pipeline_id}/flow")
collector.clear("stats/pipelines/#{pipeline_id}/batch")
end
end

Expand Down
14 changes: 13 additions & 1 deletion logstash-core/spec/logstash/java_pipeline_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1665,18 +1665,30 @@ def build_pipeline_string_config(dummyinput_config)
end

context "of a running pipeline" do
let(:pipeline_settings) { { "pipeline.batch.size" => 1, "pipeline.workers" => 1, "pipeline.id" => pipeline_id, "metric.collect" => true } }
let(:pipeline_settings) { {
"pipeline.batch.size" => 1,
"pipeline.workers" => 1,
"pipeline.id" => pipeline_id,
"metric.collect" => true,
"pipeline.batch.metrics.sampling_mode" => "full"
} }

it "should clear the pipeline metrics" do
dummyinput.keep_running.make_true

expect { pipeline.start }.to_not raise_error
collected_metric = subject.metric.collector.snapshot_metric.metric_store.get_with_path("stats/pipelines")
expect(collected_metric[:stats][:pipelines][pipeline_id.to_sym]).to include(:batch)

pipeline.shutdown

expect(pipeline).to have_received(:clear_pipeline_metrics)
expect(pipeline).to have_received(:stop_inputs)
expect(pipeline).to have_received(:wait_for_shutdown)

# Take a snapshot from metrics and verify the batch metrics have been cleared
collected_metric = subject.metric.collector.snapshot_metric.metric_store.get_with_path("stats/pipelines")
expect(collected_metric[:stats][:pipelines][pipeline_id.to_sym]).to_not include(:batch)
end
end

Expand Down