diff --git a/.gitlab/benchmarks.yml b/.gitlab/benchmarks.yml index 0b8b25e55d4..98f229a7a81 100644 --- a/.gitlab/benchmarks.yml +++ b/.gitlab/benchmarks.yml @@ -109,13 +109,6 @@ only-profiling-heap: DD_PROFILING_ALLOCATION_ENABLED: "true" DD_PROFILING_EXPERIMENTAL_HEAP_ENABLED: "true" -only-profiling-crashtracking: - extends: .benchmarks - variables: - DD_BENCHMARKS_CONFIGURATION: only-profiling - DD_PROFILING_ENABLED: "true" - DD_PROFILING_EXPERIMENTAL_CRASH_TRACKING_ENABLED: "true" - profiling-and-tracing: extends: .benchmarks variables: diff --git a/lib/datadog/core/configuration/settings.rb b/lib/datadog/core/configuration/settings.rb index 52d6603cdf6..db7e0596337 100644 --- a/lib/datadog/core/configuration/settings.rb +++ b/lib/datadog/core/configuration/settings.rb @@ -453,12 +453,15 @@ def initialize(*_) # Enables reporting of information when the Ruby VM crashes. # + # This feature is no longer experimental, and we plan to deprecate this setting and replace it with a + # properly-named one soon. + # # @default `DD_PROFILING_EXPERIMENTAL_CRASH_TRACKING_ENABLED` environment variable as a boolean, - # otherwise `false` + # otherwise `true` option :experimental_crash_tracking_enabled do |o| o.type :bool o.env 'DD_PROFILING_EXPERIMENTAL_CRASH_TRACKING_ENABLED' - o.default false + o.default true end end diff --git a/lib/datadog/profiling/component.rb b/lib/datadog/profiling/component.rb index bdac9c4eab8..5147a2298f1 100644 --- a/lib/datadog/profiling/component.rb +++ b/lib/datadog/profiling/component.rb @@ -126,7 +126,7 @@ def self.build_profiler_component(settings:, agent_settings:, optional_tracer:) # and thus can't really provide a valid configuration to talk to a Datadog agent. Thus, in this situation, # we can't use the crashtracker, even if enabled. unless transport.respond_to?(:exporter_configuration) - Datadog.logger.warn( + Datadog.logger.debug( 'Cannot enable profiling crash tracking as a custom settings.profiling.exporter.transport is configured' ) return diff --git a/spec/datadog/core/configuration/settings_spec.rb b/spec/datadog/core/configuration/settings_spec.rb index 25de36b083c..c4c232de10e 100644 --- a/spec/datadog/core/configuration/settings_spec.rb +++ b/spec/datadog/core/configuration/settings_spec.rb @@ -828,7 +828,7 @@ context 'is not defined' do let(:environment) { nil } - it { is_expected.to be false } + it { is_expected.to be true } end [true, false].each do |value| @@ -843,10 +843,10 @@ describe '#experimental_crash_tracking_enabled=' do it 'updates the #experimental_crash_tracking_enabled setting' do - expect { settings.profiling.advanced.experimental_crash_tracking_enabled = true } + expect { settings.profiling.advanced.experimental_crash_tracking_enabled = false } .to change { settings.profiling.advanced.experimental_crash_tracking_enabled } - .from(false) - .to(true) + .from(true) + .to(false) end end diff --git a/spec/datadog/profiling/component_spec.rb b/spec/datadog/profiling/component_spec.rb index ec694568277..0cc26457523 100644 --- a/spec/datadog/profiling/component_spec.rb +++ b/spec/datadog/profiling/component_spec.rb @@ -547,8 +547,6 @@ end context 'when crash tracking is enabled' do - before { settings.profiling.advanced.experimental_crash_tracking_enabled = true } - it 'initializes the crash tracker' do expect(Datadog::Profiling::Crashtracker).to receive(:new).with( exporter_configuration: array_including(:agent), @@ -564,11 +562,11 @@ before do settings.profiling.exporter.transport = custom_transport - allow(Datadog.logger).to receive(:warn) + allow(Datadog.logger).to receive(:debug) end - it 'warns that crash tracking will not be enabled' do - expect(Datadog.logger).to receive(:warn).with(/Cannot enable profiling crash tracking/) + it 'debug logs that crash tracking will not be enabled' do + expect(Datadog.logger).to receive(:debug).with(/Cannot enable profiling crash tracking/) build_profiler_component end