add DD_ENV to library settings request

DataDog · Mar 4, 2024 · c99bd95 · c99bd95
1 parent b5c0aff
commit c99bd95
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/lib/datadog/ci/configuration/components.rb b/lib/datadog/ci/configuration/components.rb
@@ -74,7 +74,10 @@ def activate_ci!(settings)
             enabled: settings.ci.enabled && settings.ci.itr_enabled
           )
 
-          api_client = Transport::ApiClient.new(api: test_visibility_api)
+          api_client = Transport::ApiClient.new(
+            api: test_visibility_api,
+            dd_env: settings.env
+          )
 
           # CI visibility recorder global instance
           @ci_recorder = TestVisibility::Recorder.new(

diff --git a/lib/datadog/ci/transport/api_client.rb b/lib/datadog/ci/transport/api_client.rb
@@ -10,8 +10,9 @@ module Transport
       # Datadog API client
       # Calls settings endpoint to fetch library settings for given service and env
       class ApiClient
-        def initialize(api: nil)
+        def initialize(api: nil, dd_env: nil)
           @api = api
+          @dd_env = dd_env
         end
 
         def fetch_library_settings(service:)
@@ -34,7 +35,8 @@ def settings_payload(service:)
               id: Datadog::Core::Environment::Identity.id,
               type: Ext::Transport::DD_API_SETTINGS_TYPE,
               attributes: {
-                service: service
+                service: service,
+                env: @dd_env
               }
             }
           }.to_json

diff --git a/sig/datadog/ci/transport/api_client.rbs b/sig/datadog/ci/transport/api_client.rbs
@@ -2,9 +2,10 @@ module Datadog
   module CI
     module Transport
       class ApiClient
-        @api: untyped
+        @api: Datadog::CI::Transport::Api::Base?
+        @dd_env: String?
 
-        def initialize: (?api: Datadog::CI::Transport::Api::Base?) -> void
+        def initialize: (?api: Datadog::CI::Transport::Api::Base?, ?dd_env: String?) -> void
 
         def fetch_library_settings: (service: String?) -> untyped
 

diff --git a/spec/datadog/ci/transport/api_client_spec.rb b/spec/datadog/ci/transport/api_client_spec.rb
@@ -2,7 +2,9 @@
 
 RSpec.describe Datadog::CI::Transport::ApiClient do
   let(:api) { spy("api") }
-  subject { described_class.new(api: api) }
+  let(:dd_env) { "ci" }
+
+  subject { described_class.new(api: api, dd_env: dd_env) }
 
   describe "#fetch_library_settings" do
     let(:service) { "service" }
@@ -32,6 +34,7 @@
 
         attributes = data["attributes"]
         expect(attributes["service"]).to eq(service)
+        expect(attributes["env"]).to eq(dd_env)
       end
     end
   end