Merge pull request #3235 from manyfold3d/usage-fix

Usage tracking: remove leading v from app version
manyfold3d · Nov 25, 2024 · 72b338b · 72b338b
2 parents a4d395e + 2602990
commit 72b338b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/lib/usage_report.rb b/app/lib/usage_report.rb
@@ -7,7 +7,7 @@ def self.generate
     Jbuilder.encode do |report|
       report.id SiteSettings.anonymous_usage_id
       report.version do |version|
-        version.app Rails.application.config.app_version
+        version.app Rails.application.config.app_version.gsub(/^v/, "")
         version.sha Rails.application.config.git_sha
         version.image ENV.fetch("DOCKER_TAG", nil)&.split(":")&.first
         version.arch RUBY_PLATFORM

diff --git a/spec/lib/usage_report_spec.rb b/spec/lib/usage_report_spec.rb
@@ -5,7 +5,7 @@
     before do
       allow(SiteSettings).to receive(:anonymous_usage_id).and_return("guid-goes-here")
       allow(Rails.application.config).to receive_messages(
-        app_version: "test",
+        app_version: "v0.89.0",
         git_sha: "deadbeef"
       )
     end
@@ -27,7 +27,7 @@
     end
 
     it "includes application version" do
-      expect(parsed["version"]["app"]).to eq "test"
+      expect(parsed["version"]["app"]).to eq "0.89.0"
     end
 
     it "includes image type" do