From ce44d46931462ca2d6d36ea1add57f72e84b07f6 Mon Sep 17 00:00:00 2001 From: isaac-hammes Date: Mon, 5 Jun 2023 09:12:28 -0700 Subject: [PATCH] Update vmpooler and instrumentation gems --- docker/Gemfile | 4 +- docker/Gemfile.lock | 109 +++++++++++++++++++++++++------------------- 2 files changed, 64 insertions(+), 49 deletions(-) diff --git a/docker/Gemfile b/docker/Gemfile index cd67ec9..41d02ad 100644 --- a/docker/Gemfile +++ b/docker/Gemfile @@ -1,6 +1,6 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' -gem 'vmpooler', '~> 3.0' + gem 'vmpooler-dns-gcp', '~> 1.0' # Remove temporarily until a stable minor release is published # gem 'vmpooler-provider-ec2', '~> 0.0.1' @@ -8,7 +8,7 @@ gem 'vmpooler-provider-gce', '~> 1.0' gem 'vmpooler-provider-vsphere', '~> 3.0' # For development install via a git branch use something like: -# gem 'vmpooler', git: 'https://github.com/puppetlabs/vmpooler.git', branch: 'my-feature' +gem 'vmpooler', git: 'https://github.com/puppetlabs/vmpooler.git', branch: 'update_redis' # gem 'vmpooler-dns-gcp', git: 'https://github.com/puppetlabs/vmpooler-dns-gcp.git', branch: 'my-feature' # gem 'vmpooler-provider-ec2', git: 'https://github.com/puppetlabs/vmpooler-provider-ec2.git', branch: 'my-feature' # gem 'vmpooler-provider-gce', git: 'https://github.com/puppetlabs/vmpooler-provider-gce.git', branch: 'my-feature' diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock index 449ce5e..a4bd31c 100644 --- a/docker/Gemfile.lock +++ b/docker/Gemfile.lock @@ -1,3 +1,30 @@ +GIT + remote: https://github.com/puppetlabs/vmpooler.git + revision: fdaaf91f4360de25d6ce2ad77b23785a3911e449 + branch: update_redis + specs: + vmpooler (3.1.0) + concurrent-ruby (~> 1.1) + connection_pool (~> 2.4) + deep_merge (~> 1.2) + net-ldap (~> 0.16) + opentelemetry-exporter-jaeger (= 0.22.0) + 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) + prometheus-client (>= 2, < 5) + puma (>= 5.0.4, < 7) + rack (>= 2.2, < 4.0) + rake (~> 13.0) + redis (~> 5.0) + sinatra (>= 2, < 4) + spicy-proton (~> 2.1) + statsd-ruby (~> 1.4) + GEM remote: https://rubygems.org/ specs: @@ -6,14 +33,14 @@ GEM bindata (2.4.15) builder (3.2.4) concurrent-ruby (1.2.2) - connection_pool (2.4.0) + connection_pool (2.4.1) declarative (0.0.20) deep_merge (1.2.2) - 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) - google-apis-compute_v1 (0.66.0) + google-apis-compute_v1 (0.72.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-core (0.11.0) addressable (~> 2.5, >= 2.5.1) @@ -46,7 +73,7 @@ GEM signet (>= 0.16, < 2.a) httpclient (2.8.3) json (2.6.3-java) - jwt (2.7.0) + jwt (2.7.1) memoist (0.16.2) mini_mime (1.1.2) multi_json (1.15.0) @@ -54,10 +81,10 @@ GEM ruby2_keywords (~> 0.0.1) net-ldap (0.18.0) nio4r (2.5.9-java) - nokogiri (1.14.3-java) + nokogiri (1.15.3-java) racc (~> 1.4) - 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) @@ -65,53 +92,62 @@ 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) optimist (3.0.1) os (1.1.4) pickup (0.0.11) prometheus-client (4.1.0) public_suffix (5.0.1) - puma (6.2.2-java) + puma (6.3.0-java) nio4r (~> 2.0) - racc (1.6.2-java) + racc (1.7.1-java) rack (2.2.7) rack-protection (3.0.6) rack rake (13.0.6) - rbvmomi2 (3.6.0) + rbvmomi2 (3.6.1) builder (~> 3.2) json (~> 2.3) nokogiri (~> 1.12, >= 1.12.5) optimist (~> 3.0) - redis (4.8.1) + redis (5.0.6) + redis-client (>= 0.9.0) + redis-client (0.14.1) + connection_pool representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -133,30 +169,9 @@ GEM bindata (~> 2.3) statsd-ruby (1.5.0) thrift (0.18.1) - tilt (2.1.0) + tilt (2.2.0) trailblazer-option (0.1.2) uber (0.1.0) - vmpooler (3.1.0) - concurrent-ruby (~> 1.1) - connection_pool (~> 2.2) - 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-resource_detectors (= 0.23.0) - opentelemetry-sdk (~> 1.0, >= 1.0.2) - pickup (~> 0.0.11) - prometheus-client (>= 2, < 5) - puma (>= 5.0.4, < 7) - rack (>= 2.2, < 4.0) - rake (~> 13.0) - redis (~> 4.1) - sinatra (>= 2, < 4) - spicy-proton (~> 2.1) - statsd-ruby (~> 1.4) vmpooler-dns-gcp (1.1.0) google-cloud-dns (~> 0.35.1) googleauth (>= 0.16.2, < 1.3.0) @@ -175,10 +190,10 @@ PLATFORMS universal-java-11 DEPENDENCIES - vmpooler (~> 3.0) + vmpooler! vmpooler-dns-gcp (~> 1.0) vmpooler-provider-gce (~> 1.0) vmpooler-provider-vsphere (~> 3.0) BUNDLED WITH - 2.4.12 + 2.4.13