libdatadog 5.0.0.1.0-aarch64-linux → 6.0.0.2.0-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 552f13e8a0c55311c440a342940007475ef0ddd3364c34131af8d8d0a56e456c
-  data.tar.gz: 0b827510a27d98eb127da8c07891a3f37f8c31e9e3532f41b84c35df62529454
+  metadata.gz: 9bb5d8eb96095010b0a119da538d13a04e6292c98b4da5aaf5d317bda8cbde40
+  data.tar.gz: aa7393b410cc17492b1b2c70857345e6891405dc76d6e4ab6acfbcf87411e070
 SHA512:
-  metadata.gz: c05cf502bd2522d1697b0e1cf5b299b805facf49db6bbf039c271455e32765d0cfe79d9a115f8cdc9359b746b4420d56fbfa9314d29fce60fbfe0a3cd97ee068
-  data.tar.gz: 9e66a3d4df55f5026060098511cee05f95010d8785c962fcf554b5c765371a91ba541374c4e46dbc482f55b32b2e7cce314c3fae1872403e17eca3fc11afb807
+  metadata.gz: 800dbe84ce259c657c66a107241fa6e32f035334acb00ef24ee23139f27746ab7493aa9cea0aa6cbcb80a2a4c0b8656532a4c4002415b2570879fa08999c66be
+  data.tar.gz: 6ae87e41654aa73e896f4833c14fc37dab779d88c3e199ab099b1d6ec6610e7793c542f7ab9e0ada6903e44fad288469c0288fbad6e933eec2fb29734e30e2cd

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