From a02a1603f3b780c1f144ba64564ab9b78d8f9a38 Mon Sep 17 00:00:00 2001
From: showwin <showwin_kmc@yahoo.co.jp>
Date: Wed, 14 Aug 2024 16:47:32 +0900
Subject: [PATCH 1/3] Add prefix to the version name to distinguish between
 Barcelona and Codepipeline

---
 lib/degica_datadog/config.rb |  2 +-
 spec/config_spec.rb          | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/degica_datadog/config.rb b/lib/degica_datadog/config.rb
index ee12064..ef6bd9b 100644
--- a/lib/degica_datadog/config.rb
+++ b/lib/degica_datadog/config.rb
@@ -30,7 +30,7 @@ def service
       end
 
       def version
-        @version || ENV.fetch("_GIT_REVISION", "unknown")
+        @version || (ENV.fetch("PLATFORM", "") + ENV.fetch("_GIT_REVISION", "unknown"))
       end
 
       def environment
diff --git a/spec/config_spec.rb b/spec/config_spec.rb
index 4be4661..ffef0ab 100644
--- a/spec/config_spec.rb
+++ b/spec/config_spec.rb
@@ -43,6 +43,7 @@
         described_class.init
 
         allow(ENV).to receive(:fetch).with("SERVICE_NAME", "unknown").and_return(service_name)
+        allow(ENV).to receive(:fetch).with("PLATFORM", "").and_return("")
         allow(ENV).to receive(:fetch).with("_GIT_REVISION", "unknown").and_return(version)
         allow(ENV).to receive(:fetch).with("RAILS_ENV", "unknown").and_return(environment)
       end
@@ -63,6 +64,22 @@
         expect(described_class.repository_url).to eq("github.com/degica/#{service_name}")
       end
     end
+
+    context "fetches from env on codepipeline" do
+      let(:version) { "mocked_version" }
+      let(:platform) { "cpp" } # codepipeline prefix
+
+      before do
+        described_class.init
+
+        allow(ENV).to receive(:fetch).with("PLATFORM", "").and_return(platform)
+        allow(ENV).to receive(:fetch).with("_GIT_REVISION", "unknown").and_return(version)
+      end
+
+      it "sets version correctly" do
+        expect(described_class.version).to eq("#{platform}#{version}")
+      end
+    end
   end
 
   describe ".enabled?" do

From 8e33e86fc0e2252f28573c9cc55eaa8f38e179ac Mon Sep 17 00:00:00 2001
From: showwin <showwin_kmc@yahoo.co.jp>
Date: Wed, 14 Aug 2024 17:21:02 +0900
Subject: [PATCH 2/3] Add `-` in the middle

---
 lib/degica_datadog/config.rb | 6 +++++-
 spec/config_spec.rb          | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/degica_datadog/config.rb b/lib/degica_datadog/config.rb
index ef6bd9b..21a8e0f 100644
--- a/lib/degica_datadog/config.rb
+++ b/lib/degica_datadog/config.rb
@@ -30,7 +30,11 @@ def service
       end
 
       def version
-        @version || (ENV.fetch("PLATFORM", "") + ENV.fetch("_GIT_REVISION", "unknown"))
+        return @version if @version
+
+        platform = ENV.fetch("PLATFORM", "")
+        git_revision = ENV.fetch("_GIT_REVISION", "unknown")
+        platform.empty? ? git_revision : "#{platform}-#{git_revision}"
       end
 
       def environment
diff --git a/spec/config_spec.rb b/spec/config_spec.rb
index ffef0ab..5c09f1c 100644
--- a/spec/config_spec.rb
+++ b/spec/config_spec.rb
@@ -77,7 +77,7 @@
       end
 
       it "sets version correctly" do
-        expect(described_class.version).to eq("#{platform}#{version}")
+        expect(described_class.version).to eq("#{platform}-#{version}")
       end
     end
   end

From c2edd7e1c532737fc94118f6ebde4f98ac1f7d0b Mon Sep 17 00:00:00 2001
From: showwin <showwin_kmc@yahoo.co.jp>
Date: Thu, 15 Aug 2024 11:04:47 +0900
Subject: [PATCH 3/3] Add platform to postfix

---
 lib/degica_datadog/config.rb | 2 +-
 spec/config_spec.rb          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/degica_datadog/config.rb b/lib/degica_datadog/config.rb
index 21a8e0f..8d3d15c 100644
--- a/lib/degica_datadog/config.rb
+++ b/lib/degica_datadog/config.rb
@@ -34,7 +34,7 @@ def version
 
         platform = ENV.fetch("PLATFORM", "")
         git_revision = ENV.fetch("_GIT_REVISION", "unknown")
-        platform.empty? ? git_revision : "#{platform}-#{git_revision}"
+        platform.empty? ? git_revision : "#{git_revision}-#{platform}"
       end
 
       def environment
diff --git a/spec/config_spec.rb b/spec/config_spec.rb
index 5c09f1c..caaadd7 100644
--- a/spec/config_spec.rb
+++ b/spec/config_spec.rb
@@ -77,7 +77,7 @@
       end
 
       it "sets version correctly" do
-        expect(described_class.version).to eq("#{platform}-#{version}")
+        expect(described_class.version).to eq("#{version}-#{platform}")
       end
     end
   end