Clean up

Author: gyuheon0h

Rakefile

@@ -64,8 +64,8 @@ namespace :test do
         command = "bundle check || bundle install && bundle exec rake #{spec_task}"
         command += "'[#{spec_arguments}]'" if spec_arguments
 
-        total_executors = Datadog::DATADOG_ENV.key?('CIRCLE_NODE_TOTAL') ? Datadog::DATADOG_ENV['CIRCLE_NODE_TOTAL'].to_i : nil
-        current_executor = Datadog::DATADOG_ENV.key?('CIRCLE_NODE_INDEX') ? Datadog::DATADOG_ENV['CIRCLE_NODE_INDEX'].to_i : nil
+        total_executors = ENV.key?('CIRCLE_NODE_TOTAL') ? ENV['CIRCLE_NODE_TOTAL'].to_i : nil
+        current_executor = ENV.key?('CIRCLE_NODE_INDEX') ? ENV['CIRCLE_NODE_INDEX'].to_i : nil
 
         if total_executors && current_executor && total_executors > 1
           @execution_count ||= 0
@@ -467,11 +467,11 @@ namespace :coverage do
   task :report do
     require 'simplecov'
 
-    resultset_files = Dir["#{Datadog::DATADOG_ENV.fetch("COVERAGE_DIR", "coverage")}/.resultset.json"] +
-      Dir["#{Datadog::DATADOG_ENV.fetch("COVERAGE_DIR", "coverage")}/versions/**/.resultset.json"]
+    resultset_files = Dir["#{ENV.fetch("COVERAGE_DIR", "coverage")}/.resultset.json"] +
+      Dir["#{ENV.fetch("COVERAGE_DIR", "coverage")}/versions/**/.resultset.json"]
 
     SimpleCov.collate resultset_files do
-      coverage_dir "#{Datadog::DATADOG_ENV.fetch("COVERAGE_DIR", "coverage")}/report"
+      coverage_dir "#{ENV.fetch("COVERAGE_DIR", "coverage")}/report"
       formatter SimpleCov::Formatter::HTMLFormatter
     end
   end
@@ -481,11 +481,11 @@ namespace :coverage do
     require 'simplecov'
     require_relative 'spec/support/simplecov_fix'
 
-    versions = Dir["#{Datadog::DATADOG_ENV.fetch("COVERAGE_DIR", "coverage")}/versions/*"].map { |f| File.basename(f) }
+    versions = Dir["#{ENV.fetch("COVERAGE_DIR", "coverage")}/versions/*"].map { |f| File.basename(f) }
     versions.map do |version|
       puts "Generating report for: #{version}"
-      SimpleCov.collate Dir["#{Datadog::DATADOG_ENV.fetch("COVERAGE_DIR", "coverage")}/versions/#{version}/**/.resultset.json"] do
-        coverage_dir "#{Datadog::DATADOG_ENV.fetch("COVERAGE_DIR", "coverage")}/report/versions/#{version}"
+      SimpleCov.collate Dir["#{ENV.fetch("COVERAGE_DIR", "coverage")}/versions/#{version}/**/.resultset.json"] do
+        coverage_dir "#{ENV.fetch("COVERAGE_DIR", "coverage")}/report/versions/#{version}"
         formatter SimpleCov::Formatter::HTMLFormatter
       end
     end

ext/datadog_profiling_native_extension/native_extension_helpers.rb

@@ -6,19 +6,14 @@ module Profiling
     module NativeExtensionHelpers
       # Can be set when customers want to skip compiling the native extension entirely
       ENV_NO_EXTENSION = "DD_PROFILING_NO_EXTENSION"
-      LEGACY_ENV_NO_EXTENSION = "DD_NO_EXTENSION"
       # Can be set to force rubygems to fail gem installation when profiling extension could not be built
       ENV_FAIL_INSTALL_IF_MISSING_EXTENSION = "DD_PROFILING_FAIL_INSTALL_IF_MISSING_EXTENSION"
-      LEGACY_ENV_FAIL_INSTALL_IF_MISSING_EXTENSION = "DD_FAIL_INSTALL_IF_MISSING_EXTENSION"
 
       # The MJIT header was introduced on 2.6 and removed on 3.3; for other Rubies we rely on datadog-ruby_core_source
       CAN_USE_MJIT_HEADER = RUBY_VERSION.start_with?("2.6", "2.7", "3.0.", "3.1.", "3.2.")
 
       def self.fail_install_if_missing_extension?
-        [
-          ENV[ENV_FAIL_INSTALL_IF_MISSING_EXTENSION],
-          ENV[LEGACY_ENV_FAIL_INSTALL_IF_MISSING_EXTENSION],
-        ].any? { |value| value.to_s.strip.downcase == "true" }
+        ENV[ENV_FAIL_INSTALL_IF_MISSING_EXTENSION].to_s.strip.downcase == "true"
       end
 
       # Used to check if profiler is supported, including user-visible clear messages explaining why their
@@ -136,19 +131,15 @@ def self.render_skipped_reason_file(reason:, suggested:)
             "<https://github.com/DataDog/dd-trace-rb/issues/new> so we can fix it :)",
           ].freeze
 
-          env_var =
-            [
-              ENV_NO_EXTENSION,
-              LEGACY_ENV_NO_EXTENSION,
-            ].find { |var| ENV[var].to_s.strip.downcase == "true" }
-
-          return unless env_var
-
-          explain_issue(
-            "the `#{env_var}` environment variable is/was set to",
+          disabled_via_env = explain_issue(
+            "the `DD_PROFILING_NO_EXTENSION` environment variable is/was set to",
             "`true` during installation.",
             suggested: report_disabled,
           )
+
+          return unless ENV[ENV_NO_EXTENSION].to_s.strip.downcase == "true"
+
+          disabled_via_env
         end
 
         private_class_method def self.on_jruby?

spec/datadog/core/crashtracking/component_spec.rb

@@ -392,6 +392,18 @@ def ruby_method_with_c_calls
             )
           )
 
+          expect(frames).to include(
+            hash_including(
+              function: 'ruby_method_with_c_calls'
+            )
+          )
+
+          expect(frames).to include(
+            hash_including(
+              function: 'top_level_ruby_method'
+            )
+          )
+
           temp_script.unlink
         end
       end