libdatadog 6.0.0.1.0-x86_64-linux → 6.0.0.2.0-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c86d5cb95105ea3a8dc1f1ed3aa5d5f92af7bfb6e7c15a07e33432c12e0d1c1
-  data.tar.gz: 23ed74c884e40ba554bbbb37563a6f3fa808bc0a7db61b55cce9754bca561b58
+  metadata.gz: 64b9e6840230ef0378e41a9d8be765a4b20916e2c7418c6f398653f20c17b806
+  data.tar.gz: 293007bed91ec67a43ae6fbff0bee38fce9719b3da14139613f87dfd0f12d258
 SHA512:
-  metadata.gz: 3d81da56a948b628a1a101553e89feeccb7b2720016960731eb2489e659ec47676210b0ac29e4fef650c8beac37e07d6112d3ff85784352eacc359008b2da7ca
-  data.tar.gz: 64c9c486919fdb7bab52c127e97c2fc5ac61d30e32c431d54000834d87023e02d8eb8b12a538e4ef63f0710cedb6d218180d909ec86098df7f5c69e22903495f
+  metadata.gz: 78cfdda3da0c0fe3e34f93c77d95766de0ba9a13e6ef1a5d6d1ae812e889eb7dbad40b7c80d7e350fa4fdc3bfc35ac1dbd20bbd49f79ecf4975b44747032e487
+  data.tar.gz: e70e533263441e6524378d4daa05e646991920aea4ec20170fbdd085f0039743f5479b0121a8a57c1c075e2bc2d86e5283fe274cbc708fd791ad3ea77e9932c3

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: x86_64-linux
 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: