Use profiling.upload.timeout_seconds for crashtracker timeout

ext/datadog_profiling_native_extension/crashtracker.c

@@ -24,6 +24,8 @@ static VALUE _native_start_or_update_on_fork(int argc, VALUE *argv, DDTRACE_UNUS
   VALUE ld_library_path = rb_hash_fetch(options, ID2SYM(rb_intern("ld_library_path")));
   VALUE tags_as_array = rb_hash_fetch(options, ID2SYM(rb_intern("tags_as_array")));
   VALUE action = rb_hash_fetch(options, ID2SYM(rb_intern("action")));
+  VALUE upload_timeout_seconds = rb_hash_fetch(options, ID2SYM(rb_intern("upload_timeout_seconds")));
+
   VALUE start_action = ID2SYM(rb_intern("start"));
   VALUE update_on_fork_action = ID2SYM(rb_intern("update_on_fork"));
 
@@ -32,6 +34,7 @@ static VALUE _native_start_or_update_on_fork(int argc, VALUE *argv, DDTRACE_UNUS
   ENFORCE_TYPE(path_to_crashtracking_receiver_binary, T_STRING);
   ENFORCE_TYPE(ld_library_path, T_STRING);
   ENFORCE_TYPE(action, T_SYMBOL);
+  ENFORCE_TYPE(upload_timeout_seconds, T_FIXNUM);
 
   if (action != start_action && action != update_on_fork_action) rb_raise(rb_eArgError, "Unexpected action: %+"PRIsVALUE, action);
 
@@ -55,7 +58,7 @@ static VALUE _native_start_or_update_on_fork(int argc, VALUE *argv, DDTRACE_UNUS
     .create_alt_stack = false,
     .endpoint = endpoint,
     .resolve_frames = DDOG_PROF_STACKTRACE_COLLECTION_ENABLED,
-    .timeout_secs = 123, // FIXME: Get correct config from Ruby
+    .timeout_secs = FIX2INT(upload_timeout_seconds),
   };
 
   ddog_prof_CrashtrackerMetadata metadata = {

lib/datadog/profiling/component.rb

@@ -125,6 +125,7 @@ def self.build_profiler_component(settings:, agent_settings:, optional_tracer:)
         Datadog::Profiling::Crashtracker.new(
           exporter_configuration: transport.exporter_configuration,
           tags: Datadog::Profiling::TagBuilder.call(settings: settings),
+          upload_timeout_seconds: settings.profiling.upload.timeout_seconds,
         )
       end
 

lib/datadog/profiling/crashtracker.rb

@@ -26,18 +26,21 @@ module Profiling
     class Crashtracker
       private
 
-      attr_reader :exporter_configuration, :tags_as_array, :path_to_crashtracking_receiver_binary, :ld_library_path
+      attr_reader :exporter_configuration, :tags_as_array, :path_to_crashtracking_receiver_binary, :ld_library_path, \
+        :upload_timeout_seconds
 
       public
 
       def initialize(
         exporter_configuration:,
         tags:,
+        upload_timeout_seconds:,
         path_to_crashtracking_receiver_binary: Libdatadog.path_to_crashtracking_receiver_binary,
         ld_library_path: Libdatadog.ld_library_path
       )
         @exporter_configuration = exporter_configuration
         @tags_as_array = tags.to_a
+        @upload_timeout_seconds = upload_timeout_seconds
         @path_to_crashtracking_receiver_binary = path_to_crashtracking_receiver_binary
         @ld_library_path = ld_library_path
       end
@@ -83,6 +86,7 @@ def start_or_update_on_fork(action:)
             path_to_crashtracking_receiver_binary: path_to_crashtracking_receiver_binary,
             ld_library_path: ld_library_path,
             tags_as_array: tags_as_array,
+            upload_timeout_seconds: upload_timeout_seconds,
           )
           Datadog.logger.debug("Crash tracking #{action} successful")
         rescue => e

sig/datadog/profiling/crashtracker.rbs

@@ -9,12 +9,14 @@ module Datadog
       attr_reader tags_as_array: ::Array[[::String, ::String]]
       attr_reader path_to_crashtracking_receiver_binary: ::String
       attr_reader ld_library_path: ::String
+      attr_reader upload_timeout_seconds: ::Integer
 
       public
 
       def initialize: (
         exporter_configuration: exporter_configuration_array,
         tags: ::Hash[::String, ::String],
+        upload_timeout_seconds: ::Integer,
         ?path_to_crashtracking_receiver_binary: ::String,
         ?ld_library_path: ::String,
       ) -> void
@@ -33,6 +35,7 @@ module Datadog
         path_to_crashtracking_receiver_binary: ::String,
         ld_library_path: ::String,
         tags_as_array: ::Array[[::String, ::String]],
+        upload_timeout_seconds: ::Integer,
       ) -> void
 
       def self._native_stop: -> void

spec/datadog/profiling/component_spec.rb

@@ -549,6 +549,7 @@
           expect(Datadog::Profiling::Crashtracker).to receive(:new).with(
             exporter_configuration: array_including(:agent),
             tags: hash_including('runtime' => 'ruby'),
+            upload_timeout_seconds: settings.profiling.upload.timeout_seconds,
           )
 
           build_profiler_component

spec/datadog/profiling/crashtracker_spec.rb

@@ -8,12 +8,15 @@
 
   let(:exporter_configuration) { [:agent, 'http://localhost:6006'] }
 
-  subject(:crashtracker) do
-    described_class.new(
+  let(:crashtracker_options) {
+    {
       exporter_configuration: exporter_configuration,
       tags: { 'tag1' => 'value1', 'tag2' => 'value2' },
-    )
-  end
+      upload_timeout_seconds: 123,
+    }
+  }
+
+  subject(:crashtracker) { described_class.new(**crashtracker_options) }
 
   describe '#start' do
     subject(:start) { crashtracker.start }
@@ -28,13 +31,7 @@
     end
 
     context 'when path_to_crashtracking_receiver_binary is nil' do
-      subject(:crashtracker) do
-        described_class.new(
-          exporter_configuration: exporter_configuration,
-          tags: { 'tag1' => 'value1', 'tag2' => 'value2' },
-          path_to_crashtracking_receiver_binary: nil
-        )
-      end
+      subject(:crashtracker) { described_class.new(**crashtracker_options, path_to_crashtracking_receiver_binary: nil) }
 
       it 'logs a warning' do
         expect(Datadog.logger).to receive(:warn).with(/no path_to_crashtracking_receiver_binary was found/)
@@ -44,13 +41,7 @@
     end
 
     context 'when ld_library_path is nil' do
-      subject(:crashtracker) do
-        described_class.new(
-          exporter_configuration: exporter_configuration,
-          tags: { 'tag1' => 'value1', 'tag2' => 'value2' },
-          ld_library_path: nil
-        )
-      end
+      subject(:crashtracker) { described_class.new(**crashtracker_options, ld_library_path: nil) }
 
       it 'logs a warning' do
         expect(Datadog.logger).to receive(:warn).with(/no ld_library_path was found/)