Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
98 changes: 0 additions & 98 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,105 +15,7 @@ jobs:
fail-fast: false
matrix:
gem:
- opentelemetry-api
- opentelemetry-common
- opentelemetry-metrics-api
- opentelemetry-registry
- opentelemetry-resource_detectors
- opentelemetry-sdk
- opentelemetry-semantic_conventions
- opentelemetry-test-helpers
os:
- ubuntu-latest
- macos-latest
- windows-latest
name: ${{ matrix.gem }} / ${{ matrix.os }}
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: "Test Ruby 3.1"
uses: ./.github/actions/test_gem
with:
gem: "${{ matrix.gem }}"
ruby: "3.1"
- name: "Test Ruby 3.0"
if: "${{ matrix.os == 'ubuntu-latest' }}"
uses: ./.github/actions/test_gem
with:
gem: "${{ matrix.gem }}"
ruby: "3.0"
- name: "Test Ruby 2.7"
if: "${{ matrix.os == 'ubuntu-latest' }}"
uses: ./.github/actions/test_gem
with:
gem: "${{ matrix.gem }}"
ruby: "2.7"
yard: true
rubocop: true
build: true
- name: "Test JRuby"
if: "${{ matrix.os == 'ubuntu-latest' }}"
uses: ./.github/actions/test_gem
with:
gem: "${{ matrix.gem }}"
ruby: "jruby"

exporters:
strategy:
fail-fast: false
matrix:
gem:
- opentelemetry-exporter-jaeger
- opentelemetry-exporter-otlp
- opentelemetry-exporter-zipkin
os:
- ubuntu-latest
- macos-latest
- windows-latest
exclude:
# Doesn't build on macos
- os: macos-latest
gem: opentelemetry-exporter-jaeger
name: ${{ matrix.gem }} / ${{ matrix.os }}
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: "Test Ruby 3.1"
uses: ./.github/actions/test_gem
with:
gem: "${{ matrix.gem }}"
ruby: "3.1"
- name: "Test Ruby 3.0"
if: "${{ matrix.os == 'ubuntu-latest' }}"
uses: ./.github/actions/test_gem
with:
gem: "${{ matrix.gem }}"
ruby: "3.0"
- name: "Test Ruby 2.7"
if: "${{ matrix.os == 'ubuntu-latest' }}"
uses: ./.github/actions/test_gem
with:
gem: "${{ matrix.gem }}"
ruby: "2.7"
yard: true
rubocop: true
build: true
- name: "Test JRuby"
if: "${{ matrix.os == 'ubuntu-latest' }}"
uses: ./.github/actions/test_gem
with:
gem: "${{ matrix.gem }}"
ruby: "jruby"

propagators:
strategy:
fail-fast: false
matrix:
gem:
- opentelemetry-propagator-b3
- opentelemetry-propagator-jaeger
- opentelemetry-propagator-ottrace
- opentelemetry-propagator-xray
os:
- ubuntu-latest
- macos-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-hook-on-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
release-process-request:
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }}
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
env:
ruby_version: "2.7"
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-hook-on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
release-update-open-requests:
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }}
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
env:
ruby_version: "2.7"
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-perform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:

jobs:
release-perform:
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }}
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
env:
ruby_version: "2.7"
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
release-request:
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }}
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
env:
ruby_version: "2.7"
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-retry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:

jobs:
release-retry:
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby' }}
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
env:
ruby_version: "2.7"
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .instrumentation_generator/templates/Readme.md.tt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ end

## Examples

