puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 01:58:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

(RE-15162) Update OTEL gems.

Browse source
This commit is contained in:
isaac-hammes 2023-08-10 06:15:27 -07:00
parent 46156fd85f
commit ac578eef15
4 changed files with 58 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

67
Gemfile.lock
View file

@ -6,13 +6,13 @@ PATH
connection_pool (~> 2.4) connection_pool (~> 2.4)
deep_merge (~> 1.2) deep_merge (~> 1.2)
net-ldap (~> 0.16) net-ldap (~> 0.16)
opentelemetry-exporter-jaeger (= 0.22.0) opentelemetry-exporter-jaeger (= 0.23.0)
opentelemetry-instrumentation-concurrent_ruby (= 0.19.2) opentelemetry-instrumentation-concurrent_ruby (= 0.21.1)
opentelemetry-instrumentation-http_client (= 0.19.4) opentelemetry-instrumentation-http_client (= 0.22.2)
opentelemetry-instrumentation-redis (= 0.21.3) opentelemetry-instrumentation-redis (= 0.25.3)
opentelemetry-instrumentation-sinatra (= 0.19.3) opentelemetry-instrumentation-sinatra (= 0.23.2)
opentelemetry-resource_detectors (= 0.23.0) opentelemetry-resource_detectors (= 0.24.1)
opentelemetry-sdk (~> 1.0, >= 1.0.2) opentelemetry-sdk (~> 1.3, >= 1.3.0)
pickup (~> 0.0.11) pickup (~> 0.0.11)
prometheus-client (>= 2, < 5) prometheus-client (>= 2, < 5)
puma (>= 5.0.4, < 7) puma (>= 5.0.4, < 7)
@ -47,47 +47,52 @@ GEM
json (2.6.3-java) json (2.6.3-java)
language_server-protocol (3.17.0.3) language_server-protocol (3.17.0.3)
method_source (1.0.0) method_source (1.0.0)
mock_redis (0.36.0) mock_redis (0.37.0)
ruby2_keywords
mustermann (3.0.0) mustermann (3.0.0)
ruby2_keywords (~> 0.0.1) ruby2_keywords (~> 0.0.1)
net-ldap (0.18.0) net-ldap (0.18.0)
nio4r (2.5.9) nio4r (2.5.9)
nio4r (2.5.9-java) nio4r (2.5.9-java)
opentelemetry-api (1.2.1) opentelemetry-api (1.2.1)
opentelemetry-common (0.19.7) opentelemetry-common (0.20.0)
opentelemetry-api (~> 1.0) opentelemetry-api (~> 1.0)
opentelemetry-exporter-jaeger (0.22.0) opentelemetry-exporter-jaeger (0.23.0)
opentelemetry-api (~> 1.1) opentelemetry-api (~> 1.1)
opentelemetry-common (~> 0.19.6) opentelemetry-common (~> 0.20)
opentelemetry-sdk (~> 1.2) opentelemetry-sdk (~> 1.2)
opentelemetry-semantic_conventions opentelemetry-semantic_conventions
thrift thrift
opentelemetry-instrumentation-base (0.19.0) opentelemetry-instrumentation-base (0.22.2)
opentelemetry-api (~> 1.0) 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-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.19.0) opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-http_client (0.19.4) opentelemetry-instrumentation-http_client (0.22.2)
opentelemetry-api (~> 1.0) opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3) opentelemetry-common (~> 0.20.0)
opentelemetry-instrumentation-base (~> 0.19.0) opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-redis (0.21.3) opentelemetry-instrumentation-rack (0.23.4)
opentelemetry-api (~> 1.0) opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3) opentelemetry-common (~> 0.20.0)
opentelemetry-instrumentation-base (~> 0.19.0) opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-sinatra (0.19.3) opentelemetry-instrumentation-redis (0.25.3)
opentelemetry-api (~> 1.0) opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3) opentelemetry-common (~> 0.20.0)
opentelemetry-instrumentation-base (~> 0.19.0) opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-sinatra (0.23.2)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.20.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-rack (~> 0.21)
opentelemetry-registry (0.3.0) opentelemetry-registry (0.3.0)
opentelemetry-api (~> 1.1) opentelemetry-api (~> 1.1)
opentelemetry-resource_detectors (0.23.0) opentelemetry-resource_detectors (0.24.1)
google-cloud-env google-cloud-env
opentelemetry-sdk (~> 1.0) opentelemetry-sdk (~> 1.0)
opentelemetry-sdk (1.2.1) opentelemetry-sdk (1.3.0)
opentelemetry-api (~> 1.1) opentelemetry-api (~> 1.1)
opentelemetry-common (~> 0.19.3) opentelemetry-common (~> 0.20)
opentelemetry-registry (~> 0.2) opentelemetry-registry (~> 0.2)
opentelemetry-semantic_conventions opentelemetry-semantic_conventions
opentelemetry-semantic_conventions (1.10.0) opentelemetry-semantic_conventions (1.10.0)
@ -118,7 +123,7 @@ GEM
rack (>= 1.3) rack (>= 1.3)
rainbow (3.1.1) rainbow (3.1.1)
rake (13.0.6) rake (13.0.6)
redis (5.0.6) redis (5.0.7)
redis-client (>= 0.9.0) redis-client (>= 0.9.0)
redis-client (0.15.0) redis-client (0.15.0)
connection_pool connection_pool
@ -137,7 +142,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0) rspec-support (~> 3.12.0)
rspec-support (3.12.1) rspec-support (3.12.1)
rubocop (1.54.2) rubocop (1.55.1)
json (~> 2.3) json (~> 2.3)
language_server-protocol (>= 3.17.0) language_server-protocol (>= 3.17.0)
parallel (~> 1.10) parallel (~> 1.10)
@ -145,7 +150,7 @@ GEM
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0) regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0) rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.0, < 2.0) rubocop-ast (>= 1.28.1, < 2.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0) unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.29.0) rubocop-ast (1.29.0)
@ -186,7 +191,7 @@ DEPENDENCIES
pry pry
rack-test (>= 0.6) rack-test (>= 0.6)
rspec (>= 3.2) rspec (>= 3.2)
rubocop (~> 1.54.2) rubocop (~> 1.55.1)
simplecov (>= 0.11.2) simplecov (>= 0.11.2)
thor (~> 1.0, >= 1.0.1) thor (~> 1.0, >= 1.0.1)
vmpooler! vmpooler!

8
lib/vmpooler.rb
View file

@ -209,7 +209,13 @@ module Vmpooler
end end
def self.new_redis(host = 'localhost', port = nil, password = nil, redis_reconnect_attempts = 10) def self.new_redis(host = 'localhost', port = nil, password = nil, redis_reconnect_attempts = 10)
Redis.new(host: host, port: port, password: password, reconnect_attempts: redis_reconnect_attempts, timeout: 5) Redis.new(
host: host,
port: port,
password: password,
reconnect_attempts: redis_reconnect_attempts,
connect_timeout: 300,
)
end end
def self.pools(conf) def self.pools(conf)

12
lib/vmpooler/pool_manager.rb
View file

@ -1442,13 +1442,15 @@ module Vmpooler
end end
def create_dns_object(config, logger, metrics, redis_connection_pool, dns_class, dns_name, options) def create_dns_object(config, logger, metrics, redis_connection_pool, dns_class, dns_name, options)
dns_klass = Vmpooler::PoolManager::Dns if defined?(Vmpooler::PoolManager::Dns)
dns_klass.constants.each do |classname| dns_klass = Vmpooler::PoolManager::Dns
next unless classname.to_s.casecmp(dns_class) == 0 dns_klass.constants.each do |classname|
next unless classname.to_s.casecmp(dns_class) == 0
return dns_klass.const_get(classname).new(config, logger, metrics, redis_connection_pool, dns_name, options) return dns_klass.const_get(classname).new(config, logger, metrics, redis_connection_pool, dns_name, options)
end
raise("DNS '#{dns_class}' is unknown for pool with dns name '#{dns_name}'") if dns_klass.nil?
end end
raise("DNS '#{dns_class}' is unknown for pool with dns name '#{dns_name}'") if dns_klass.nil?
end end
def check_ondemand_requests(maxloop = 0, def check_ondemand_requests(maxloop = 0,

16
vmpooler.gemspec
View file

@ -20,13 +20,13 @@ Gem::Specification.new do |s|
s.add_dependency 'connection_pool', '~> 2.4' s.add_dependency 'connection_pool', '~> 2.4'
s.add_dependency 'deep_merge', '~> 1.2' s.add_dependency 'deep_merge', '~> 1.2'
s.add_dependency 'net-ldap', '~> 0.16' s.add_dependency 'net-ldap', '~> 0.16'
s.add_dependency 'opentelemetry-exporter-jaeger', '= 0.22.0' s.add_dependency 'opentelemetry-exporter-jaeger', '= 0.23.0'
s.add_dependency 'opentelemetry-instrumentation-concurrent_ruby', '= 0.19.2' s.add_dependency 'opentelemetry-instrumentation-concurrent_ruby', '= 0.21.1'
s.add_dependency 'opentelemetry-instrumentation-http_client', '= 0.19.4' s.add_dependency 'opentelemetry-instrumentation-http_client', '= 0.22.2'
s.add_dependency 'opentelemetry-instrumentation-redis', '= 0.21.3' s.add_dependency 'opentelemetry-instrumentation-redis', '= 0.25.3'
s.add_dependency 'opentelemetry-instrumentation-sinatra', '= 0.19.3' s.add_dependency 'opentelemetry-instrumentation-sinatra', '= 0.23.2'
s.add_dependency 'opentelemetry-resource_detectors', '= 0.23.0' s.add_dependency 'opentelemetry-resource_detectors', '= 0.24.1'
s.add_dependency 'opentelemetry-sdk', '~> 1.0', '>= 1.0.2' s.add_dependency 'opentelemetry-sdk', '~> 1.3', '>= 1.3.0'
s.add_dependency 'pickup', '~> 0.0.11' s.add_dependency 'pickup', '~> 0.0.11'
s.add_dependency 'prometheus-client', '>= 2', '< 5' s.add_dependency 'prometheus-client', '>= 2', '< 5'
s.add_dependency 'puma', '>= 5.0.4', '< 7' s.add_dependency 'puma', '>= 5.0.4', '< 7'
@ -43,7 +43,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'pry' s.add_development_dependency 'pry'
s.add_development_dependency 'rack-test', '>= 0.6' s.add_development_dependency 'rack-test', '>= 0.6'
s.add_development_dependency 'rspec', '>= 3.2' s.add_development_dependency 'rspec', '>= 3.2'
s.add_development_dependency 'rubocop', '~> 1.54.2' s.add_development_dependency 'rubocop', '~> 1.55.1'
s.add_development_dependency 'simplecov', '>= 0.11.2' s.add_development_dependency 'simplecov', '>= 0.11.2'
s.add_development_dependency 'thor', '~> 1.0', '>= 1.0.1' s.add_development_dependency 'thor', '~> 1.0', '>= 1.0.1'
s.add_development_dependency 'yarjuf', '>= 2.0' s.add_development_dependency 'yarjuf', '>= 2.0'