chore: use local semantic_conventions gem (#870)

fbogsany · web-flow · commit 82fabd0434a0 · 2021-07-12T17:00:31.000-04:00
* chore: use local semantic_conventions gem

* use zipkin instead of jaeger to be less thrifty
diff --git a/.instrumentation_generator/templates/Gemfile b/.instrumentation_generator/templates/Gemfile
@@ -13,4 +13,5 @@ gem 'opentelemetry-api', path: '../../api'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/exporter/jaeger/Gemfile b/exporter/jaeger/Gemfile
@@ -13,3 +13,4 @@ gem 'opentelemetry-api', path: '../../api'
 gem 'opentelemetry-common', path: '../../common'
 gem 'opentelemetry-instrumentation-base', path: '../../instrumentation/base'
 gem 'opentelemetry-sdk', path: '../../sdk'
+gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
diff --git a/exporter/otlp/Gemfile b/exporter/otlp/Gemfile
@@ -13,3 +13,4 @@ gem 'opentelemetry-api', path: '../../api'
 gem 'opentelemetry-common', path: '../../common'
 gem 'opentelemetry-instrumentation-base', path: '../../instrumentation/base'
 gem 'opentelemetry-sdk', path: '../../sdk'
+gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
diff --git a/exporter/zipkin/Gemfile b/exporter/zipkin/Gemfile
@@ -13,3 +13,4 @@ gem 'opentelemetry-api', path: '../../api'
 gem 'opentelemetry-common', path: '../../common'
 gem 'opentelemetry-instrumentation-base', path: '../../instrumentation/base'
 gem 'opentelemetry-sdk', path: '../../sdk'
+gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
diff --git a/instrumentation/active_job/Gemfile b/instrumentation/active_job/Gemfile
@@ -14,6 +14,7 @@ gem 'opentelemetry-instrumentation-base', path: '../base'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 
   # gem 'pry'
   # gem 'pry-byebug'
diff --git a/instrumentation/active_model_serializers/Gemfile b/instrumentation/active_model_serializers/Gemfile
@@ -14,4 +14,5 @@ gem 'opentelemetry-instrumentation-base', path: '../base'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/instrumentation/active_record/Gemfile b/instrumentation/active_record/Gemfile
@@ -15,6 +15,7 @@ group :test do
   gem 'byebug'
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
   gem 'pry-byebug'
   gem 'sqlite3-ruby'
 end
diff --git a/instrumentation/all/Gemfile b/instrumentation/all/Gemfile
@@ -41,4 +41,5 @@ gem 'opentelemetry-instrumentation-sinatra', path: '../sinatra'
 
 group :test do
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/instrumentation/base/Gemfile b/instrumentation/base/Gemfile
@@ -13,4 +13,5 @@ gem 'opentelemetry-api', path: '../../api'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/instrumentation/bunny/Gemfile b/instrumentation/bunny/Gemfile
@@ -15,5 +15,6 @@ group :test do
   gem 'byebug'
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
   gem 'pry-byebug'
 end
diff --git a/instrumentation/concurrent_ruby/Gemfile b/instrumentation/concurrent_ruby/Gemfile
@@ -14,4 +14,5 @@ gem 'opentelemetry-instrumentation-base', path: '../base'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/instrumentation/dalli/Gemfile b/instrumentation/dalli/Gemfile
@@ -14,5 +14,6 @@ gem 'opentelemetry-instrumentation-base', path: '../base'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
   gem 'pry'
 end
diff --git a/instrumentation/delayed_job/Gemfile b/instrumentation/delayed_job/Gemfile
@@ -14,4 +14,5 @@ gem 'opentelemetry-instrumentation-base', path: '../base'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/instrumentation/ethon/Gemfile b/instrumentation/ethon/Gemfile
@@ -14,4 +14,5 @@ gem 'opentelemetry-instrumentation-base', path: '../base'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/instrumentation/excon/Gemfile b/instrumentation/excon/Gemfile
@@ -14,4 +14,5 @@ gem 'opentelemetry-instrumentation-base', path: '../base'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/instrumentation/faraday/Gemfile b/instrumentation/faraday/Gemfile
@@ -14,4 +14,5 @@ gem 'opentelemetry-instrumentation-base', path: '../base'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/instrumentation/graphql/Gemfile b/instrumentation/graphql/Gemfile
@@ -15,5 +15,6 @@ group :test do
   gem 'byebug'
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
   gem 'pry-byebug'
 end
diff --git a/instrumentation/http/Gemfile b/instrumentation/http/Gemfile
@@ -15,5 +15,6 @@ group :test do
   gem 'byebug'
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
   gem 'pry-byebug'
 end
diff --git a/instrumentation/http_client/Gemfile b/instrumentation/http_client/Gemfile
@@ -15,5 +15,6 @@ group :test do
   gem 'byebug'
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
   gem 'pry-byebug'
 end
diff --git a/instrumentation/koala/Gemfile b/instrumentation/koala/Gemfile
@@ -15,5 +15,6 @@ group :test do
   gem 'byebug'
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
   gem 'pry-byebug'
 end
diff --git a/instrumentation/lmdb/Gemfile b/instrumentation/lmdb/Gemfile
@@ -15,5 +15,6 @@ group :test do
   gem 'byebug'
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
   gem 'pry-byebug'
 end
diff --git a/instrumentation/mongo/Gemfile b/instrumentation/mongo/Gemfile
@@ -14,4 +14,5 @@ gem 'opentelemetry-instrumentation-base', path: '../base'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/instrumentation/mysql2/Gemfile b/instrumentation/mysql2/Gemfile
@@ -14,4 +14,5 @@ gem 'opentelemetry-instrumentation-base', path: '../base'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/instrumentation/net_http/Gemfile b/instrumentation/net_http/Gemfile
@@ -14,4 +14,5 @@ gem 'opentelemetry-instrumentation-base', path: '../base'
 
 group :test do
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/instrumentation/pg/Gemfile b/instrumentation/pg/Gemfile
@@ -14,4 +14,5 @@ gem 'opentelemetry-instrumentation-base', path: '../base'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/instrumentation/rack/Gemfile b/instrumentation/rack/Gemfile
@@ -15,5 +15,6 @@ group :test do
   gem 'byebug'
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
   gem 'pry-byebug'
 end
diff --git a/instrumentation/rails/Gemfile b/instrumentation/rails/Gemfile
@@ -17,5 +17,6 @@ group :test do
   gem 'opentelemetry-instrumentation-active_record', path: '../../instrumentation/active_record'
   gem 'opentelemetry-instrumentation-rack', path: '../../instrumentation/rack'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
   gem 'pry-byebug'
 end
diff --git a/instrumentation/redis/Gemfile b/instrumentation/redis/Gemfile
@@ -14,4 +14,5 @@ gem 'opentelemetry-instrumentation-base', path: '../base'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/instrumentation/resque/Gemfile b/instrumentation/resque/Gemfile
@@ -15,5 +15,6 @@ group :test do
   gem 'activejob'
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
   gem 'pry-byebug'
 end
diff --git a/instrumentation/restclient/Gemfile b/instrumentation/restclient/Gemfile
@@ -14,4 +14,5 @@ gem 'opentelemetry-instrumentation-base', path: '../base'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/instrumentation/ruby_kafka/Gemfile b/instrumentation/ruby_kafka/Gemfile
@@ -16,5 +16,6 @@ group :test do
   gem 'byebug'
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
   gem 'pry-byebug'
 end
diff --git a/instrumentation/sidekiq/Gemfile b/instrumentation/sidekiq/Gemfile
@@ -16,6 +16,7 @@ group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-instrumentation-redis', path: '../redis'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
   gem 'pry'
   gem 'pry-byebug'
 end
diff --git a/instrumentation/sinatra/Gemfile b/instrumentation/sinatra/Gemfile
@@ -14,4 +14,5 @@ gem 'opentelemetry-instrumentation-base', path: '../base'
 group :test do
   gem 'opentelemetry-common', path: '../../common'
   gem 'opentelemetry-sdk', path: '../../sdk'
+  gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
 end
diff --git a/propagator/jaeger/Gemfile b/propagator/jaeger/Gemfile
@@ -12,3 +12,4 @@ gem 'opentelemetry-api', path: '../../api'
 gem 'opentelemetry-common', path: '../../common'
 gem 'opentelemetry-instrumentation-base', path: '../../instrumentation/base'
 gem 'opentelemetry-sdk', path: '../../sdk'
+gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
diff --git a/propagator/ottrace/Gemfile b/propagator/ottrace/Gemfile
@@ -9,3 +9,4 @@ gem 'opentelemetry-api', path: '../../api'
 gem 'opentelemetry-common', path: '../../common'
 gem 'opentelemetry-instrumentation-base', path: '../../instrumentation/base'
 gem 'opentelemetry-sdk', path: '../../sdk'
+gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
diff --git a/sdk/Gemfile b/sdk/Gemfile
@@ -11,6 +11,6 @@ gemspec
 # Use the opentelemetry-api gem from source
 gem 'opentelemetry-api', path: '../api'
 gem 'opentelemetry-common', path: '../common'
-gem 'opentelemetry-exporter-jaeger', path: '../exporter/jaeger'
+gem 'opentelemetry-exporter-zipkin', path: '../exporter/zipkin'
 gem 'opentelemetry-instrumentation-base', path: '../instrumentation/base'
 gem 'opentelemetry-semantic_conventions', path: '../semantic_conventions'
diff --git a/sdk/opentelemetry-sdk.gemspec b/sdk/opentelemetry-sdk.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '>= 1.17'
   spec.add_development_dependency 'faraday', '~> 0.13'
   spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'opentelemetry-exporter-jaeger', '~> 0.18.0'
+  spec.add_development_dependency 'opentelemetry-exporter-zipkin', '~> 0.19.0'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rubocop', '~> 0.73.0'
   spec.add_development_dependency 'simplecov', '~> 0.17'
diff --git a/sdk/test/opentelemetry/sdk/configurator_test.rb b/sdk/test/opentelemetry/sdk/configurator_test.rb
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 require 'test_helper'
-require 'opentelemetry/exporter/jaeger'
+require 'opentelemetry/exporter/zipkin'
 
 describe OpenTelemetry::SDK::Configurator do
   let(:configurator) { OpenTelemetry::SDK::Configurator.new }
@@ -212,15 +212,15 @@
       end
 
       it 'can be set by environment variable' do
-        with_env('OTEL_TRACES_EXPORTER' => 'jaeger') do
+        with_env('OTEL_TRACES_EXPORTER' => 'zipkin') do
           configurator.configure
         end
 
         _(OpenTelemetry.tracer_provider.instance_variable_get(:@span_processors).first).must_be_instance_of(
           OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor
         )
         _(OpenTelemetry.tracer_provider.instance_variable_get(:@span_processors).first.instance_variable_get(:@exporter)).must_be_instance_of(
-          OpenTelemetry::Exporter::Jaeger::CollectorExporter
+          OpenTelemetry::Exporter::Zipkin::Exporter
         )
       end
 
