diff --git a/Gemfile b/Gemfile index d46a8d0d66b82..a90151992c5b0 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem "carrierwave", "~> 2.2" # Upload files in your Ruby applications, map them t gem "carrierwave-bombshelter", "~> 0.2" # Protect your carrierwave from image bombs gem "cloudinary", "~> 1.20" # Client library for easily using the Cloudinary service gem "counter_culture", "~> 2.8" # counter_culture provides turbo-charged counter caches that are kept up-to-date -gem "ddtrace", "~> 0.46.0" # ddtrace is Datadog’s tracing client for Ruby. +gem "ddtrace", "~> 1.5.0" # ddtrace is Datadog’s tracing client for Ruby. gem "devise", github: "heartcombo/devise", ref: "0cd72a5" # Flexible authentication solution for Rails gem "devise_invitable", "~> 2.0.3" # Allows invitations to be sent for joining gem "dogstatsd-ruby", "~> 4.8" # A client for DogStatsD, an extension of the StatsD metric server for Datadog diff --git a/Gemfile.lock b/Gemfile.lock index 40848d16f4b35..488e9f73a2224 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -205,9 +205,13 @@ GEM puma (>= 3.8.0) railties (>= 5.2.0) dante (0.2.0) - ddtrace (0.46.0) + ddtrace (1.5.0) + debase-ruby_core_source (>= 0.10.16, <= 0.10.17) + libdatadog (~> 0.7.0.1.1) + libddwaf (~> 1.3.0.2.0) msgpack dead_end (1.1.4) + debase-ruby_core_source (0.10.17) debug_inspector (0.0.3) derailed_benchmarks (2.0.1) benchmark-ips (~> 2) @@ -422,6 +426,14 @@ GEM rake launchy (2.5.0) addressable (~> 2.7) + libdatadog (0.7.0.1.1) + libdatadog (0.7.0.1.1-x86_64-linux) + libddwaf (1.3.0.2.0) + ffi (~> 1.0) + libddwaf (1.3.0.2.0-x86_64-darwin) + ffi (~> 1.0) + libddwaf (1.3.0.2.0-x86_64-linux) + ffi (~> 1.0) libhoney (1.17.0) addressable (~> 2.0) http (>= 2.0, < 5.0) @@ -457,7 +469,7 @@ GEM hiredis (>= 0.5) msgpack (>= 0.5) redis (>= 3.0) - msgpack (1.4.2) + msgpack (1.6.0) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) @@ -883,7 +895,7 @@ DEPENDENCIES cloudinary (~> 1.20) counter_culture (~> 2.8) cypress-rails (~> 0.5.0) - ddtrace (~> 0.46.0) + ddtrace (~> 1.5.0) derailed_benchmarks (~> 2.0) devise! devise_invitable (~> 2.0.3) diff --git a/vendor/cache/ddtrace-0.46.0.gem b/vendor/cache/ddtrace-0.46.0.gem deleted file mode 100644 index b3c7916ccfaca..0000000000000 Binary files a/vendor/cache/ddtrace-0.46.0.gem and /dev/null differ diff --git a/vendor/cache/ddtrace-1.5.0.gem b/vendor/cache/ddtrace-1.5.0.gem new file mode 100644 index 0000000000000..c020899f2593b Binary files /dev/null and b/vendor/cache/ddtrace-1.5.0.gem differ diff --git a/vendor/cache/debase-ruby_core_source-0.10.17.gem b/vendor/cache/debase-ruby_core_source-0.10.17.gem new file mode 100644 index 0000000000000..c08522ec93da5 Binary files /dev/null and b/vendor/cache/debase-ruby_core_source-0.10.17.gem differ diff --git a/vendor/cache/libdatadog-0.7.0.1.1-x86_64-linux.gem b/vendor/cache/libdatadog-0.7.0.1.1-x86_64-linux.gem new file mode 100644 index 0000000000000..59608dbb14d4c Binary files /dev/null and b/vendor/cache/libdatadog-0.7.0.1.1-x86_64-linux.gem differ diff --git a/vendor/cache/libdatadog-0.7.0.1.1.gem b/vendor/cache/libdatadog-0.7.0.1.1.gem new file mode 100644 index 0000000000000..47e9ff8cbe0a5 Binary files /dev/null and b/vendor/cache/libdatadog-0.7.0.1.1.gem differ diff --git a/vendor/cache/libddwaf-1.3.0.2.0-x86_64-darwin.gem b/vendor/cache/libddwaf-1.3.0.2.0-x86_64-darwin.gem new file mode 100644 index 0000000000000..fc6f68faa61c8 Binary files /dev/null and b/vendor/cache/libddwaf-1.3.0.2.0-x86_64-darwin.gem differ diff --git a/vendor/cache/libddwaf-1.3.0.2.0-x86_64-linux.gem b/vendor/cache/libddwaf-1.3.0.2.0-x86_64-linux.gem new file mode 100644 index 0000000000000..d1ec876ca9dbb Binary files /dev/null and b/vendor/cache/libddwaf-1.3.0.2.0-x86_64-linux.gem differ diff --git a/vendor/cache/libddwaf-1.3.0.2.0.gem b/vendor/cache/libddwaf-1.3.0.2.0.gem new file mode 100644 index 0000000000000..45fb54045d160 Binary files /dev/null and b/vendor/cache/libddwaf-1.3.0.2.0.gem differ diff --git a/vendor/cache/msgpack-1.4.2.gem b/vendor/cache/msgpack-1.4.2.gem deleted file mode 100644 index c3ae68b87150d..0000000000000 Binary files a/vendor/cache/msgpack-1.4.2.gem and /dev/null differ diff --git a/vendor/cache/msgpack-1.6.0.gem b/vendor/cache/msgpack-1.6.0.gem new file mode 100644 index 0000000000000..aa7ed51094238 Binary files /dev/null and b/vendor/cache/msgpack-1.6.0.gem differ