libdatadog 6.0.0.1.0 → 6.0.0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c7f7bbaba6f18af1f9266ebbe4137bc77e3e00a30abd4de722def9eebef462
-  data.tar.gz: f529fbb0f17aee6eaf1d295bb8f469bb17ae6e17985eba32e290c1770592dbd4
+  metadata.gz: c9dfb381c70e2874c06593dceb5aac26eb2f5094c293962822dab2b4300b0a09
+  data.tar.gz: eda4cce6a0befafdac67597c4f006529f934ebb935633ec3dad8cc05c0c4a8df
 SHA512:
-  metadata.gz: '03392d974333aaf15630eb541bc879d67b5c5a4958384e68ebe1e6e2d128b77334dd41a1f5a0c42a26e21012601c33d23f42be7aedb92501cf4ac0ae337ad90a'
-  data.tar.gz: 29b06d9fb3a3ff7e2e88fa54da65806820ba7788acb97f4c162f2f33a581d348d27963d711f68d81a2e130ae41b41b41f445cf3e2e7a9ca6dfea3c70df96f80f
+  metadata.gz: 1a4bf4d54d71f5cad104b2aac373030d07aebe039852dbb4b93f2b02625362fe8b464877e3f0ba16caf99c3a69d40be3b0830b10bfe0dccacd2c08b86c2e3d26
+  data.tar.gz: b275e149e66ccb6d5c90ed11ffd308995d29ea5778c6bf7d5b47f39effc60aa2cb09c32c8cc828a9621206ac73568dd455d7d8fedc76ed7788d1bfc10a3f96c2

data/lib/libdatadog/version.rb

@@ -4,7 +4,7 @@ module Libdatadog
   # Current libdatadog version
   LIB_VERSION = "6.0.0"
 
-  GEM_MAJOR_VERSION = "1"
+  GEM_MAJOR_VERSION = "2"
   GEM_MINOR_VERSION = "0"
   GEM_PRERELEASE_VERSION = "" # remember to include dot prefix, if needed!
   private_constant :GEM_MAJOR_VERSION, :GEM_MINOR_VERSION, :GEM_PRERELEASE_VERSION

data/lib/libdatadog.rb

@@ -9,24 +9,7 @@ module Libdatadog
   end
 
   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
+    current_platform = self.current_platform
 
     return unless available_binaries.include?(current_platform)
 
@@ -40,4 +23,37 @@ module Libdatadog
   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 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
+
+      RbConfig::CONFIG["arch"]
+    else
+      platform
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libdatadog
 version: !ruby/object:Gem::Version
-  version: 6.0.0.1.0
+  version: 6.0.0.2.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-12 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies: []
 description: libdatadog is a Rust-based utility library for Datadog's ddtrace gem.
 email: