Merge branch 'master' into tonycthsu/crashtracking

Author: TonyCTHsu

.git-blame-ignore-revs

@@ -20,3 +20,7 @@ f89961150051276ea21bbca3fa00bda9b3cf4f1d
 6924556fc9e38c244e2ff3d429d581819f275ee9
 aba860197ce4f708e917e27323884d8efe3692ca
 464dd7177b72d6fe2c7f6e1aba0e4a6d3826f0d9
+acee9c7f3d953551cc0f20ef60e5045432bcf7e6
+6e4193c5bf3c2b948c91598c7a70bc34b59872fa
+b1481b215d8b1bf33a1d53419d1b95ebd1a70877
+01ec575b25bc68edfea7de2046ce3c43bc3ed4af

.standard_todo.yml

@@ -42,144 +42,3 @@ ignore:
 - spec/support/**/**
 - tasks/**/**
 - yard/**/**
-
-# These profiling ignores are ALL going to be fixed in separate PRs
-- lib/datadog/profiling/collectors/code_provenance.rb:
-  - Style/StringLiterals
-  - Layout/SpaceInsideHashLiteralBraces
-- lib/datadog/profiling/collectors/cpu_and_wall_time_worker.rb:
-  - Style/StringLiterals
-  - Style/RedundantBegin
-- lib/datadog/profiling/collectors/idle_sampling_helper.rb:
-  - Style/RedundantBegin
-  - Style/StringLiterals
-- lib/datadog/profiling/collectors/info.rb:
-  - Style/StringLiterals
-- lib/datadog/profiling/component.rb:
-  - Layout/SpaceInsideHashLiteralBraces
-  - Style/StringLiterals
-- lib/datadog/profiling/crashtracker.rb:
-  - Style/StringLiterals
-  - Style/RedundantBegin
-- lib/datadog/profiling/exporter.rb:
-  - Style/StringLiterals
-- lib/datadog/profiling/ext.rb:
-  - Style/StringLiterals
-- lib/datadog/profiling/ext/dir_monkey_patches.rb:
-  - Style/StringLiterals
-- lib/datadog/profiling/ext/forking.rb:
-  - Style/StringLiterals
-- lib/datadog/profiling/flush.rb:
-  - Style/StringLiterals
-- lib/datadog/profiling/http_transport.rb:
-  - Style/StringLiterals
-- lib/datadog/profiling/load_native_extension.rb:
-  - Style/StringLiterals
-- lib/datadog/profiling/preload.rb:
-  - Style/StringLiterals
-- lib/datadog/profiling/profiler.rb:
-  - Style/StringLiterals
-- lib/datadog/profiling/scheduler.rb:
-  - Style/StringLiterals
-  - Style/RedundantBegin
-- lib/datadog/profiling/tag_builder.rb:
-  - Style/StringLiterals
-- lib/datadog/profiling/tasks/exec.rb:
-  - Style/StringLiterals
-- lib/datadog/profiling/tasks/setup.rb:
-  - Style/StringLiterals
-  - Style/RedundantBegin
-- lib/datadog/profiling.rb:
-  - Style/StringLiterals
-  - Style/RedundantBegin
-- spec/datadog/profiling/collectors/code_provenance_spec.rb:
-  - Style/StringLiterals
-- spec/datadog/profiling/collectors/cpu_and_wall_time_worker_spec.rb:
-  - Style/StringLiterals
-  - Layout/SpaceInsideHashLiteralBraces
-  - Style/QuotedSymbols
-  - Style/RedundantBegin
-- spec/datadog/profiling/collectors/discrete_dynamic_sampler_spec.rb:
-  - Style/StringLiterals
-- spec/datadog/profiling/collectors/dynamic_sampling_rate_spec.rb:
-  - Style/StringLiterals
-- spec/datadog/profiling/collectors/idle_sampling_helper_spec.rb:
-  - Style/StringLiterals
-- spec/datadog/profiling/collectors/info_spec.rb:
-  - Style/StringLiterals
-  - Layout/SpaceInsideHashLiteralBraces
-- spec/datadog/profiling/collectors/stack_spec.rb:
-  - Style/StringLiterals
-  - Layout/SpaceInsideHashLiteralBraces
-- spec/datadog/profiling/collectors/thread_context_spec.rb:
-  - Style/StringLiterals
-  - Style/QuotedSymbols
-  - Style/RedundantBegin
-  - Layout/SpaceInsideHashLiteralBraces
-- spec/datadog/profiling/component_spec.rb:
-  - Style/StringLiterals
-  - Layout/SpaceInsideHashLiteralBraces
-- spec/datadog/profiling/crashtracker_spec.rb:
-  - Style/StringLiterals
-  - Layout/SpaceInsideHashLiteralBraces
-  - Style/QuotedSymbols
-- spec/datadog/profiling/exporter_spec.rb:
-  - Style/StringLiterals
-  - Layout/SpaceInsideHashLiteralBraces
-- spec/datadog/profiling/ext/dir_monkey_patches_spec.rb:
-  - Style/StringLiterals
-  - Style/RedundantBegin
-- spec/datadog/profiling/ext/forking_spec.rb:
-  - Style/StringLiterals
-- spec/datadog/profiling/flush_spec.rb:
-  - Style/StringLiterals
-  - Layout/SpaceInsideHashLiteralBraces
-- spec/datadog/profiling/http_transport_spec.rb:
-  - Style/StringLiterals
-  - Layout/SpaceInsideHashLiteralBraces
-  - Style/RedundantBegin
-- spec/datadog/profiling/load_native_extension_spec.rb:
-  - Style/StringLiterals
-- spec/datadog/profiling/native_extension_helpers_spec.rb:
-  - Style/StringLiterals
-- spec/datadog/profiling/native_extension_spec.rb:
-  - Style/StringLiterals
-- spec/datadog/profiling/pprof/pprof_pb.rb:
-  - Style/StringLiterals
-- spec/datadog/profiling/preload_spec.rb:
-  - Style/StringLiterals
-- spec/datadog/profiling/profiler_spec.rb:
-  - Style/StringLiterals
-- spec/datadog/profiling/scheduler_spec.rb:
-  - Style/StringLiterals
-  - Layout/SpaceInsideHashLiteralBraces
-- spec/datadog/profiling/spec_helper.rb:
-  - Style/StringLiterals
-  - Style/QuotedSymbols
-- spec/datadog/profiling/stack_recorder_spec.rb:
-  - Style/StringLiterals
-  - Layout/SpaceInsideHashLiteralBraces
-  - Style/QuotedSymbols
-  - Style/RedundantBegin
-- spec/datadog/profiling/tag_builder_spec.rb:
-  - Style/StringLiterals
-  - Layout/SpaceInsideHashLiteralBraces
-- spec/datadog/profiling/tasks/exec_spec.rb:
-  - Style/StringLiterals
-- spec/datadog/profiling/tasks/help_spec.rb:
-  - Style/StringLiterals
-- spec/datadog/profiling/tasks/setup_spec.rb:
-  - Style/StringLiterals
-- spec/datadog/profiling/validate_benchmarks_spec.rb:
-  - Style/StringLiterals
-- spec/datadog/profiling_spec.rb:
-  - Style/StringLiterals
-  - Style/RedundantBegin
-- ext/datadog_profiling_loader/extconf.rb:
-  - Style/StringLiterals
-- ext/datadog_profiling_native_extension/extconf.rb:
-  - Style/StringLiterals
-- ext/datadog_profiling_native_extension/native_extension_helpers.rb:
-  - Style/StringLiterals
-  - Layout/SpaceInsideHashLiteralBraces
-  - Style/RedundantBegin

