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: instrumentation for racecar #72

Merged
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
ec8aa55
boilerplate for racecar instrumentation
chrisholmes Jun 25, 2022
132293e
add to all
chrisholmes Jun 27, 2022
3ab6081
add tracing to #process
chrisholmes Jun 27, 2022
dbc8def
add support for batching
chrisholmes Jun 27, 2022
2d2df0c
add an example for tracing racecar
chrisholmes Jun 28, 2022
315df6d
add readme
chrisholmes Jun 28, 2022
77dfca4
refactor runner tests
chrisholmes Jun 28, 2022
f0602d7
move declarations to keep rubocop happy
chrisholmes Jun 29, 2022
2b68fce
dont build on windows
chrisholmes Jun 30, 2022
adb7bf2
racecar tests should run with kafka
chrisholmes Jun 30, 2022
798d4c0
racecar should be a development dependency
chrisholmes Jun 30, 2022
cb87af3
use racecar VERSION constant for compatability
chrisholmes Jul 3, 2022
c058798
set Appraisals for racecar
chrisholmes Jul 25, 2022
894108a
support recent versions of racecar only
chrisholmes Jul 28, 2022
90b4a29
set minimum version to 2.7
chrisholmes Jul 28, 2022
1f6cdf6
ensure messages are delivered before marked as seen
chrisholmes Jul 28, 2022
4a9f69c
remove opentelemetry-instrumentation-rdkafka dependency
chrisholmes Jul 30, 2022
0575c81
switch message processing instrumentation to use ASN
chrisholmes Aug 1, 2022
f42ea64
move integration test to racecar_test.rb
chrisholmes Aug 1, 2022
ad8606e
remove the batch consumer
chrisholmes Aug 1, 2022
bf3c8ef
fix: improve guards when stopping racecar
chrisholmes Aug 1, 2022
5b4d6e8
switch order of appraisals
chrisholmes Aug 1, 2022
554ee08
test: increase test timeouts
chrisholmes Aug 1, 2022
99a9b4e
fix: support jruby
chrisholmes Aug 1, 2022
064f407
fix: skip truffleruby builds for racecar
chrisholmes Aug 2, 2022
178a447
refactor: remove the direct dependency on activesupport
chrisholmes Aug 3, 2022
95cc551
docs: add a note about requiring active_support to work
chrisholmes Aug 3, 2022
3be8038
fix: set the version to 0.1.0
chrisholmes Aug 3, 2022
cbf0bf2
docs: Correct Spelling Error
arielvalentin Sep 27, 2022
0108765
make activesupport a development dependency
chrisholmes Oct 4, 2022
ae6dee4
refactor: simplifty test consumers by changing waiting logic
chrisholmes Oct 12, 2022
1b047d6
fix: list racecar in all correctly
chrisholmes Oct 13, 2022
17cd8bf
Merge remote-tracking branch 'upstream/main' into create_racecar_inst…
chrisholmes Oct 14, 2022
2e2e20a
Merge branch 'main' into create_racecar_instrumentation
arielvalentin Oct 14, 2022
7625877
Merge branch 'main' into create_racecar_instrumentation
chrisholmes Nov 2, 2022
bfe220e
add the racecar instrumentaiton back to CI
chrisholmes Nov 3, 2022
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/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ jobs:
gem: rails
- os: macos-latest
gem: lmdb
- os: macos-latest
gem: opentelemetry-instrumentation-racecar

