Skip to content

Commit

Permalink
chore: Remove Local Path Gem Dependencies (#1219)
Browse files Browse the repository at this point in the history
* chore: Remove Local Path Gem Dependencies

Additional step to decouple the contrib packages from the main repo.

See open-telemetry/opentelemetry-ruby-contrib#1

* fix: Linter autocorrect
  • Loading branch information
arielvalentin authored May 4, 2022
1 parent 0f7d785 commit 55937d6
Show file tree
Hide file tree
Showing 21 changed files with 36 additions and 66 deletions.
5 changes: 2 additions & 3 deletions common/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ source 'https://rubygems.org'

gemspec

# Use the opentelemetry-api gem from source
gem 'opentelemetry-api', path: '../api'

group :development, :test do
# Use the opentelemetry-api gem from source
gem 'opentelemetry-api', path: '../api'
gem 'pry'
end
11 changes: 4 additions & 7 deletions exporter/jaeger/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@ source 'https://rubygems.org'

gemspec

# Use the opentelemetry-api gem from source
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'

group :test, :development do
gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-common', path: '../../common'
gem 'opentelemetry-sdk', path: '../../sdk'
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
gem 'opentelemetry-test-helpers', path: '../../test_helpers'
end
1 change: 1 addition & 0 deletions exporter/jaeger/opentelemetry-exporter-jaeger.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'opentelemetry-api', '~> 1.0'
spec.add_dependency 'opentelemetry-common', '~> 0.19.3'
spec.add_dependency 'opentelemetry-sdk', '~> 1.0'
spec.add_dependency 'opentelemetry-semantic_conventions'
spec.add_dependency 'thrift'

spec.add_development_dependency 'bundler', '>= 1.17'
Expand Down
11 changes: 4 additions & 7 deletions exporter/otlp/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@ source 'https://rubygems.org'

gemspec

# Use the opentelemetry-api gem from source
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'

group :test, :development do
gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-common', path: '../../common'
gem 'opentelemetry-sdk', path: '../../sdk'
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
gem 'opentelemetry-test-helpers', path: '../../test_helpers'
end
1 change: 1 addition & 0 deletions exporter/otlp/opentelemetry-exporter-otlp.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'opentelemetry-api', '~> 1.0'
spec.add_dependency 'opentelemetry-common', '~> 0.19.3'
spec.add_dependency 'opentelemetry-sdk', '~> 1.0'
spec.add_dependency 'opentelemetry-semantic_conventions'

spec.add_development_dependency 'bundler', '>= 1.17'
spec.add_development_dependency 'faraday', '~> 0.13'
Expand Down
11 changes: 4 additions & 7 deletions exporter/zipkin/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@ source 'https://rubygems.org'

gemspec

# Use the opentelemetry-api gem from source
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'

group :test, :development do
gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-common', path: '../../common'
gem 'opentelemetry-sdk', path: '../../sdk'
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
gem 'opentelemetry-test-helpers', path: '../../test_helpers'
end
1 change: 1 addition & 0 deletions exporter/zipkin/opentelemetry-exporter-zipkin.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'opentelemetry-api', '~> 1.0'
spec.add_dependency 'opentelemetry-common', '~> 0.19.3'
spec.add_dependency 'opentelemetry-sdk', '~> 1.0'
spec.add_dependency 'opentelemetry-semantic_conventions'

spec.add_development_dependency 'bundler', '>= 1.17'
spec.add_development_dependency 'faraday', '~> 0.13'
Expand Down
3 changes: 1 addition & 2 deletions metrics_api/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ source 'https://rubygems.org'

gemspec

gem 'opentelemetry-api', path: '../api'

group :test, :development do
gem 'opentelemetry-api', path: '../api'
gem 'pry'
gem 'pry-byebug' unless RUBY_ENGINE == 'jruby'
end
5 changes: 3 additions & 2 deletions propagator/b3/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ source 'https://rubygems.org'

gemspec

gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-instrumentation-base', path: '../../instrumentation/base'
group :test do
gem 'opentelemetry-api', path: '../../api'
end
9 changes: 4 additions & 5 deletions propagator/jaeger/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ source 'https://rubygems.org'

gemspec

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'
group :test do
gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-sdk', path: '../../sdk'
end
6 changes: 0 additions & 6 deletions propagator/ottrace/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,3 @@ source 'https://rubygems.org'

# Specify your gem's dependencies in opentelemetry-propragator-ottrace.gemspec
gemspec

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'
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ Gem::Specification.new do |spec|

spec.add_development_dependency 'bundler', '>= 1.17'
spec.add_development_dependency 'minitest', '~> 5.0'
spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
spec.add_development_dependency 'rake', '~> 12.0'
spec.add_development_dependency 'rubocop', '~> 0.73.0'
spec.add_development_dependency 'simplecov', '~> 0.17.1'
Expand Down
2 changes: 1 addition & 1 deletion propagator/ottrace/test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
require 'minitest/autorun'
require 'opentelemetry/sdk'
require 'opentelemetry-api'
require 'opentelemetry-propagator-ottrace'

OpenTelemetry.logger = Logger.new(File::NULL)
3 changes: 0 additions & 3 deletions propagator/xray/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,3 @@
source 'https://rubygems.org'

gemspec

gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-instrumentation-base', path: '../../instrumentation/base'
4 changes: 3 additions & 1 deletion registry/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ source 'https://rubygems.org'

gemspec

gem 'opentelemetry-api', path: '../api'
group :test do
gem 'opentelemetry-api', path: '../api'
end
6 changes: 0 additions & 6 deletions resource_detectors/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ source 'https://rubygems.org'

gemspec

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'

group :development, :test do
gem 'byebug' unless RUBY_PLATFORM == 'java'
gem 'pry'
Expand Down
11 changes: 4 additions & 7 deletions sdk/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@ source 'https://rubygems.org'

gemspec

# Use the opentelemetry-api gem from source
gem 'opentelemetry-api', path: '../api'
gem 'opentelemetry-common', path: '../common'
gem 'opentelemetry-exporter-zipkin', path: '../exporter/zipkin'
gem 'opentelemetry-instrumentation-base', path: '../instrumentation/base'
gem 'opentelemetry-semantic_conventions', path: '../semantic_conventions'

group :test, :development do
gem 'opentelemetry-api', path: '../api'
gem 'opentelemetry-common', path: '../common'
gem 'opentelemetry-exporter-zipkin', path: '../exporter/zipkin'
gem 'opentelemetry-semantic_conventions', path: '../semantic_conventions'
gem 'opentelemetry-test-helpers', path: '../test_helpers'
end
4 changes: 1 addition & 3 deletions semantic_conventions/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ source 'https://rubygems.org'

gemspec

# Use the opentelemetry-api gem from source
gem 'opentelemetry-api', path: '../api'

group :development, :test do
gem 'opentelemetry-api', path: '../api'
gem 'pry'
end
3 changes: 0 additions & 3 deletions test_helpers/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,5 @@ gemspec

group :test, :development do
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'
end
1 change: 1 addition & 0 deletions test_helpers/opentelemetry-test-helpers.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Gem::Specification.new do |spec|

spec.add_development_dependency 'bundler', '>= 1.17'
spec.add_development_dependency 'minitest', '~> 5.0'
spec.add_development_dependency 'opentelemetry-sdk'
spec.add_development_dependency 'pry'
spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby'
spec.add_development_dependency 'rake', '~> 12.0'
Expand Down
3 changes: 1 addition & 2 deletions test_helpers/test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
#
# SPDX-License-Identifier: Apache-2.0

require 'opentelemetry'
require 'opentelemetry/sdk'
require 'opentelemetry-sdk'
require 'opentelemetry-test-helpers'
require 'minitest/autorun'
require 'pry'
Expand Down

0 comments on commit 55937d6

Please sign in to comment.