ext/datadog_profiling_loader/extconf.rb

@@ -1,64 +1,64 @@
 # rubocop:disable Style/StderrPuts
 # rubocop:disable Style/GlobalVars
 
-if RUBY_ENGINE != 'ruby' || Gem.win_platform?
+if RUBY_ENGINE != "ruby" || Gem.win_platform?
   $stderr.puts(
-    'WARN: Skipping build of Datadog profiling loader. See Datadog profiling native extension note for details.'
+    "WARN: Skipping build of Datadog profiling loader. See Datadog profiling native extension note for details."
   )
 
-  File.write('Makefile', 'all install clean: # dummy makefile that does nothing')
+  File.write("Makefile", "all install clean: # dummy makefile that does nothing")
   exit
 end
 
-require 'mkmf'
+require "mkmf"
 
 # mkmf on modern Rubies actually has an append_cflags that does something similar
 # (see https://github.com/ruby/ruby/pull/5760), but as usual we need a bit more boilerplate to deal with legacy Rubies
 def add_compiler_flag(flag)
   if try_cflags(flag)
-    $CFLAGS << ' ' << flag
+    $CFLAGS << " " << flag
   else
     $stderr.puts("WARNING: '#{flag}' not accepted by compiler, skipping it")
   end
 end
 
 # Because we can't control what compiler versions our customers use, shipping with -Werror by default is a no-go.
 # But we can enable it in CI, so that we quickly spot any new warnings that just got introduced.
