Skip to content

Commit

Permalink
Issue 266 adapter => instrumentation rename (#285)
Browse files Browse the repository at this point in the history
* [issue_266]: update adapter naming to instrumentation for api

* [issue_266]: update adapter naming to instrumentation for sdk

* [issue_266]: update adapter naming to instrumentation for adapters

* [issue_266]: update adapter naming to instrumentation for circleci git readme rakefile docker-compose

* [issue_266]: fix excon typo

* [issue_266]: fix faraday overwrite of actual adapter specific method

* [issue_266]: update plural instrumentations module to instrumentation

* [issue_266]: fix tests

* [issue_266]: update grammar

* rerun jruby tests

* [issue_266]: update baseinstrumentation class to base

* [issue_266]: update duplicate langauge

* [issue_266]: grammar fixes
  • Loading branch information
ericmustin authored Jul 8, 2020
1 parent e7361a2 commit 1497723
Show file tree
Hide file tree
Showing 275 changed files with 1,140 additions and 1,139 deletions.
44 changes: 22 additions & 22 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,89 +70,89 @@ commands:
rake-test-appraisal:
steps:
- run:
name: Bundle + CI (Adapters - Concurrent Ruby)
name: Bundle + CI (Instrumentation - Concurrent Ruby)
command: |
cd adapters/concurrent_ruby
cd instrumentation/concurrent_ruby
gem uninstall -aIx bundler
gem install --no-document bundler -v '~> 2.0.2'
bundle install --jobs=3 --retry=3
bundle exec appraisal install
bundle exec appraisal rake test
- run:
name: Bundle + CI (Adapters - ethon)
name: Bundle + CI (Instrumentation - ethon)
command: |
cd adapters/ethon
cd instrumentation/ethon
gem uninstall -aIx bundler
gem install --no-document bundler -v '~> 2.0.2'
bundle install --jobs=3 --retry=3
bundle exec appraisal install
bundle exec appraisal rake test
- run:
name: Bundle + CI (Adapters - excon)
name: Bundle + CI (Instrumentation - excon)
command: |
cd adapters/excon
cd instrumentation/excon
gem uninstall -aIx bundler
gem install --no-document bundler -v '~> 2.0.2'
bundle install --jobs=3 --retry=3
bundle exec appraisal install
bundle exec appraisal rake test
- run:
name: Bundle + CI (Adapters - Faraday)
name: Bundle + CI (Instrumentation - Faraday)
command: |
cd adapters/faraday
cd instrumentation/faraday
gem uninstall -aIx bundler
gem install --no-document bundler -v '~> 2.0.2'
bundle install --jobs=3 --retry=3
bundle exec appraisal install
bundle exec appraisal rake test
- run:
name: Bundle + CI (Adapters - Net::HTTP)
name: Bundle + CI (Instrumentation - Net::HTTP)
command: |
cd adapters/net_http
cd instrumentation/net_http
gem uninstall -aIx bundler
gem install --no-document bundler -v '~> 2.0.2'
bundle install --jobs=3 --retry=3
bundle exec rake test
- run:
name: Bundle + CI (Adapters - Rack)
name: Bundle + CI (Instrumentation - Rack)
command: |
cd adapters/rack
cd instrumentation/rack
gem uninstall -aIx bundler
gem install --no-document bundler -v '~> 2.0.2'
bundle install --jobs=3 --retry=3
bundle exec appraisal install
bundle exec appraisal rake test
- run:
name: Bundle + CI (Adapters - Redis)
name: Bundle + CI (Instrumentation - Redis)
command: |
cd adapters/redis
cd instrumentation/redis
gem uninstall -aIx bundler
gem install --no-document bundler -v '~> 2.0.2'
bundle install --jobs=3 --retry=3
bundle exec appraisal install
bundle exec appraisal rake test
- run:
name: Bundle + CI (Adapters - REST Client)
name: Bundle + CI (Instrumentation - REST Client)
command: |
cd adapters/restclient
cd instrumentation/restclient
gem uninstall -aIx bundler
gem install --no-document bundler -v '~> 2.0.2'
bundle install --jobs=3 --retry=3
bundle exec appraisal install
bundle exec appraisal rake test
- run:
name: Bundle + CI (Adapters - Sidekiq)
name: Bundle + CI (Instrumentation - Sidekiq)
command: |
cd adapters/sidekiq
cd instrumentation/sidekiq
gem uninstall -aIx bundler
gem install --no-document bundler -v '~> 2.0.2'
bundle install --jobs=3 --retry=3
bundle exec appraisal install
bundle exec appraisal rake test
- run:
name: Bundle + CI (Adapters - Sinatra)
name: Bundle + CI (Instrumentation - Sinatra)
command: |
cd adapters/sinatra
cd instrumentation/sinatra
gem uninstall -aIx bundler
gem install --no-document bundler -v '~> 2.0.2'
bundle install --jobs=3 --retry=3
Expand All @@ -161,9 +161,9 @@ commands:
rake-test-appraisal-container-ints:
steps:
- run:
name: Bundle + CI (Adapters - Mysql2)
name: Bundle + CI (Instrumentation - Mysql2)
command: |
cd adapters/mysql2
cd instrumentation/mysql2
gem uninstall -aIx bundler
gem install --no-document bundler -v '~> 2.0.2'
bundle install --jobs=3 --retry=3
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
**/.DS_Store

# Appraisals
adapters/**/*.gemfile.lock
instrumentation/**/*.gemfile.lock
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ Only a maintainer may perform a release.
`{library-name}/v{version}`. For example, to release `opentelemetry-api`
version `1.2.3`, create the tag `opentelemetry-api/v1.2.3`.
4. Push the tag directly to Github.
5. See [here][opentelemetry-adapters-all-publishing] for special instructions
for publishing the opentelemetry-adapters-all gem.
5. See [here][opentelemetry-instrumentation-all-publishing] for special instructions
for publishing the opentelemetry-instrumentation-all gem.

After the tag is pushed, CircleCI will run the release workflow. This workflow
includes one final run of the unit tests, followed by the release script itself.
Expand Down Expand Up @@ -204,4 +204,4 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
[license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat
[license-url]: https://github.com/open-telemetry/opentelemetry-ruby/blob/master/LICENSE
[ruby-sig]: https://github.com/open-telemetry/community#ruby-sig
[opentelemetry-adapters-all-publishing]: https://github.com/open-telemetry/opentelemetry-ruby/tree/master/adapters/all#publishing
[opentelemetry-instrumentation-all-publishing]: https://github.com/open-telemetry/opentelemetry-ruby/tree/master/instrumentation/all#publishing
72 changes: 36 additions & 36 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,76 +57,76 @@ GEM_INFO = {
OpenTelemetry::Exporters::Jaeger::VERSION
}
},
"opentelemetry-adapters-ethon" => {
"opentelemetry-instrumentation-ethon" => {
version_getter: ->() {
require './lib/opentelemetry/adapters/ethon/version.rb'
OpenTelemetry::Adapters::Ethon::VERSION
require './lib/opentelemetry/instrumentation/ethon/version.rb'
OpenTelemetry::Instrumentation::Ethon::VERSION
}
},
"opentelemetry-adapters-excon" => {
"opentelemetry-instrumentation-excon" => {
version_getter: ->() {
require './lib/opentelemetry/adapters/excon/version.rb'
OpenTelemetry::Adapters::Excon::VERSION
require './lib/opentelemetry/instrumentation/excon/version.rb'
OpenTelemetry::Instrumentation::Excon::VERSION
}
},
"opentelemetry-adapters-concurrent_ruby" => {
"opentelemetry-instrumentation-concurrent_ruby" => {
version_getter: ->() {
require './lib/opentelemetry/adapters/concurrent_ruby/version.rb'
OpenTelemetry::Adapters::ConcurrentRuby::VERSION
require './lib/opentelemetry/instrumentation/concurrent_ruby/version.rb'
OpenTelemetry::Instrumentation::ConcurrentRuby::VERSION
}
},
"opentelemetry-adapters-faraday" => {
"opentelemetry-instrumentation-faraday" => {
version_getter: ->() {
require './lib/opentelemetry/adapters/faraday/version.rb'
OpenTelemetry::Adapters::Faraday::VERSION
require './lib/opentelemetry/instrumentation/faraday/version.rb'
OpenTelemetry::Instrumentation::Faraday::VERSION
}
},
"opentelemetry-adapters-mysql2" => {
"opentelemetry-instrumentation-mysql2" => {
version_getter: ->() {
require './lib/opentelemetry/adapters/mysql2/version.rb'
OpenTelemetry::Adapters::Mysql2::VERSION
require './lib/opentelemetry/instrumentation/mysql2/version.rb'
OpenTelemetry::Instrumentation::Mysql2::VERSION
}
},
"opentelemetry-adapters-net_http" => {
"opentelemetry-instrumentation-net_http" => {
version_getter: ->() {
require './lib/opentelemetry/adapters/net/http/version.rb'
OpenTelemetry::Adapters::Net::HTTP::VERSION
require './lib/opentelemetry/instrumentation/net/http/version.rb'
OpenTelemetry::Instrumentation::Net::HTTP::VERSION
}
},
"opentelemetry-adapters-rack" => {
"opentelemetry-instrumentation-rack" => {
version_getter: ->() {
require './lib/opentelemetry/adapters/rack/version.rb'
OpenTelemetry::Adapters::Rack::VERSION
require './lib/opentelemetry/instrumentation/rack/version.rb'
OpenTelemetry::Instrumentation::Rack::VERSION
}
},
"opentelemetry-adapters-redis" => {
"opentelemetry-instrumentation-redis" => {
version_getter: ->() {
require './lib/opentelemetry/adapters/redis/version.rb'
OpenTelemetry::Adapters::Redis::VERSION
require './lib/opentelemetry/instrumentation/redis/version.rb'
OpenTelemetry::Instrumentation::Redis::VERSION
}
},
"opentelemetry-adapters-restclient" => {
"opentelemetry-instrumentation-restclient" => {
version_getter: ->() {
require './lib/opentelemetry/adapters/restclient/version.rb'
OpenTelemetry::Adapters::RestClient::VERSION
require './lib/opentelemetry/instrumentation/restclient/version.rb'
OpenTelemetry::Instrumentation::RestClient::VERSION
}
},
"opentelemetry-adapters-sidekiq" => {
"opentelemetry-instrumentation-sidekiq" => {
version_getter: ->() {
require './lib/opentelemetry/adapters/sidekiq/version.rb'
OpenTelemetry::Adapters::Sidekiq::VERSION
require './lib/opentelemetry/instrumentation/sidekiq/version.rb'
OpenTelemetry::Instrumentation::Sidekiq::VERSION
}
},
"opentelemetry-adapters-sinatra" => {
"opentelemetry-instrumentation-sinatra" => {
version_getter: ->() {
require './lib/opentelemetry/adapters/sinatra/version.rb'
OpenTelemetry::Adapters::Sinatra::VERSION
require './lib/opentelemetry/instrumentation/sinatra/version.rb'
OpenTelemetry::Instrumentation::Sinatra::VERSION
}
},
"opentelemetry-adapters-all" => {
"opentelemetry-instrumentation-all" => {
version_getter: ->() {
require './lib/opentelemetry/adapters/all/version.rb'
OpenTelemetry::Adapters::All::VERSION
require './lib/opentelemetry/instrumentation/all/version.rb'
OpenTelemetry::Instrumentation::All::VERSION
}
}
}
Expand Down
27 changes: 0 additions & 27 deletions adapters/all/lib/opentelemetry/adapters/all.rb

This file was deleted.

47 changes: 0 additions & 47 deletions adapters/all/opentelemetry-adapters-all.gemspec

This file was deleted.

16 changes: 0 additions & 16 deletions adapters/concurrent_ruby/lib/opentelemetry/adapters.rb

This file was deleted.

16 changes: 0 additions & 16 deletions adapters/ethon/lib/opentelemetry/adapters.rb

This file was deleted.

16 changes: 0 additions & 16 deletions adapters/excon/lib/opentelemetry/adapters.rb

This file was deleted.

7 changes: 0 additions & 7 deletions adapters/faraday/lib/opentelemetry-adapters-faraday.rb

This file was deleted.

Loading

0 comments on commit 1497723

Please sign in to comment.