libdatadog 6.0.0.1.0-x86_64-linux → 7.0.0.1.0-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c86d5cb95105ea3a8dc1f1ed3aa5d5f92af7bfb6e7c15a07e33432c12e0d1c1
-  data.tar.gz: 23ed74c884e40ba554bbbb37563a6f3fa808bc0a7db61b55cce9754bca561b58
+  metadata.gz: 69f5b71f06abca95158354afe02975f04be4129fe7728734634754ab0d4795f9
+  data.tar.gz: 378dfa5a23cda412039b7e8f33ab9fe30283807886dbc9ef9f859629bb1f7f73
 SHA512:
-  metadata.gz: 3d81da56a948b628a1a101553e89feeccb7b2720016960731eb2489e659ec47676210b0ac29e4fef650c8beac37e07d6112d3ff85784352eacc359008b2da7ca
-  data.tar.gz: 64c9c486919fdb7bab52c127e97c2fc5ac61d30e32c431d54000834d87023e02d8eb8b12a538e4ef63f0710cedb6d218180d909ec86098df7f5c69e22903495f
+  metadata.gz: b6c5363178b41c1658f553ff9552e5a9ed5816c44599b061b6843db4eeea416e78c16b27a8e5531b90c38be9c1221ec30617cb504b78ea70548373b325d5d27a
+  data.tar.gz: 9f56fd95903126651ed88cee2b6ceeabaf62d86e3eeed0cc5849a803110c526a7d8f8ee98ddb17ed60ea488b92f006dbfcb25c9f3bbe8b67eba8a6a446a4710e

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