-add_compiler_flag '-Werror' if ENV['DATADOG_GEM_CI'] == 'true'
+add_compiler_flag "-Werror" if ENV["DATADOG_GEM_CI"] == "true"
 
 # Older gcc releases may not default to C99 and we need to ask for this. This is also used:
 # * by upstream Ruby -- search for gnu99 in the codebase
 # * by msgpack, another datadog gem dependency
 #   (https://github.com/msgpack/msgpack-ruby/blob/18ce08f6d612fe973843c366ac9a0b74c4e50599/ext/msgpack/extconf.rb#L8)
-add_compiler_flag '-std=gnu99'
+add_compiler_flag "-std=gnu99"
 
 # Gets really noisy when we include the MJIT header, let's omit it (TODO: Use #pragma GCC diagnostic instead?)
-add_compiler_flag '-Wno-unused-function'
+add_compiler_flag "-Wno-unused-function"
 
 # Allow defining variables at any point in a function
-add_compiler_flag '-Wno-declaration-after-statement'
+add_compiler_flag "-Wno-declaration-after-statement"
 
 # If we forget to include a Ruby header, the function call may still appear to work, but then
 # cause a segfault later. Let's ensure that never happens.
-add_compiler_flag '-Werror-implicit-function-declaration'
+add_compiler_flag "-Werror-implicit-function-declaration"
 
 # Warn on unused parameters to functions. Use `DDTRACE_UNUSED` to mark things as known-to-not-be-used.
-add_compiler_flag '-Wunused-parameter'
+add_compiler_flag "-Wunused-parameter"
 
 # The native extension is not intended to expose any symbols/functions for other native libraries to use;
 # the sole exception being `Init_datadog_profiling_loader` which needs to be visible for Ruby to call it when
 # it `dlopen`s the library.
 #
 # By setting this compiler flag, we tell it to assume that everything is private unless explicitly stated.
 # For more details see https://gcc.gnu.org/wiki/Visibility
-add_compiler_flag '-fvisibility=hidden'
+add_compiler_flag "-fvisibility=hidden"
 
 # Avoid legacy C definitions
-add_compiler_flag '-Wold-style-definition'
+add_compiler_flag "-Wold-style-definition"
 
 # Enable all other compiler warnings
-add_compiler_flag '-Wall'
-add_compiler_flag '-Wextra'
+add_compiler_flag "-Wall"
+add_compiler_flag "-Wextra"
 
 # Tag the native extension library with the Ruby version and Ruby platform.
 # This makes it easier for development (avoids "oops I forgot to rebuild when I switched my Ruby") and ensures that

ext/datadog_profiling_native_extension/clock_id.h

@@ -2,6 +2,7 @@
 
 #include <stdbool.h>
 #include <time.h>
+#include <ruby.h>
 
 // Contains the operating-system specific identifier needed to fetch CPU-time, and a flag to indicate if we failed to fetch it
 typedef struct thread_cpu_time_id {

ext/datadog_profiling_native_extension/clock_id_from_pthread.c

@@ -7,11 +7,10 @@
 #include <pthread.h>
 #include <time.h>
 #include <errno.h>
-#include <ruby.h>
 
+#include "clock_id.h"
 #include "helpers.h"
 #include "private_vm_api_access.h"
-#include "clock_id.h"
 #include "time_helpers.h"
 
 // Validate that our home-cooked pthread_id_for() matches pthread_self() for the current thread

ext/datadog_profiling_native_extension/clock_id_noop.c

@@ -4,10 +4,9 @@
 // is not available.
 #ifndef HAVE_PTHREAD_GETCPUCLOCKID
 
-#include <ruby.h>
-
 #include "clock_id.h"
 #include "helpers.h"
+#include "datadog_ruby_common.h"
 
 void self_test_clock_id(void) { } // Nothing to check