From 90ef9da898077086b1e94b33c5de5bbdd8c49d8f Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Fri, 7 Jul 2023 08:31:36 -0400 Subject: [PATCH] Bump redis and instrumentation gems --- Gemfile.lock | 75 ++++++++++++++++++++++++------------------------ vmpooler.gemspec | 10 +++---- 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7b0c4d7..19bfc05 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,10 +7,10 @@ PATH deep_merge (~> 1.2) net-ldap (~> 0.16) opentelemetry-exporter-jaeger (= 0.22.0) - opentelemetry-instrumentation-concurrent_ruby (= 0.19.2) - opentelemetry-instrumentation-http_client (= 0.19.4) - opentelemetry-instrumentation-redis (= 0.21.3) - opentelemetry-instrumentation-sinatra (= 0.19.3) + opentelemetry-instrumentation-concurrent_ruby (= 0.21.1) + opentelemetry-instrumentation-http_client (= 0.22.1) + opentelemetry-instrumentation-redis (= 0.25.1) + opentelemetry-instrumentation-sinatra (= 0.23.1) opentelemetry-resource_detectors (= 0.23.0) opentelemetry-sdk (~> 1.0, >= 1.0.2) pickup (~> 0.0.11) @@ -18,7 +18,7 @@ PATH puma (>= 5.0.4, < 7) rack (>= 2.2, < 4.0) rake (~> 13.0) - redis (~> 4.1) + redis (~> 4.1, < 6.0) sinatra (>= 2, < 4) spicy-proton (~> 2.1) statsd-ruby (~> 1.4) @@ -36,14 +36,13 @@ GEM deep_merge (1.2.2) diff-lcs (1.5.0) docile (1.4.0) - faraday (2.7.4) + faraday (2.7.10) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) ffi (1.15.5-java) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - json (2.6.3) json (2.6.3-java) method_source (1.0.0) mock_redis (0.36.0) @@ -51,10 +50,9 @@ GEM mustermann (3.0.0) ruby2_keywords (~> 0.0.1) net-ldap (0.18.0) - nio4r (2.5.9) nio4r (2.5.9-java) - opentelemetry-api (1.1.0) - opentelemetry-common (0.19.6) + opentelemetry-api (1.2.0) + opentelemetry-common (0.19.7) opentelemetry-api (~> 1.0) opentelemetry-exporter-jaeger (0.22.0) opentelemetry-api (~> 1.1) @@ -62,51 +60,54 @@ GEM opentelemetry-sdk (~> 1.2) opentelemetry-semantic_conventions thrift - opentelemetry-instrumentation-base (0.19.0) + opentelemetry-instrumentation-base (0.22.1) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-concurrent_ruby (0.19.2) + opentelemetry-registry (~> 0.1) + opentelemetry-instrumentation-concurrent_ruby (0.21.1) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.19.0) - opentelemetry-instrumentation-http_client (0.19.4) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-http_client (0.22.1) opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.19.3) - opentelemetry-instrumentation-base (~> 0.19.0) - opentelemetry-instrumentation-redis (0.21.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (0.23.2) opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.19.3) - opentelemetry-instrumentation-base (~> 0.19.0) - opentelemetry-instrumentation-sinatra (0.19.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-redis (0.25.1) opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.19.3) - opentelemetry-instrumentation-base (~> 0.19.0) - opentelemetry-registry (0.2.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-sinatra (0.23.1) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (~> 0.21) + opentelemetry-registry (0.3.0) opentelemetry-api (~> 1.1) opentelemetry-resource_detectors (0.23.0) google-cloud-env opentelemetry-sdk (~> 1.0) - opentelemetry-sdk (1.2.0) + opentelemetry-sdk (1.2.1) opentelemetry-api (~> 1.1) opentelemetry-common (~> 0.19.3) opentelemetry-registry (~> 0.2) opentelemetry-semantic_conventions - opentelemetry-semantic_conventions (1.8.0) + opentelemetry-semantic_conventions (1.10.0) opentelemetry-api (~> 1.0) parallel (1.23.0) - parser (3.2.2.1) + parser (3.2.2.3) ast (~> 2.4.1) + racc pickup (0.0.11) prometheus-client (4.1.0) - pry (0.14.2) - coderay (~> 1.1) - method_source (~> 1.0) pry (0.14.2-java) coderay (~> 1.1) method_source (~> 1.0) spoon (~> 0.0) - puma (6.2.2) - nio4r (~> 2.0) - puma (6.2.2-java) + puma (6.3.0-java) nio4r (~> 2.0) + racc (1.7.1-java) rack (2.2.7) rack-protection (3.0.6) rack @@ -115,21 +116,21 @@ GEM rainbow (3.1.1) rake (13.0.6) redis (4.8.1) - regexp_parser (2.8.0) + regexp_parser (2.8.1) rexml (3.2.5) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) rspec-mocks (~> 3.12.0) - rspec-core (3.12.1) + rspec-core (3.12.2) rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.3) + rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-support (3.12.0) + rspec-support (3.12.1) rubocop (1.51.0) json (~> 2.3) parallel (~> 1.10) @@ -140,7 +141,7 @@ GEM rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.28.1) + rubocop-ast (1.29.0) parser (>= 3.2.1.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) @@ -162,7 +163,7 @@ GEM statsd-ruby (1.5.0) thor (1.2.2) thrift (0.18.1) - tilt (2.1.0) + tilt (2.2.0) unicode-display_width (2.4.2) yarjuf (2.0.0) builder @@ -186,4 +187,4 @@ DEPENDENCIES yarjuf (>= 2.0) BUNDLED WITH - 2.3.18 + 2.4.15 diff --git a/vmpooler.gemspec b/vmpooler.gemspec index 22b19b6..564718f 100644 --- a/vmpooler.gemspec +++ b/vmpooler.gemspec @@ -21,10 +21,10 @@ Gem::Specification.new do |s| s.add_dependency 'deep_merge', '~> 1.2' s.add_dependency 'net-ldap', '~> 0.16' s.add_dependency 'opentelemetry-exporter-jaeger', '= 0.22.0' - s.add_dependency 'opentelemetry-instrumentation-concurrent_ruby', '= 0.19.2' - s.add_dependency 'opentelemetry-instrumentation-http_client', '= 0.19.4' - s.add_dependency 'opentelemetry-instrumentation-redis', '= 0.21.3' - s.add_dependency 'opentelemetry-instrumentation-sinatra', '= 0.19.3' + s.add_dependency 'opentelemetry-instrumentation-concurrent_ruby', '= 0.21.1' + s.add_dependency 'opentelemetry-instrumentation-http_client', '= 0.22.1' + s.add_dependency 'opentelemetry-instrumentation-redis', '= 0.25.1' + s.add_dependency 'opentelemetry-instrumentation-sinatra', '= 0.23.1' s.add_dependency 'opentelemetry-resource_detectors', '= 0.23.0' s.add_dependency 'opentelemetry-sdk', '~> 1.0', '>= 1.0.2' s.add_dependency 'pickup', '~> 0.0.11' @@ -32,7 +32,7 @@ Gem::Specification.new do |s| s.add_dependency 'puma', '>= 5.0.4', '< 7' s.add_dependency 'rack', '>= 2.2', '< 4.0' s.add_dependency 'rake', '~> 13.0' - s.add_dependency 'redis', '~> 4.1' + s.add_dependency 'redis', '~> 4.1', '< 6.0' s.add_dependency 'sinatra', '>= 2', '< 4' s.add_dependency 'spicy-proton', '~> 2.1' s.add_dependency 'statsd-ruby', '~> 1.4'