Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add shoryuken instrumentation #536

Closed
Closed
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
25db6f2
beginning of shoryken instrumentation
mcinbell May 26, 2023
a5ceaae
fixed typos and added version file
mcinbell May 26, 2023
0b6b1fc
first test
mcinbell May 26, 2023
546d630
added tests for fetcher and processor
mcinbell Jun 2, 2023
6b7eaa8
first tracer test
mcinbell Jun 9, 2023
cbec0cb
added test for recording exception
mcinbell Jun 16, 2023
deed38b
removed newline
mcinbell Jun 16, 2023
a6788b4
test span naming
mcinbell Jun 16, 2023
5fbe248
added test for active job
mcinbell Jun 30, 2023
ace9480
tidied up the readme
mcinbell Jun 30, 2023
9adf763
rubocop fixes
mcinbell Jun 30, 2023
5191bd8
fixed up some remaining copy and paste issues
mcinbell Jun 30, 2023
6d33871
use safe navigation for span
mcinbell Jul 3, 2023
e820895
Merge branch 'main' into add_shoryuken_instrumentation
arielvalentin Jul 7, 2023
ae0e8b6
dropped support for sqs specific metadata on span
mcinbell Jul 14, 2023
1c35846
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Jul 14, 2023
8c51af3
updated dependency versions
mcinbell Jul 14, 2023
f8fb807
add dependabot config
mcinbell Jul 14, 2023
8e11283
fixed rubocop issues
mcinbell Jul 14, 2023
4f857a6
added gem to ci instrumentation
mcinbell Jul 14, 2023
2032ae6
skip the jruby test
mcinbell Jul 14, 2023
3eacfd5
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Jul 17, 2023
0fa5c59
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Jul 21, 2023
6b6f51f
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Jul 28, 2023
08b5b5c
Merge branch 'main' into add_shoryuken_instrumentation
arielvalentin Aug 7, 2023
af05e2e
Update instrumentation/shoryuken/lib/opentelemetry/instrumentation/sh…
mcinbell Aug 11, 2023
f1562b8
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Aug 11, 2023
a5bb91b
added project to canary build
mcinbell Aug 11, 2023
9ce3622
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Aug 18, 2023
2620961
removed monkey patch causing issues with sdk v 1.2.1
mcinbell Aug 18, 2023
1e6c980
fixed tracer test
mcinbell Aug 18, 2023
2573787
removed unnecessary disable of rubocop rule
mcinbell Aug 25, 2023
ced68ef
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Sep 8, 2023
4359bba
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Sep 11, 2023
6043bfc
add note about only supporting server side only
mcinbell Sep 26, 2023
129093c
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Sep 26, 2023
504ff2d
Update tracer_middleware.rb
arielvalentin Sep 26, 2023
240d9ae
Update tracer_middleware.rb
arielvalentin Sep 26, 2023
5cc9e60
Update tracer_middleware.rb
arielvalentin Sep 26, 2023
b89cddb
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Oct 6, 2023
f5e7938
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Oct 12, 2023
d5cd236
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Oct 12, 2023
af27750
Merge branch 'main' into add_shoryuken_instrumentation
arielvalentin Oct 21, 2023
5acdbf0
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Oct 27, 2023
2292f62
use sqs_msg.message_attributes for context propagation
mcinbell Nov 3, 2023
e7240c7
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Nov 3, 2023
b7192ee
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Nov 10, 2023
a1bd935
added aws sdk instrumentation as required dependency
mcinbell Nov 10, 2023
c2349ab
Merge branch 'main' into add_shoryuken_instrumentation
kaylareopelle Dec 11, 2023
feb2e2b
Update instrumentation/shoryuken/opentelemetry-instrumentation-shoryu…
mcinbell Dec 15, 2023
e4344e6
Merge branch 'main' into add_shoryuken_instrumentation
mcinbell Dec 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ updates:
directory: "/instrumentation/sinatra"
schedule:
interval: weekly
- package-ecosystem: bundler
directory: "/instrumentation/shoryuken"
schedule:
interval: weekly
- package-ecosystem: bundler
directory: "/instrumentation/sidekiq"
schedule:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci-instrumentation-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
- rails
- restclient
- rspec
- shoryuken
- sinatra
os:
- ubuntu-latest
Expand Down Expand Up @@ -99,6 +100,7 @@ jobs:
[[ "${{ matrix.gem }}" == "lmdb" ]] && echo "skip=true" >> $GITHUB_OUTPUT
[[ "${{ matrix.gem }}" == "rack" ]] && echo "skip=true" >> $GITHUB_OUTPUT
[[ "${{ matrix.gem }}" == "rails" ]] && echo "skip=true" >> $GITHUB_OUTPUT
[[ "${{ matrix.gem }}" == "shoryuken" ]] && echo "skip=true" >> $GITHUB_OUTPUT
# This is essentially a bash script getting evaluated, so we need to return true or the whole job fails.
true
- name: "Test JRuby"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci-instrumentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:
- rails
- restclient
- rspec
- shoryuken
- sinatra
os:
- ubuntu-latest
Expand Down Expand Up @@ -87,6 +88,7 @@ jobs:
[[ "${{ matrix.gem }}" == "lmdb" ]] && echo "skip=true" >> $GITHUB_OUTPUT
[[ "${{ matrix.gem }}" == "rack" ]] && echo "skip=true" >> $GITHUB_OUTPUT
[[ "${{ matrix.gem }}" == "rails" ]] && echo "skip=true" >> $GITHUB_OUTPUT
[[ "${{ matrix.gem }}" == "shoryuken" ]] && echo "skip=true" >> $GITHUB_OUTPUT
[[ "${{ matrix.gem }}" == "gruf" ]] && echo "skip=true" >> $GITHUB_OUTPUT
# This is essentially a bash script getting evaluated, so we need to return true or the whole job fails.
true
Expand Down
6 changes: 6 additions & 0 deletions instrumentation/shoryuken/.rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
inherit_from: ../../.rubocop.yml

