ddtrace 0.54.0 → 0.54.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98fd0b93fb5cc2fbca0156ea0ef37ae12936ccc2718538b61fb2c04d07f26896
-  data.tar.gz: a64b9a3977f32c7b6417b411bf5ebd1648085bc2fdc4ba7adeffa95de590bace
+  metadata.gz: bef2da14245890c8187ebffd9cce972da89a177a806c6991f2e3050e1de62bc3
+  data.tar.gz: d37dcaf645e16177c6f7a3dd77628f2e5a4920c45fca8e3f78665c34a4d76db2
 SHA512:
-  metadata.gz: 67e2065aa016d1fc18b4a2d193379173a78e6c3fcf47e1f74f45fa096e26feda6f6f1b5da286051730abbe9b6b5331ceb62d48ff09af9ab932bc8b97c8b3efd2
-  data.tar.gz: dcde2f41ef22a3a2b2ab48038cd61021d63848cdfaea4aa535290447e81648a73fd0f9640b39be041273d6aa1fb3829e2a4781d39976398cf4b3f9f1826a41b1
+  metadata.gz: c59d7c5b2f363eb96f78ad602489ccbd0ed94ae9d6e856c70272ddb21ba467255179814db1831518789b7c32e9ab5d0f13421dd67ea585d0b39fe78849bcfe81
+  data.tar.gz: 97dcba8ee6eda7c3cafdb39946863d337ef67843ac7f071890ce6253786b9d9a26ca8a9f181a8c0dad44c01a3ffab53c146ea4848b6497552d26558f9f1278ce

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## [Unreleased]
 
+## [0.54.1] - 2021-11-30
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.54.1
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.54.0...v0.54.1
+
+### Fixed
+
+- Skip building profiling native extension when Ruby has been compiled without JIT ([#1774][], [#1776][])
+
 ## [0.54.0] - 2021-11-17
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.54.0
@@ -2670,6 +2680,8 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#1769]: https://github.com/DataDog/dd-trace-rb/issues/1769
 [#1770]: https://github.com/DataDog/dd-trace-rb/issues/1770
 [#1771]: https://github.com/DataDog/dd-trace-rb/issues/1771
+[#1774]: https://github.com/DataDog/dd-trace-rb/issues/1774
+[#1776]: https://github.com/DataDog/dd-trace-rb/issues/1776
 [@AdrianLC]: https://github.com/AdrianLC
 [@Azure7111]: https://github.com/Azure7111
 [@BabyGroot]: https://github.com/BabyGroot

data/ext/ddtrace_profiling_native_extension/extconf.rb

@@ -1,23 +1,57 @@
 # typed: ignore
 
-def skip_building_extension?
+# Older Rubies don't have the MJIT header, used by the JIT compiler, so we need to use a different approach
+CAN_USE_MJIT_HEADER = RUBY_VERSION >= '2.6'
+
+def on_jruby?
   # We don't support JRuby for profiling, and JRuby doesn't support native extensions, so let's just skip this entire
   # thing so that JRuby users of dd-trace-rb aren't impacted.
-  on_jruby = RUBY_ENGINE == 'jruby'
+  RUBY_ENGINE == 'jruby'
+end
 
+def on_truffleruby?
   # We don't officially support TruffleRuby for dd-trace-rb at all BUT let's not break adventurous customers that
   # want to give it a try.
-  on_truffleruby = RUBY_ENGINE == 'truffleruby'
+  RUBY_ENGINE == 'truffleruby'
+end
 
+def on_windows?
   # Microsoft Windows is unsupported, so let's not build the extension there.
-  on_windows = Gem.win_platform?
+  Gem.win_platform?
+end
+
+def expected_to_use_mjit_but_mjit_is_disabled?
+  # On some Rubies, we require the mjit header to be present. If Ruby was installed without MJIT support, we also skip
+  # building the extension.
+  mjit_disabled = CAN_USE_MJIT_HEADER && RbConfig::CONFIG['MJIT_SUPPORT'] != 'yes'
+
+  if mjit_disabled
+    # rubocop:disable Style/StderrPuts
+    $stderr.puts(%(
++------------------------------------------------------------------------------+
+| Your Ruby has been compiled without JIT support (--disable-jit-support).     |
+| The profiling native extension requires a Ruby compiled with JIT support,    |
+| even if the JIT is not in use by the application itself.                     |
+|                                                                              |
+| WARNING: Without the profiling native extension, some profiling features     |
+| will not be available.                                                       |
++------------------------------------------------------------------------------+
+
+))
+  end
+
+  mjit_disabled
+end
 
+def disabled_via_env?
   # Experimental toggle to disable building the extension.
   # Disabling the extension will lead to the profiler not working in future releases.
   # If you needed to use this, please tell us why on <https://github.com/DataDog/dd-trace-rb/issues/new>.
-  disabled_via_env = ENV['DD_PROFILING_NO_EXTENSION'].to_s.downcase == 'true'
+  ENV['DD_PROFILING_NO_EXTENSION'].to_s.downcase == 'true'
+end
 
-  on_jruby || on_truffleruby || on_windows || disabled_via_env
+def skip_building_extension?
+  disabled_via_env? || on_jruby? || on_truffleruby? || on_windows? || expected_to_use_mjit_but_mjit_is_disabled?
 end
 
 # IMPORTANT: When adding flags, remember that our customers compile with a wide range of gcc/clang versions, so
@@ -27,7 +61,6 @@ def add_compiler_flag(flag)
 end
 
 if skip_building_extension?
-  # rubocop:disable Style/StderrPuts
   $stderr.puts(%(
 +------------------------------------------------------------------------------+
 | Skipping build of profiling native extension and replacing it with a no-op   |
@@ -84,9 +117,6 @@ if RUBY_PLATFORM.include?('linux')
   $defs << '-DHAVE_PTHREAD_GETCPUCLOCKID'
 end
 
-# Older Rubies don't have the MJIT header, used by the JIT compiler, so we need to use a different approach
-CAN_USE_MJIT_HEADER = RUBY_VERSION >= '2.6'
-
 # 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
 # the wrong library is never loaded.

data/lib/ddtrace/version.rb

@@ -3,7 +3,7 @@ module Datadog
   module VERSION
     MAJOR = 0
     MINOR = 54
-    PATCH = 0
+    PATCH = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.54.0
+  version: 0.54.1
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack