libdatadog 0.7.0.1.0.rc1 → 0.8.0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '005787f65f4940f51f1e63b12da769d66abd1a2e14c11a69153f49b80f33b982'
-  data.tar.gz: 9d36137890211b704b7dd2b41ad36dd695b7616ffddb5b111073bfe395563c48
+  metadata.gz: e5f287bd7f1b81677311e3a250c5cb7b1b2684f1c20dcdea798021026e14ed4f
+  data.tar.gz: f602bb757955e4c12bbdc469fa809060fe9e81097796a3710b20b4cf38f0edd9
 SHA512:
-  metadata.gz: 5f6613e7ba37c91bf2f54980f460c4010a0ba18db13d4648219e61ba1a4494248883146e8cb268e3f7d3d8dbc9a78bae75cd280278c0f0941506ba06d96a5ef2
-  data.tar.gz: 69880f283dca7fafb62e03cd6a0979bb79356b2ddbcdae73d86239cb20deaf44104af43d242207e3f8eefdbede9d26150094d3533bd147d55e701107b65b35de
+  metadata.gz: 014ea7c20065151b39422ae12b47377506286c595bf17b269a2fba14ed7af1a6ae5b43ca32577cda319bef94fbe103de97129ecd1b4f058efc302de97406a9d6
+  data.tar.gz: 00dcecee67eab95bf4fa91167dbdd1d5e58f0ded2efab1f5eda055069480cf61a7028433ce251b1999ad6a5a385ef74a9ac9576afa15226386eadeb0f86447f8

data/lib/libdatadog/version.rb

@@ -2,11 +2,11 @@
 
 module Libdatadog
   # Current libdatadog version
-  LIB_VERSION = "0.7.0"
+  LIB_VERSION = "0.8.0"
 
   GEM_MAJOR_VERSION = "1"
   GEM_MINOR_VERSION = "0"
-  GEM_PRERELEASE_VERSION = ".rc1" # remember to include dot prefix, if needed!
+  GEM_PRERELEASE_VERSION = "" # remember to include dot prefix, if needed!
   private_constant :GEM_MAJOR_VERSION, :GEM_MINOR_VERSION, :GEM_PRERELEASE_VERSION
 
   # The gem version scheme is lib_version.gem_major.gem_minor[.prerelease].

data/lib/libdatadog.rb

@@ -8,9 +8,26 @@ module Libdatadog
     File.directory?(vendor_directory) ? (Dir.entries(vendor_directory) - [".", ".."]) : []
   end
 
-  def self.pkgconfig_folder(pkgconfig_file_name = "ddprof_ffi_with_rpath.pc")
+  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
+
     return unless available_binaries.include?(current_platform)
 
     pkgconfig_file = Dir.glob("#{vendor_directory}/#{current_platform}/**/#{pkgconfig_file_name}").first