Style/FetchEnvVar:
Enabled: true
Exclude:
- test/test_helper.rb
9 changes: 9 additions & 0 deletions instrumentation/shoryuken/.yardopts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
--no-private
--title=OpenTelemetry Shoryuken Instrumentation
--markup=markdown
--main=README.md
./lib/opentelemetry/instrumentation/**/*.rb
./lib/opentelemetry/instrumentation.rb
-
README.md
CHANGELOG.md
1 change: 1 addition & 0 deletions instrumentation/shoryuken/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Release History: opentelemetry-instrumentation-shoryuken
14 changes: 14 additions & 0 deletions instrumentation/shoryuken/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# frozen_string_literal: true

# Copyright The OpenTelemetry Authors
#
# SPDX-License-Identifier: Apache-2.0

source 'https://rubygems.org'

gemspec

group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
gem 'pry-byebug'
end
201 changes: 201 additions & 0 deletions instrumentation/shoryuken/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright The OpenTelemetry Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
63 changes: 63 additions & 0 deletions instrumentation/shoryuken/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# OpenTelemetry Shoryuken Instrumentation

The Shoryuken instrumentation is a community-maintained instrumentation for the [Shoryuken][shoryuken-home] Ruby jobs system.

**Note that this gem currently only supports instrumentation of server side processing.**

## How do I get started?

Install the gem using:

```
gem install opentelemetry-instrumentation-shoryuken
```

Or, if you use [bundler][bundler-home], include `opentelemetry-instrumentation-shoryuken` in your `Gemfile`.

## Usage

To use the instrumentation, call `use` with the name of the instrumentation:

```ruby
OpenTelemetry::SDK.configure do |c|
c.use 'OpenTelemetry::Instrumentation::Shoryuken'
end
```

Alternatively, you can also call `use_all` to install all the available instrumentation.

```ruby
OpenTelemetry::SDK.configure do |c|
c.use_all
end
```

Note that span names can be configured to be based on either the queue name or the job class with the `span_naming` config option, as shown below. Valid values are `:queue` and `:job_class`, `:queue` being the default.

```ruby
OpenTelemetry::SDK.configure do |c|
c.use 'OpenTelemetry::Instrumentation::Shoryuken', span_naming: :queue
end
```

## Examples

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

## How can I get involved?

The `opentelemetry-instrumentation-shoryuken` gem source is [on github][repo-github], along with related gems including `opentelemetry-api` and `opentelemetry-sdk`.

The OpenTelemetry Ruby gems are maintained by the OpenTelemetry-Ruby special interest group (SIG). You can get involved by joining us in [GitHub Discussions][discussions-url] or attending our weekly meeting. See the [meeting calendar][community-meetings] for dates and times. For more information on this and other language SIGs, see the OpenTelemetry [community page][ruby-sig].

## License

The `opentelemetry-instrumentation-shoryuken` gem is distributed under the Apache 2.0 license. See [LICENSE][license-github] for more information.

[shoryuken-home]: https://github.com/ruby-shoryuken/shoryuken
[bundler-home]: https://bundler.io
[repo-github]: https://github.com/open-telemetry/opentelemetry-ruby
[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
29 changes: 29 additions & 0 deletions instrumentation/shoryuken/Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# frozen_string_literal: true

# Copyright The OpenTelemetry Authors
#
# SPDX-License-Identifier: Apache-2.0

require 'bundler/gem_tasks'
require 'rake/testtask'
require 'yard'
require 'rubocop/rake_task'

RuboCop::RakeTask.new

Rake::TestTask.new :test do |t|
t.libs << 'test'
t.libs << 'lib'
t.test_files = FileList['test/**/*_test.rb']
t.warning = false
end

YARD::Rake::YardocTask.new do |t|
t.stats_options = ['--list-undoc']
end

if RUBY_ENGINE == 'truffleruby'
task default: %i[test]
else
task default: %i[test rubocop yard]
end
11 changes: 11 additions & 0 deletions instrumentation/shoryuken/example/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# frozen_string_literal: true

source 'https://rubygems.org'

gem 'opentelemetry-api'
gem 'opentelemetry-common'
gem 'opentelemetry-instrumentation-base'
gem 'opentelemetry-instrumentation-shoryuken'
gem 'opentelemetry-sdk'

gem 'shoryuken'
Loading