Skip to content

A platform for community discussion. Free, open, simple.

DEV: Instrument ImageOptim operations (#42873)

Alan Guo Xiang Tan13915be55032
diff --git a/lib/file_helper.rb b/lib/file_helper.rb
index dc82d1e87fa..d94b84cda30 100644
--- a/lib/file_helper.rb
+++ b/lib/file_helper.rb
@@ -1,6 +1,7 @@
# frozen_string_literal: true
require "final_destination"
+require "image_processing/instrumentation"
require "mini_mime"
require "open-uri"
@@ -131,10 +132,12 @@ class FileHelper
end
def self.optimize_image!(filename, allow_pngquant: false)
- image_optim(
- allow_pngquant: allow_pngquant,
- strip_image_metadata: SiteSetting.strip_image_metadata,
- ).optimize_image!(filename)
+ ImageProcessing::Instrumentation.instrument(operation: :image_optim) do
+ image_optim(
+ allow_pngquant: allow_pngquant,
+ strip_image_metadata: SiteSetting.strip_image_metadata,
+ ).optimize_image!(filename)
+ end
end
def self.image_optim(allow_pngquant: false, strip_image_metadata: true)
diff --git a/spec/lib/file_helper_spec.rb b/spec/lib/file_helper_spec.rb
index 8c964d49625..b35d6e0816a 100644
--- a/spec/lib/file_helper_spec.rb
+++ b/spec/lib/file_helper_spec.rb
@@ -150,6 +150,24 @@ RSpec.describe FileHelper do
end
end
+ describe ".optimize_image!" do
+ it "emits one image-processing measurement" do
+ SiteSetting.instrument_image_processing = true
+ optimized_image = stub
+ described_class.stubs(:image_optim).returns(stub(optimize_image!: optimized_image))
+
+ events =
+ DiscourseEvent.track_events(:image_processing_finished) do
+ expect(described_class.optimize_image!("image.png")).to eq(optimized_image)
+ end
+
+ expect(events.size).to eq(1)
+ payload = events.first[:params].first
+ expect(payload.except(:duration_seconds)).to eq(operation: "image_optim", success: true)
+ expect(payload[:duration_seconds]).to be >= 0
+ end
+ end
+
describe "inline safety checks" do
describe ".is_inline_safe?" do
it "returns true for non-SVG images" do