name: ${{ matrix.gem }} / ${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -238,6 +240,7 @@ jobs:
- mysql2
- pg
- que
- racecar
- rdkafka
- redis
- resque
Expand Down Expand Up @@ -295,6 +298,7 @@ jobs:
run: |
echo "skip=false" >> $GITHUB_OUTPUT
[[ "${{ matrix.gem }}" == "que" ]] && echo "skip=true" >> $GITHUB_OUTPUT
[[ "${{ matrix.gem }}" == "racecar" ]] && echo "skip=true" >> $GITHUB_OUTPUT
[[ "${{ matrix.gem }}" == "rdkafka" ]] && echo "skip=true" >> $GITHUB_OUTPUT
[[ "${{ matrix.gem }}" == "ruby_kafka" ]] && echo "skip=true" >> $GITHUB_OUTPUT
# This is essentially a bash script getting evaluated, so we need to return true or the whole job fails.
Expand Down
4 changes: 4 additions & 0 deletions .toys/.data/releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ commit_lint:
# * changelog_path: Path to CHANGLEOG.md relative to the gem directory.
# (Required only if it is not in the expected location.)
gems:
- name: opentelemetry-instrumentation-racecar
directory: instrumentation/racecar
version_constant: [OpenTelemetry, Instrumentation, Racecar, VERSION]

- name: opentelemetry-instrumentation-rake
directory: instrumentation/rake
version_constant: [OpenTelemetry, Instrumentation, Rake, VERSION]
Expand Down
1 change: 1 addition & 0 deletions instrumentation/all/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ source 'https://rubygems.org'

gemspec

gem 'opentelemetry-instrumentation-racecar', path: '../racecar'
chrisholmes marked this conversation as resolved.
Show resolved Hide resolved
gem 'opentelemetry-instrumentation-rake', path: '../rake'
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
require 'opentelemetry-instrumentation-net_http'
require 'opentelemetry-instrumentation-pg'
require 'opentelemetry-instrumentation-que'
require 'opentelemetry-instrumentation-racecar'
require 'opentelemetry-instrumentation-rack'
require 'opentelemetry-instrumentation-rails'
require 'opentelemetry-instrumentation-rake'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'opentelemetry-instrumentation-net_http', '~> 0.21.0'
spec.add_dependency 'opentelemetry-instrumentation-pg', '~> 0.22.0'
spec.add_dependency 'opentelemetry-instrumentation-que', '~> 0.4.0'
spec.add_dependency 'opentelemetry-instrumentation-racecar', '~> 0.1.0'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a blocker, but a thought: perhaps worth seeing how this performs in production circumstances before adding to instrumentation-all?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was considering something like that. Has this happened before?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure, but maybe @open-telemetry/ruby-contrib-maintainers might know? I don't think there's any problem with it.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally speaking I'm ok with adding it. If folks that use all don't want it they should disable it.

I minor bump with the change log/Release notes should be enough of a signal

spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.21.1'
spec.add_dependency 'opentelemetry-instrumentation-rails', '~> 0.22.0'
spec.add_dependency 'opentelemetry-instrumentation-rake', '~> 0.0.0'
Expand Down
5 changes: 5 additions & 0 deletions instrumentation/racecar/.rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
inherit_from: ../.rubocop-examples.yml

Naming/FileName:
Exclude:
- "lib/opentelemetry-instrumentation-racecar.rb"
9 changes: 9 additions & 0 deletions instrumentation/racecar/.yardopts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
--no-private
--title=OpenTelemetry Racecar Instrumentation
--markup=markdown
--main=README.md
./lib/opentelemetry/instrumentation/**/*.rb
./lib/opentelemetry/instrumentation.rb
-
README.md
CHANGELOG.md
13 changes: 13 additions & 0 deletions instrumentation/racecar/Appraisals
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# frozen_string_literal: true

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

appraise 'racecar-2.7' do
gem 'racecar', '~> 2.7.0'
end

appraise 'racecar-2.8' do
gem 'racecar', '~> 2.8.2'
end
1 change: 1 addition & 0 deletions instrumentation/racecar/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Release History: opentelemetry-instrumentation-racecar
18 changes: 18 additions & 0 deletions instrumentation/racecar/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# frozen_string_literal: true

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

source 'https://rubygems.org'

# DO NOT ADD DEPENDENCIES HERE!
# Please declare a minimum development dependency in the gemspec,
# then target specific versions in the Appraisals file.

gemspec

group :development, :test do
gem 'activesupport', '~> 6' # used to test against JRuby which is only MRI 2.6 compatibile
gem 'opentelemetry-instrumentation-base', path: '../base'
end
201 changes: 201 additions & 0 deletions instrumentation/racecar/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.
57 changes: 57 additions & 0 deletions instrumentation/racecar/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# OpenTelemetry Racecar Instrumentation

The Racecar instrumentation is a community-maintained instrumentation for [Racecar](https://github.com/zendesk/racecar), a client library for Apache Kafka.


## How do I get started?

Install the gem using:

```
gem install opentelemetry-instrumentation-racecar
```

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

## Runtime requirements

This instrumentation is built on top of Racecar's integration with `ActiveSupport::Notifications`. `ActiveSupport::Notification` will need to be loaded before the instrumentation is installed (as below) or the installation will cancel.

## Usage

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

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

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

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

## Examples

Example usage can be seen in the `./example` directory [here](https://github.com/open-telemetry/opentelemetry-ruby-contrib/blob/main/instrumentation/racecar/example). Run `./trace_demonstration.sh` to see its behaviour.

## How can I get involved?

The `opentelemetry-instrumentation-racecar` 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-racecar` gem is distributed under the Apache 2.0 license. See [LICENSE][license-github] for more information.

[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
28 changes: 28 additions & 0 deletions instrumentation/racecar/Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# 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']
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
Loading