Merge pull request #3881 from DataDog/anmarchenko/report_tracer_versi…

…on_for_telemetry_with_ci

[SDTEST-756] add +ci-X.Y.Z to the tracer_version reported to internal telemetry if datadog-ci is present and CI mode is enabled

Steepfile

@@ -569,6 +569,7 @@ target :datadog do
   library 'passenger'
   library 'webmock'
   library 'graphql'
+  library 'datadog-ci'
 
   # TODO: gem 'libddwaf'
   library 'libddwaf'

lib/datadog/core/telemetry/request.rb

@@ -31,6 +31,18 @@ def build_payload(event, seq_id)
 
           def application
             config = Datadog.configuration
+
+            tracer_version = Core::Environment::Identity.gem_datadog_version_semver2
+
+            # We need some to distinguish datadog-ci gem versions
+            # when examining telemetry metrics emitted from the datadog-ci gem.
+            #
+            # This code checks that Datadog::CI is loaded and ci mode is enabled and adds
+            # "-ci-X.Y.Z" suffix to the tracer version.
+            if defined?(::Datadog::CI::VERSION) && config.respond_to?(:ci) && config.ci.enabled
+              tracer_version = "#{tracer_version}-ci-#{::Datadog::CI::VERSION::STRING}"
+            end
+
             {
               env: config.env,
               language_name: Core::Environment::Ext::LANG,
@@ -39,7 +51,7 @@ def application
               runtime_version: Core::Environment::Ext::ENGINE_VERSION,
               service_name: config.service,
               service_version: config.version,
-              tracer_version: Core::Environment::Identity.gem_datadog_version_semver2
+              tracer_version: tracer_version
             }
           end
 

spec/datadog/core/telemetry/request_spec.rb

@@ -74,5 +74,34 @@
         tracer_time: tracer_time,
       )
     end
+
+    context 'when Datadog::CI is loaded and ci mode is enabled' do
+      before do
+        stub_const('Datadog::CI::VERSION::STRING', '1.2.3')
+        expect(Datadog).to receive(:configuration).and_return(
+          double(
+            'configuration',
+            ci: double('ci', enabled: true),
+            env: env,
+            service: service_name,
+            version: service_version
+          )
+        )
+      end
+
+      it do
+        is_expected.to eq(
+          api_version: api_version,
+          application: application.merge(tracer_version: "#{tracer_version}-ci-1.2.3"),
+          debug: debug,
+          host: host,
+          payload: payload,
+          request_type: request_type,
+          runtime_id: runtime_id,
+          seq_id: seq_id,
+          tracer_time: tracer_time,
+        )
+      end
+    end
   end
 end

vendor/rbs/datadog-ci/0/datadog_ci.rbs

@@ -0,0 +1,7 @@
+module Datadog
+  module CI
+    module VERSION
+      STRING: String
+    end
+  end
+end