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

Merge branch 'master' into move-to-gh-actions

Browse source
This commit is contained in:
mattkirby 2021-02-02 09:17:14 -08:00 • committed by GitHub
commit 09e86d4be2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/vmpooler.rb
View file

@ -16,7 +16,6 @@ module Vmpooler
require 'yaml' require 'yaml'
# Dependencies for tracing # Dependencies for tracing
require 'opentelemetry-api'
require 'opentelemetry-instrumentation-concurrent_ruby' require 'opentelemetry-instrumentation-concurrent_ruby'
require 'opentelemetry-instrumentation-redis' require 'opentelemetry-instrumentation-redis'
require 'opentelemetry-instrumentation-sinatra' require 'opentelemetry-instrumentation-sinatra'

2
lib/vmpooler/metrics/promstats/collector_middleware.rb
View file

@ -113,7 +113,7 @@ module Vmpooler
# Similarly, request IDs are also stripped from the /ondemand path. # Similarly, request IDs are also stripped from the /ondemand path.
path path
.gsub(%r{/vm/.+$}, '/vm') .gsub(%r{/vm/.+$}, '/vm')
.gsub(%r{/ondemand/.+$}, '/ondemand') .gsub(%r{/ondemandvm/.+$}, '/ondemandvm')
.gsub(%r{/token/.+$}, '/token') .gsub(%r{/token/.+$}, '/token')
.gsub(%r{/lib/.+$}, '/lib') .gsub(%r{/lib/.+$}, '/lib')
.gsub(%r{/img/.+$}, '/img') .gsub(%r{/img/.+$}, '/img')

2
lib/vmpooler/version.rb
View file

@ -1,5 +1,5 @@
# frozen_string_literal: true # frozen_string_literal: true
module Vmpooler module Vmpooler
VERSION = '0.18.2' VERSION = '1.0.0'
end end

6
spec/unit/collector_middleware_spec.rb
View file

@ -72,14 +72,14 @@ describe Vmpooler::Metrics::Promstats::CollectorMiddleware do
it 'normalizes paths containing /ondemandvm by ' do it 'normalizes paths containing /ondemandvm by ' do
expect(Benchmark).to receive(:realtime).and_yield.and_return(0.3) expect(Benchmark).to receive(:realtime).and_yield.and_return(0.3)
get '/foo/ondemand/bar/fatman' get '/foo/ondemandvm/bar/fatman'
metric = :http_server_requests_total metric = :http_server_requests_total
labels = { method: 'get', path: '/foo/ondemand', code: '200' } labels = { method: 'get', path: '/foo/ondemandvm', code: '200' }
expect(registry.get(metric).get(labels: labels)).to eql(1.0) expect(registry.get(metric).get(labels: labels)).to eql(1.0)
metric = :http_server_request_duration_seconds metric = :http_server_request_duration_seconds
labels = { method: 'get', path: '/foo/ondemand' } labels = { method: 'get', path: '/foo/ondemandvm' }
expect(registry.get(metric).get(labels: labels)).to include("0.1" => 0, "0.5" => 1) expect(registry.get(metric).get(labels: labels)).to include("0.1" => 0, "0.5" => 1)
end end

13
vmpooler.gemspec
View file

@ -21,13 +21,12 @@ Gem::Specification.new do |s|
s.add_dependency 'connection_pool', '~> 2.2' s.add_dependency 'connection_pool', '~> 2.2'
s.add_dependency 'net-ldap', '~> 0.16' s.add_dependency 'net-ldap', '~> 0.16'
s.add_dependency 'nokogiri', '~> 1.10' s.add_dependency 'nokogiri', '~> 1.10'
s.add_dependency 'opentelemetry-api', '= 0.8.0' s.add_dependency 'opentelemetry-exporter-jaeger', '= 0.13.0'
s.add_dependency 'opentelemetry-exporter-jaeger', '= 0.8.0' s.add_dependency 'opentelemetry-instrumentation-concurrent_ruby', '= 0.13.0'
s.add_dependency 'opentelemetry-instrumentation-concurrent_ruby', '= 0.8.0' s.add_dependency 'opentelemetry-instrumentation-redis', '= 0.13.0'
s.add_dependency 'opentelemetry-instrumentation-redis', '= 0.8.0' s.add_dependency 'opentelemetry-instrumentation-sinatra', '= 0.13.0'
s.add_dependency 'opentelemetry-instrumentation-sinatra', '= 0.8.0' s.add_dependency 'opentelemetry-resource_detectors', '= 0.13.0'
s.add_dependency 'opentelemetry-resource_detectors', '= 0.8.0' s.add_dependency 'opentelemetry-sdk', '= 0.13.1'
s.add_dependency 'opentelemetry-sdk', '= 0.8.0'
s.add_dependency 'pickup', '~> 0.0.11' s.add_dependency 'pickup', '~> 0.0.11'
s.add_dependency 'prometheus-client', '~> 2.0' s.add_dependency 'prometheus-client', '~> 2.0'
s.add_dependency 'puma', '~> 5.0', '>= 5.0.4' s.add_dependency 'puma', '~> 5.0', '>= 5.0.4'