libdatadog 5.0.0.1.0 → 6.0.0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 329d5a2553948784cfce3199ce245874a6f5561aad2ed548e99b676eaf7b7dfe
-  data.tar.gz: 701ac7eb13455555c1902128086436e500bfb90722b40d7e979e75e3a6712f3f
+  metadata.gz: c9dfb381c70e2874c06593dceb5aac26eb2f5094c293962822dab2b4300b0a09
+  data.tar.gz: eda4cce6a0befafdac67597c4f006529f934ebb935633ec3dad8cc05c0c4a8df
 SHA512:
-  metadata.gz: e77ebfd15d5b621a43a8d26f6e85742b8658f4c1086cfa91b119c3d526437ae6e7324ce3621ec1e99b126c2207569740abc0f5d1a7cec05448c4fbfb4a7e08c8
-  data.tar.gz: a45cb41edf975a6512b800d3c5f14c927b81d8a4c4256763900d038a7db7a8ebfe483dd8557d6051da7aef146855f790f8869d4c44d5499b597ae7753f269b94
+  metadata.gz: 1a4bf4d54d71f5cad104b2aac373030d07aebe039852dbb4b93f2b02625362fe8b464877e3f0ba16caf99c3a69d40be3b0830b10bfe0dccacd2c08b86c2e3d26
+  data.tar.gz: b275e149e66ccb6d5c90ed11ffd308995d29ea5778c6bf7d5b47f39effc60aa2cb09c32c8cc828a9621206ac73568dd455d7d8fedc76ed7788d1bfc10a3f96c2

data/lib/libdatadog/version.rb

@@ -2,9 +2,9 @@
 
 module Libdatadog
   # Current libdatadog version
-  LIB_VERSION = "5.0.0"
+  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