libdatadog 6.0.0.1.0-aarch64-linux → 7.0.0.1.0-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04d2e4dc428ca9caac821533262e9739cfda14722ee6153e4ad719ddb94b80ab
-  data.tar.gz: 391ea5cc716642528242034e5dee0edf9442ddc272f553ee24cb2063c6b5ca07
+  metadata.gz: cad5788d2cbed935f3c9434081495d8bf009e6de638f57eedd5c5aa5445ec3c4
+  data.tar.gz: 110297a7e166c333e3260ce4e969dbfb1c32d29ce9bb3f43ccb00818895e8a1a
 SHA512:
-  metadata.gz: fdaa10eb5d53245dc1302343290672578c3d600fdd6dfc6e48bfc8afbc82a5d231ac091a22033e612b7dc9835ea0348b1d465690b0ec3822523446135a4b7e16
-  data.tar.gz: 146613891ce562c83692f2c9dde2bc6698e50b92693895ed56719babbc4a9ce983054530655f28511b61bd9296500527c480e3627ed84738d5482c6704648d73
+  metadata.gz: 52de6c1a2167bec3661a15059c7f208d1885df4969c23cb834c6d17c3ba5517fe03d68d95d082f43809221028bad2e94e652c0587269ad9efeb526132530365e
+  data.tar.gz: a61aaf0a497f5749d502508a3e399431afea9073d4293ed333f1372fd08db74450428b4de197e6723ec97da96c828274890fb2ad5e933da697d82ed56ca5c53e

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