libdatadog 6.0.0.1.0 → 7.0.0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c7f7bbaba6f18af1f9266ebbe4137bc77e3e00a30abd4de722def9eebef462
-  data.tar.gz: f529fbb0f17aee6eaf1d295bb8f469bb17ae6e17985eba32e290c1770592dbd4
+  metadata.gz: f2990bbd36be23ec2638888a20c05cdeea1ac6fb55267ca47a732e13861c4e4d
+  data.tar.gz: c18aa3dd3a9f194d4d733e5dced7ffd8410fe2fb9fdf9b2d3a29f99560644458
 SHA512:
-  metadata.gz: '03392d974333aaf15630eb541bc879d67b5c5a4958384e68ebe1e6e2d128b77334dd41a1f5a0c42a26e21012601c33d23f42be7aedb92501cf4ac0ae337ad90a'
-  data.tar.gz: 29b06d9fb3a3ff7e2e88fa54da65806820ba7788acb97f4c162f2f33a581d348d27963d711f68d81a2e130ae41b41b41f445cf3e2e7a9ca6dfea3c70df96f80f
+  metadata.gz: 1667c1b189b7ef2eb4b885266553a4a821e45acd7e36e3a32a1ef9ee295f44ccc768d9f4b2bf13a4715649df0d694da23d11a0f4a09ad58c3cbde441091e070e
+  data.tar.gz: f8bee017da35b91c69421e14bdd054c4a8e0c14652bc446c553f72a6c86d24293a5f4143e6bf9f751d2860612e2e69ee6a444dccbf04d84fea4b3e099715b695

data/lib/libdatadog/version.rb

@@ -2,7 +2,7 @@
 
 module Libdatadog
   # Current libdatadog version
-  LIB_VERSION = "6.0.0"
+  LIB_VERSION = "7.0.0"
 
   GEM_MAJOR_VERSION = "1"
   GEM_MINOR_VERSION = "0"

data/lib/libdatadog.rb

@@ -9,35 +9,59 @@ module Libdatadog
   end
 
   def self.pkgconfig_folder(pkgconfig_file_name = "datadog_profiling_with_rpath.pc")
-    current_platform = Gem::Platform.local.to_s
+    current_platform = self.current_platform
 
-    if RbConfig::CONFIG["arch"].include?("-musl") && !current_platform.include?("-musl")
-      # Fix/workaround for https://github.com/DataDog/dd-trace-rb/issues/2222
+    return unless available_binaries.include?(current_platform)
+
+    pkgconfig_file = Dir.glob("#{vendor_directory}/#{current_platform}/**/#{pkgconfig_file_name}").first
+
+    return unless pkgconfig_file
+
+    File.absolute_path(File.dirname(pkgconfig_file))
+  end
+
+  private_class_method def self.vendor_directory
+    ENV["LIBDATADOG_VENDOR_OVERRIDE"] || "#{__dir__}/../vendor/libdatadog-#{Libdatadog::LIB_VERSION}/"
+  end
+
+  def self.current_platform
+    platform = Gem::Platform.local.to_s
+
+    if platform.end_with?("-gnu")
+      # In some cases on Linux with glibc the platform includes a -gnu suffix. We normalize it to not have the suffix.
+      #
+      # Note: This should be platform = platform.delete_suffix("-gnu") but it doesn't work on legacy Rubies; once
+      # dd-trace-rb 2.0 is out we can simplify this.
+      #
+      platform = platform[0..-5]
+    end
+
+    if RbConfig::CONFIG["arch"].include?("-musl") && !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.
+      # Why not use RbConfig::CONFIG['arch'] always? Because Gem::Platform.local.to_s does some normalization that seemed
+      # useful in the past, although part of it got removed in https://github.com/rubygems/rubygems/pull/5852.
+      # For now we only add this workaround in a specific situation where we actually know it is wrong, but in the
+      # future it may be worth re-evaluating if we should move away from `Gem::Platform` altogether.
       #
       # See also https://github.com/rubygems/rubygems/pull/2922 and https://github.com/rubygems/rubygems/pull/4082
 
-      current_platform = RbConfig::CONFIG["arch"]
+      RbConfig::CONFIG["arch"]
+    else
+      platform
     end
+  end
 
-    return unless available_binaries.include?(current_platform)
-
-    pkgconfig_file = Dir.glob("#{vendor_directory}/#{current_platform}/**/#{pkgconfig_file_name}").first
-
-    return unless pkgconfig_file
+  def self.path_to_crashtracking_receiver_binary
+    pkgconfig_folder = self.pkgconfig_folder
 
-    File.absolute_path(File.dirname(pkgconfig_file))
-  end
+    return unless pkgconfig_folder
 
-  private_class_method def self.vendor_directory
-    ENV["LIBDATADOG_VENDOR_OVERRIDE"] || "#{__dir__}/../vendor/libdatadog-#{Libdatadog::LIB_VERSION}/"
+    File.absolute_path("#{pkgconfig_folder}/../../bin/libdatadog-crashtracking-receiver")
   end
 end