libdatadog 0.7.0.1.0.rc1-x86_64-linux → 0.8.0.1.0-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6edaf0beae1989442345da8b39ed7b56defa1ac9f683d8bd7ad083976466348e
-  data.tar.gz: 8c4ef3e890c33d4b9795c755fdb3554777ea08f6431325fee22d378fbcf05cac
+  metadata.gz: 471bb9880296ef7e38b2c8c4da0b0450df292750c9169311a19787e1c5ba6531
+  data.tar.gz: 7e8b9cdf1d886b6b8fb5c6effbaf310ed3e3b38494735db76c9de6dbfd848980
 SHA512:
-  metadata.gz: 835775b349d8bfa930e420e534191f8cb3186c927935d3250efca903bb5fc1ef0b24843a200076b468fc2fa3bc5af52afe9935a32ab71dd06d1c1e62ec40f4dc
-  data.tar.gz: 69a3772d0206e07ab01f9cbf94270b3215f67802a755e6d493935df8feba9286e8568afd99c90600f989380e94892ee7b635bf72699199d1cf7942da39d669f4
+  metadata.gz: 4bdd9a185d2f01a17678350982af4e2659909b927a380cf05d46c236980f8a9c7c509f8401641e0f5637b5e4ccb6e767c40491ec2cf4aa8154a28b25e82f5125
+  data.tar.gz: 5fd123c4acf4cd15f7d4e969d63d1e067e3681aa5f6bba6125e70fc600d3f1ec0a4dccc33766a640563dac118bba4d102dc402cc3b21382e17d81c5cce383885

data/lib/libdatadog/version.rb

@@ -2,11 +2,11 @@
 
 module Libdatadog
   # Current libdatadog version
-  LIB_VERSION = "0.7.0"
+  LIB_VERSION = "0.8.0"
 
   GEM_MAJOR_VERSION = "1"
   GEM_MINOR_VERSION = "0"
-  GEM_PRERELEASE_VERSION = ".rc1" # remember to include dot prefix, if needed!
+  GEM_PRERELEASE_VERSION = "" # remember to include dot prefix, if needed!
   private_constant :GEM_MAJOR_VERSION, :GEM_MINOR_VERSION, :GEM_PRERELEASE_VERSION
 
   # The gem version scheme is lib_version.gem_major.gem_minor[.prerelease].

data/lib/libdatadog.rb

@@ -8,9 +8,26 @@ module Libdatadog
     File.directory?(vendor_directory) ? (Dir.entries(vendor_directory) - [".", ".."]) : []
   end
 
-  def self.pkgconfig_folder(pkgconfig_file_name = "ddprof_ffi_with_rpath.pc")
+  def self.pkgconfig_folder(pkgconfig_file_name = "datadog_profiling_with_rpath.pc")
     current_platform = Gem::Platform.local.to_s
 
+    if RbConfig::CONFIG["arch"].include?("-musl") && !current_platform.include?("-musl")
+      # Fix/workaround for https://github.com/DataDog/dd-trace-rb/issues/2222
+      #
+      # Old versions of rubygems (for instance 3.0.3) don't properly detect alternative libc implementations on Linux;
+      # in particular for our case, they don't detect musl. (For reference, Rubies older than 2.7 may have shipped with
+      # an affected version of rubygems).
+      # In such cases, we fall back to use RbConfig::CONFIG['arch'] instead.
+      #
+      # Why not use RbConfig::CONFIG['arch'] always? Because Gem::Platform.local.to_s does some normalization we want
+      # in other situations -- for instance, it turns `x86_64-linux-gnu` to `x86_64-linux`. So for now we only add this
+      # workaround in a specific situation where we actually know it is wrong.
+      #
+      # See also https://github.com/rubygems/rubygems/pull/2922 and https://github.com/rubygems/rubygems/pull/4082
+
+      current_platform = RbConfig::CONFIG["arch"]
+    end
+
     return unless available_binaries.include?(current_platform)
 
     pkgconfig_file = Dir.glob("#{vendor_directory}/#{current_platform}/**/#{pkgconfig_file_name}").first