From f5698d49fc63b6ed50a5bf5a6e593def513cb54f Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Thu, 8 Oct 2020 09:49:45 -0400 Subject: [PATCH] Update to OTel 0.7.0 This update includes two key benefits: 1. Spans will be named based on their route instead of the full path info thanks to https://github.com/open-telemetry/opentelemetry-ruby/pull/415 2. Helper methods were added to the configurator to simplify setting service.name and service.version --- lib/vmpooler.rb | 9 +++------ vmpooler.gemspec | 14 +++++++------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/lib/vmpooler.rb b/lib/vmpooler.rb index b401a8d..bbc68f8 100644 --- a/lib/vmpooler.rb +++ b/lib/vmpooler.rb @@ -257,13 +257,10 @@ module Vmpooler c.add_span_processor(span_processor) + c.service_name = service_name + c.service_version = version + c.resource = OpenTelemetry::Resource::Detectors::AutoDetector.detect - c.resource = OpenTelemetry::SDK::Resources::Resource.create( - { - OpenTelemetry::SDK::Resources::Constants::SERVICE_RESOURCE[:name] => service_name, - OpenTelemetry::SDK::Resources::Constants::SERVICE_RESOURCE[:version] => version - } - ) end end end diff --git a/vmpooler.gemspec b/vmpooler.gemspec index a4d759f..9234528 100644 --- a/vmpooler.gemspec +++ b/vmpooler.gemspec @@ -21,13 +21,13 @@ Gem::Specification.new do |s| s.add_dependency 'connection_pool', '~> 2.2' s.add_dependency 'net-ldap', '~> 0.16' s.add_dependency 'nokogiri', '~> 1.10' - s.add_dependency 'opentelemetry-api', '~> 0.6.0' - s.add_dependency 'opentelemetry-exporter-jaeger', '~> 0.6.0' - s.add_dependency 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.6.0' - s.add_dependency 'opentelemetry-instrumentation-redis', '~> 0.6.0' - s.add_dependency 'opentelemetry-instrumentation-sinatra', '~> 0.6.0' - s.add_dependency 'opentelemetry-resource_detectors', '~> 0.6.0' - s.add_dependency 'opentelemetry-sdk', '~> 0.6.0' + s.add_dependency 'opentelemetry-api', '~> 0.7.0' + s.add_dependency 'opentelemetry-exporter-jaeger', '~> 0.7.0' + s.add_dependency 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.7.0' + s.add_dependency 'opentelemetry-instrumentation-redis', '~> 0.7.0' + s.add_dependency 'opentelemetry-instrumentation-sinatra', '~> 0.7.0' + s.add_dependency 'opentelemetry-resource_detectors', '~> 0.7.0' + s.add_dependency 'opentelemetry-sdk', '~> 0.7.0' s.add_dependency 'pickup', '~> 0.0.11' s.add_dependency 'prometheus-client', '~> 2.0' s.add_dependency 'puma', '~> 4.3'