From 631b68855c37053e6befff4e9424eadea8da7da9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Apr 2022 14:04:11 +0000 Subject: [PATCH 1/2] Update opentelemetry-instrumentation-redis requirement from = 0.21.2 to = 0.21.3 Updates the requirements on [opentelemetry-instrumentation-redis](https://github.com/open-telemetry/opentelemetry-ruby) to permit the latest version. - [Release notes](https://github.com/open-telemetry/opentelemetry-ruby/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-ruby/blob/main/instrumentation/redis/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-ruby/compare/opentelemetry-instrumentation-redis/v0.21.2...opentelemetry-instrumentation-redis/v0.21.3) --- updated-dependencies: - dependency-name: opentelemetry-instrumentation-redis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 76 +++++++++++++++++++++++++++--------------------- vmpooler.gemspec | 2 +- 2 files changed, 44 insertions(+), 34 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b8fe64a..db483d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - vmpooler (2.2.0) + vmpooler (2.3.0) concurrent-ruby (~> 1.1) connection_pool (~> 2.2) deep_merge (~> 1.2) @@ -10,7 +10,7 @@ PATH opentelemetry-exporter-jaeger (= 0.20.1) opentelemetry-instrumentation-concurrent_ruby (= 0.19.2) opentelemetry-instrumentation-http_client (= 0.19.3) - opentelemetry-instrumentation-redis (= 0.21.2) + opentelemetry-instrumentation-redis (= 0.21.3) opentelemetry-instrumentation-sinatra (= 0.19.3) opentelemetry-resource_detectors (= 0.19.1) opentelemetry-sdk (~> 1.0, >= 1.0.2) @@ -32,12 +32,12 @@ GEM builder (3.2.4) climate_control (1.0.1) coderay (1.1.3) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) connection_pool (2.2.5) deep_merge (1.2.2) diff-lcs (1.5.0) docile (1.4.0) - faraday (1.9.3) + faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -61,18 +61,21 @@ GEM faraday-rack (1.0.0) faraday-retry (1.0.3) ffi (1.15.5-java) - google-cloud-env (1.5.0) - faraday (>= 0.17.3, < 2.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) method_source (1.0.0) - mock_redis (0.29.0) + mock_redis (0.30.0) ruby2_keywords multipart-post (2.1.1) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) net-ldap (0.17.0) + nio4r (2.5.8) nio4r (2.5.8-java) nokogiri (1.12.5-java) racc (~> 1.4) + nokogiri (1.12.5-x86_64-linux) + racc (~> 1.4) opentelemetry-api (1.0.1) opentelemetry-common (0.19.3) opentelemetry-api (~> 1.0) @@ -90,7 +93,7 @@ GEM opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.19.3) opentelemetry-instrumentation-base (~> 0.19.0) - opentelemetry-instrumentation-redis (0.21.2) + opentelemetry-instrumentation-redis (0.21.3) opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.19.3) opentelemetry-instrumentation-base (~> 0.19.0) @@ -108,41 +111,47 @@ GEM opentelemetry-semantic_conventions opentelemetry-semantic_conventions (1.8.0) opentelemetry-api (~> 1.0) - parallel (1.21.0) - parser (3.1.0.0) + parallel (1.22.1) + parser (3.1.1.0) ast (~> 2.4.1) pickup (0.0.11) prometheus-client (2.1.0) + pry (0.14.1) + coderay (~> 1.1) + method_source (~> 1.0) pry (0.14.1-java) coderay (~> 1.1) method_source (~> 1.0) spoon (~> 0.0) - puma (5.5.2-java) + puma (5.6.2) nio4r (~> 2.0) + puma (5.6.2-java) + nio4r (~> 2.0) + racc (1.6.0) racc (1.6.0-java) rack (2.2.3) - rack-protection (2.1.0) + rack-protection (2.2.0) rack rack-test (1.1.0) rack (>= 1.0, < 3) rainbow (3.1.1) rake (13.0.6) - redis (4.5.1) - regexp_parser (2.2.0) + redis (4.6.0) + regexp_parser (2.2.1) rexml (3.2.5) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.2) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.11.0) + rspec-mocks (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.3) + rspec-support (~> 3.11.0) + rspec-support (3.11.0) rubocop (1.1.0) parallel (~> 1.10) parser (>= 2.7.1.5) @@ -152,8 +161,8 @@ GEM rubocop-ast (>= 1.0.1) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.15.1) - parser (>= 3.0.1.1) + rubocop-ast (1.16.0) + parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) simplecov (0.21.2) @@ -161,19 +170,19 @@ GEM simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov_json_formatter (0.1.3) - sinatra (2.1.0) + simplecov_json_formatter (0.1.4) + sinatra (2.2.0) mustermann (~> 1.0) rack (~> 2.2) - rack-protection (= 2.1.0) + rack-protection (= 2.2.0) tilt (~> 2.0) - spicy-proton (2.1.13) + spicy-proton (2.1.14) bindata (~> 2.3) spoon (0.0.6) ffi statsd-ruby (1.5.0) thor (1.2.1) - thrift (0.15.0) + thrift (0.16.0) tilt (2.0.10) unicode-display_width (1.8.0) yarjuf (2.0.0) @@ -182,6 +191,7 @@ GEM PLATFORMS universal-java-1.8 + x86_64-linux DEPENDENCIES climate_control (>= 0.2.0) @@ -196,4 +206,4 @@ DEPENDENCIES yarjuf (>= 2.0) BUNDLED WITH - 2.3.5 + 2.3.10 diff --git a/vmpooler.gemspec b/vmpooler.gemspec index 49e2375..1a7295a 100644 --- a/vmpooler.gemspec +++ b/vmpooler.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| s.add_dependency 'opentelemetry-exporter-jaeger', '= 0.20.1' s.add_dependency 'opentelemetry-instrumentation-concurrent_ruby', '= 0.19.2' s.add_dependency 'opentelemetry-instrumentation-http_client', '= 0.19.3' - s.add_dependency 'opentelemetry-instrumentation-redis', '= 0.21.2' + s.add_dependency 'opentelemetry-instrumentation-redis', '= 0.21.3' s.add_dependency 'opentelemetry-instrumentation-sinatra', '= 0.19.3' s.add_dependency 'opentelemetry-resource_detectors', '= 0.19.1' s.add_dependency 'opentelemetry-sdk', '~> 1.0', '>= 1.0.2' From c9a66173e30b9f336f12824abd126c120287a776 Mon Sep 17 00:00:00 2001 From: Samuel Date: Mon, 25 Jul 2022 10:13:12 -0500 Subject: [PATCH 2/2] Update Gemfile.lock alphabetical order --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 02a9561..3ad22c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,8 +9,8 @@ PATH nokogiri (~> 1.10) opentelemetry-exporter-jaeger (= 0.20.1) opentelemetry-instrumentation-concurrent_ruby (= 0.19.2) - opentelemetry-instrumentation-redis (= 0.21.3) opentelemetry-instrumentation-http_client (= 0.19.4) + opentelemetry-instrumentation-redis (= 0.21.3) opentelemetry-instrumentation-sinatra (= 0.19.3) opentelemetry-resource_detectors (= 0.19.1) opentelemetry-sdk (~> 1.0, >= 1.0.2)