Example usage can be seen in the `./example/trace_demonstration.rb` file [here](https://github.com/open-telemetry/opentelemetry-ruby/blob/main/instrumentation/<%= instrumentation_name %>/example/trace_demonstration.rb)
Example usage can be seen in the `./example/trace_demonstration.rb` file [here](https://github.com/open-telemetry/opentelemetry-ruby-contrib/blob/main/instrumentation/<%= instrumentation_name %>/example/trace_demonstration.rb)

## How can I get involved?

Expand All @@ -46,7 +46,7 @@ The `opentelemetry-instrumentation-<%= instrumentation_name %>` gem is distribut

[bundler-home]: https://bundler.io
[repo-github]: https://github.com/open-telemetry/opentelemetry-ruby
[license-github]: https://github.com/open-telemetry/opentelemetry-ruby/blob/main/LICENSE
[license-github]: https://github.com/open-telemetry/opentelemetry-ruby-contrib/blob/main/LICENSE
[ruby-sig]: https://github.com/open-telemetry/community#ruby-sig
[community-meetings]: https://github.com/open-telemetry/community#community-meetings
[discussions-url]: https://github.com/open-telemetry/opentelemetry-ruby/discussions
10 changes: 5 additions & 5 deletions .instrumentation_generator/templates/gemspec.tt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Gem::Specification.new do |spec|

spec.summary = '<%= pascal_cased_instrumentation_name %> instrumentation for the OpenTelemetry framework'
spec.description = '<%= pascal_cased_instrumentation_name %> instrumentation for the OpenTelemetry framework'
spec.homepage = 'https://github.com/open-telemetry/opentelemetry-ruby'
spec.homepage = 'https://github.com/open-telemetry/opentelemetry-ruby-contrib'
spec.license = 'Apache-2.0'

spec.files = ::Dir.glob('lib/**/*.rb') +
Expand All @@ -41,9 +41,9 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'yard-doctest', '~> 0.1.6'

if spec.respond_to?(:metadata)
spec.metadata['changelog_uri'] = "https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-<%= instrumentation_name %>/v#{OpenTelemetry::Instrumentation::<%= pascal_cased_instrumentation_name %>::VERSION}/file.CHANGELOG.html"
spec.metadata['source_code_uri'] = 'https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/<%= instrumentation_name %>'
spec.metadata['bug_tracker_uri'] = 'https://github.com/open-telemetry/opentelemetry-ruby/issues'
spec.metadata['documentation_uri'] = "https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-<%= instrumentation_name %>/v#{OpenTelemetry::Instrumentation::<%= pascal_cased_instrumentation_name %>::VERSION}"
spec.metadata['changelog_uri'] = "https://open-telemetry.github.io/opentelemetry-ruby-contrib/opentelemetry-instrumentation-<%= instrumentation_name %>/v#{OpenTelemetry::Instrumentation::<%= pascal_cased_instrumentation_name %>::VERSION}/file.CHANGELOG.html"
spec.metadata['source_code_uri'] = 'https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/<%= instrumentation_name %>'
spec.metadata['bug_tracker_uri'] = 'https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues'
spec.metadata['documentation_uri'] = "https://open-telemetry.github.io/opentelemetry-ruby-contrib/opentelemetry-instrumentation-<%= instrumentation_name %>/v#{OpenTelemetry::Instrumentation::<%= pascal_cased_instrumentation_name %>::VERSION}"
end
end
51 changes: 1 addition & 50 deletions .toys/.data/releases.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file controls the release system.

# The repo organization and name.
repo: open-telemetry/opentelemetry-ruby
repo: open-telemetry/opentelemetry-ruby-contrib
# The main branch name. Releases must happen on this branch.
main_branch: main
# Time in seconds for release scripts to wait for CI to complete.
Expand Down Expand Up @@ -96,37 +96,6 @@ gems:
directory: instrumentation/koala
version_constant: [OpenTelemetry, Instrumentation, Koala, VERSION]

- name: opentelemetry-api
directory: api
version_rb_path: lib/opentelemetry/version.rb
version_constant: [OpenTelemetry, VERSION]

- name: opentelemetry-registry
directory: registry
version_rb_path: lib/opentelemetry/instrumentation/registry/version.rb
version_constant: [OpenTelemetry, Instrumentation, Registry, VERSION]

- name: opentelemetry-sdk
directory: sdk
version_constant: [OpenTelemetry, SDK, VERSION]

- name: opentelemetry-common
directory: common
version_rb_path: lib/opentelemetry/common/version.rb
version_constant: [OpenTelemetry, Common, VERSION]

- name: opentelemetry-exporter-jaeger
directory: exporter/jaeger
version_constant: [OpenTelemetry, Exporter, Jaeger, VERSION]

- name: opentelemetry-exporter-otlp
directory: exporter/otlp
version_constant: [OpenTelemetry, Exporter, OTLP, VERSION]

- name: opentelemetry-exporter-zipkin
directory: exporter/zipkin
version_constant: [OpenTelemetry, Exporter, Zipkin, VERSION]

- name: opentelemetry-instrumentation-active_model_serializers
directory: instrumentation/active_model_serializers
version_constant: [OpenTelemetry, Instrumentation, ActiveModelSerializers, VERSION]
Expand Down Expand Up @@ -212,14 +181,6 @@ gems:
directory: instrumentation/sinatra
version_constant: [OpenTelemetry, Instrumentation, Sinatra, VERSION]

- name: opentelemetry-propagator-b3
directory: propagator/b3
version_constant: [OpenTelemetry, Propagator, B3, VERSION]

- name: opentelemetry-propagator-jaeger
directory: propagator/jaeger
version_constant: [OpenTelemetry, Propagator, Jaeger, VERSION]

- name: opentelemetry-propagator-ottrace
directory: propagator/ottrace
version_constant: [OpenTelemetry, Propagator, OTTrace, VERSION]
Expand All @@ -232,13 +193,3 @@ gems:
directory: resource_detectors
version_rb_path: lib/opentelemetry/resource/detectors/version.rb
version_constant: [OpenTelemetry, Resource, Detectors, VERSION]

- name: opentelemetry-semantic_conventions
directory: semantic_conventions
version_rb_path: lib/opentelemetry/semantic_conventions/version.rb
version_constant: [OpenTelemetry, SemanticConventions, VERSION]

- name: opentelemetry-test-helpers
directory: test_helpers
version_rb_path: lib/opentelemetry/test_helpers/version.rb
version_constant: [OpenTelemetry, TestHelpers, VERSION]
51 changes: 0 additions & 51 deletions CHANGELOG.md

This file was deleted.

22 changes: 10 additions & 12 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,25 @@ Fork the project on GitHub by clicking the `Fork` button at the top of the
repository and clone your fork locally:

```sh
git clone [email protected]:YOUR_GITHUB_NAME/opentelemetry-ruby.git
git clone [email protected]:YOUR_GITHUB_NAME/opentelemetry-ruby-contrib.git
```

or
```sh
git clone https://github.com/YOUR_GITHUB_NAME/opentelemetry-ruby.git
git clone https://github.com/YOUR_GITHUB_NAME/opentelemetry-ruby-contrib.git
```

It can be helpful to add the `open-telemetry/opentelemetry-ruby` repo as a
It can be helpful to add the `open-telemetry/opentelemetry-ruby-contrib` repo as a
remote so you can track changes (we're adding as `upstream` here):

```sh
git remote add upstream [email protected]:open-telemetry/opentelemetry-ruby.git
git remote add upstream [email protected]:open-telemetry/opentelemetry-ruby-contrib.git
```

or

```sh
git remote add upstream https://github.com/open-telemetry/opentelemetry-ruby.git
git remote add upstream https://github.com/open-telemetry/opentelemetry-ruby-contrib.git
```

For more detailed information on this workflow read the
Expand Down Expand Up @@ -90,15 +90,13 @@ configuration details.
The services provided include:

* `app` - main container environment scoped to the `/app` directory. Used
primarily to build and tag the `opentelemetry/opentelemetry-ruby:latest` image.
* `api` - convenience environment scoped to the `api` gem in the `/app/api` directory.
* `sdk` - convenience environment scoped to the `sdk` gem in the `/app/sdk` directory.
primarily to build and tag the `opentelemetry/opentelemetry-ruby-contrib:latest` image.

To test using Docker:

1. Install Docker and Docker Compose for your operating system
2. Get the latest code for the project
3. Build the `opentelemetry/opentelemetry-ruby` image
3. Build the `opentelemetry/opentelemetry-ruby-contrib` image
* `docker-compose build`
* This makes the image available locally
4. API:
Expand Down Expand Up @@ -170,7 +168,7 @@ You'll need to create a Pull Request once you've finished your work.
The [Kubernetes GitHub Workflow][kube-github-workflow-pr] document has
a significant section on PRs.

Open the PR against the `open-telemetry/opentelemetry-ruby` repository.
Open the PR against the `open-telemetry/opentelemetry-ruby-contrib` repository.

Please put `[WIP]` in the title, or create it as a [`Draft`][github-draft] PR
if the PR is not ready for review.
Expand Down Expand Up @@ -249,7 +247,7 @@ Releases are normally performed using GitHub Actions.
* For each gem, it will create a release tag and a GitHub release.
* It will build and push the gems to rubygems.
* It will build the docs and push them to
https://open-telemetry.github.io/opentelemetry-ruby
https://open-telemetry.github.io/opentelemetry-ruby-contrib
* If the releases succeed, the script will update the release pull
request with the results and change its label to `release: complete`.
If something went wrong, the script will, if possible, report the error
Expand Down Expand Up @@ -306,7 +304,7 @@ release, you can use the `Force release` workflow.

It is possible to run the release scripts locally if GitHub Actions is having
problems. You will need to install the `toys` gem first, and you will need the
Rubygems API key for opentelemetry-ruby. These commands will succeed only if
Rubygems API key for opentelemetry-ruby-contrib. These commands will succeed only if
you have write access to the repository.

To open a release pull request:
Expand Down
Loading