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: 🚧 WIP: Logger instrumentation #983

Draft
wants to merge 58 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
ec2c192
WIP initial commit logger instrumentation
kaylareopelle Sep 19, 2023
f4add62
Rubocop require_relative
kaylareopelle Sep 25, 2023
456d25b
Add :: to find Ruby logger instead of OTel logger
kaylareopelle Sep 25, 2023
e39763a
Remove commented out option LOC
kaylareopelle Sep 25, 2023
976f329
Add skip_instrumenting? method
kaylareopelle Sep 25, 2023
ffd3fc5
Skip ActiveSupport::Logger#broadcast loggers
kaylareopelle Sep 25, 2023
bf2f998
Add logger instrumentation library and version
kaylareopelle Sep 25, 2023
2df26a6
Update severity_number logic, return orig value
kaylareopelle Sep 25, 2023
b0ab18f
Make instrumentation name a constant
kaylareopelle Oct 3, 2023
595ecc5
WIP test active support logger
kaylareopelle Oct 3, 2023
cf920dd
Merge branch 'main' into logger-instrumentation
kaylareopelle Mar 29, 2024
f510b3d
Merge branch 'main' of https://github.com/kaylareopelle/opentelemetry…
khushijain21 Mar 29, 2024
90c6820
Merge branch 'logger-instrumentation' of https://github.com/kaylareop…
khushijain21 Mar 29, 2024
58c82a7
Map logger level to OTel level
khushijain21 Mar 29, 2024
c587212
Install WIP logs dependencies from git, not local
kaylareopelle Mar 29, 2024
a4e980d
Update rubocop dependencies
kaylareopelle Mar 29, 2024
4604a96
Disable active_support_logger tests
kaylareopelle Mar 29, 2024
f995baa
Merge pull request #1 from kaylareopelle/disable-rails-testing
khushijain21 Mar 30, 2024
6e96fcd
Merge branch 'main' of https://github.com/kaylareopelle/opentelemetry…
khushijain21 Apr 4, 2024
b8ae0d9
maps otel log level
khushijain21 Apr 4, 2024
9bac90d
Merge branch 'main' into logger-instrumentation
kaylareopelle Apr 4, 2024
595e7aa
Merge branch 'logger-instrumentation' of https://github.com/kaylareop…
khushijain21 Apr 4, 2024
33f81f6
Merge pull request #2 from khushijain21/logger-instrumentation
kaylareopelle Apr 4, 2024
97ea4c9
Use the updated method name to emit, `on_emit`
kaylareopelle Apr 15, 2024
f7646f8
Update tests referencing severity numbers
kaylareopelle Apr 15, 2024
d838da7
Merge branch 'main' into logger-instrumentation
kaylareopelle Apr 23, 2024
483343c
Loosen dependency version restrictions
kaylareopelle Apr 23, 2024
c35df18
fix: Remove NAME constant from gemspec
kaylareopelle Apr 23, 2024
686f2d9
chore: Address Rubocop require_relative linter
kaylareopelle Apr 23, 2024
1bd3ead
Rubocop
kaylareopelle Apr 23, 2024
8b06c93
fix: Bring back the NAME constant
kaylareopelle Apr 24, 2024
747f3cd
Merge branch 'main' into logger-instrumentation
kaylareopelle May 10, 2024
66d3b3f
chore: Correct version number, add TODOs in README
kaylareopelle May 14, 2024
2358235
Merge branch 'main' into logger-instrumentation
kaylareopelle May 14, 2024
4c6d6f1
fix: Revert version for now
kaylareopelle May 14, 2024
0527726
change
khushijain21 May 7, 2024
7dfba21
move options
khushijain21 May 9, 2024
03868bc
accomodated changes
khushijain21 May 13, 2024
c96243b
removed configuring logger_provider
khushijain21 May 14, 2024
2c9a3e3
removed corresponding test
khushijain21 May 14, 2024
fb0b5c8
Merge pull request #5 from khushijain21/rubybridge2
kaylareopelle May 15, 2024
236bf1f
chore: Add tests for name and version config
kaylareopelle May 10, 2024
e3162e0
Merge pull request #6 from kaylareopelle/config-tests
kaylareopelle May 15, 2024
b0b301f
chore: Rubocop
kaylareopelle May 16, 2024
e6799ff
add check for logs sdk
khushijain21 May 17, 2024
b0da0f1
Merge pull request #7 from khushijain21/rubybridge2
kaylareopelle May 21, 2024
18a45d1
test: Reinstate active support logger tests
kaylareopelle Jul 12, 2024
09778b7
Merge branch 'main' into logger-instrumentation
kaylareopelle Sep 17, 2024
d00bc1d
style: Add language to code fence
kaylareopelle Sep 17, 2024
d129337
Update instrumentation/logger/lib/opentelemetry/instrumentation.rb
kaylareopelle Sep 17, 2024
97b42de
docs: add some config info
kaylareopelle Sep 17, 2024
6276944
feat: Remove config options
kaylareopelle Sep 17, 2024
ef88293
chore: Add TODO for version number update
kaylareopelle Sep 17, 2024
00c8687
feat: Update example and readme
kaylareopelle Sep 17, 2024
96a4a1b
Merge branch 'logger-instrumentation' of github.com:kaylareopelle/ope…
kaylareopelle Sep 17, 2024
7f8dce1
test: remove appraisals for eol'd rails versions
kaylareopelle Sep 17, 2024
e5cc573
feat: Support ActiveSupport::BroadcastLogger
kaylareopelle Sep 17, 2024
ea3351e
test: Remove config option tests
kaylareopelle Sep 17, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/ci-instrumentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
- httpx
- koala
- lmdb
- logger
- net_http
- rack
- rails
Expand Down
12 changes: 8 additions & 4 deletions .toys/.data/releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ 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-gruf
directory: instrumentation/gruf
version_constant: [OpenTelemetry, Instrumentation, Gruf, VERSION]

- name: opentelemetry-helpers-mysql
directory: helpers/mysql
version_constant: [OpenTelemetry, Helpers, MySQL, VERSION]
Expand All @@ -47,6 +43,14 @@ gems:
directory: instrumentation/grape
version_constant: [OpenTelemetry, Instrumentation, Grape, VERSION]

- name: opentelemetry-instrumentation-gruf
directory: instrumentation/gruf
version_constant: [OpenTelemetry, Instrumentation, Gruf, VERSION]

- name: opentelemetry-instrumentation-logger
directory: instrumentation/logger
version_constant: [OpenTelemetry, Instrumentation, Logger, VERSION]

- name: opentelemetry-instrumentation-racecar
directory: instrumentation/racecar
version_constant: [OpenTelemetry, Instrumentation, Racecar, VERSION]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# SPDX-License-Identifier: Apache-2.0

require 'opentelemetry-instrumentation-gruf'
require 'opentelemetry-instrumentation-trilogy'
require 'opentelemetry-instrumentation-active_support'
require 'opentelemetry-instrumentation-action_pack'
require 'opentelemetry-instrumentation-active_job'
Expand All @@ -25,7 +23,9 @@
require 'opentelemetry-instrumentation-faraday'
require 'opentelemetry-instrumentation-grape'
require 'opentelemetry-instrumentation-graphql'
require 'opentelemetry-instrumentation-gruf'
require 'opentelemetry-instrumentation-http_client'
require 'opentelemetry-instrumentation-logger'
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should the Logger bridge be part of instrumentation/all? I didn't realize the difference between a "bridge" and an "instrumentation" until after this had been worked out. We could create a separate directory at a peer level with instrumentation named "bridge(s?)" and put the code there.

If someone knows of an "instrumentation" definition within OTel documentation, that might help.

I'm sure there's other pros/cons, but this is what I have off the top of my head:

Pros to having it in instrumentation/all:

  • Easier for people to adopt if they're already installing their instrumentation via all
  • One less CI workflow to create, along with all the other structure required for another grouping (ex. processor, propagator)

Cons:

  • The specs reference a "Bridge API", so we could be breaking from that concept by grouping this with instrumentation

Copy link
Contributor

Choose a reason for hiding this comment

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

I think it's ok to include it in all since it has the standard instrumentation structure. Although, instrumentation present do ... end that check if the instrumentation is little bit loose in my opinion. Maybe also check if ::OpenTelemetry::SDK::Logs present?

require 'opentelemetry-instrumentation-mongo'
require 'opentelemetry-instrumentation-mysql2'
require 'opentelemetry-instrumentation-net_http'
Expand All @@ -42,6 +42,7 @@
require 'opentelemetry-instrumentation-ruby_kafka'
require 'opentelemetry-instrumentation-sidekiq'
require 'opentelemetry-instrumentation-sinatra'
require 'opentelemetry-instrumentation-trilogy'

# OpenTelemetry is an open source observability framework, providing a
# general-purpose API, SDK, and related tools required for the instrumentation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'opentelemetry-instrumentation-http_client', '~> 0.22.1'
spec.add_dependency 'opentelemetry-instrumentation-koala', '~> 0.20.1'
spec.add_dependency 'opentelemetry-instrumentation-lmdb', '~> 0.22.1'
spec.add_dependency 'opentelemetry-instrumentation-logger', '~> 0.0.0'
spec.add_dependency 'opentelemetry-instrumentation-mongo', '~> 0.22.1'
spec.add_dependency 'opentelemetry-instrumentation-mysql2', '~> 0.27.0'
spec.add_dependency 'opentelemetry-instrumentation-net_http', '~> 0.22.1'
Expand Down
1 change: 1 addition & 0 deletions instrumentation/logger/.rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
inherit_from: ../../.rubocop.yml
9 changes: 9 additions & 0 deletions instrumentation/logger/.yardopts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
--no-private
--title=OpenTelemetry Logger Instrumentation
--markup=markdown
--main=README.md
./lib/opentelemetry/instrumentation/**/*.rb
./lib/opentelemetry/instrumentation.rb
-
README.md
CHANGELOG.md
18 changes: 18 additions & 0 deletions instrumentation/logger/Appraisals
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

# # TOOD: Re-enable before release, along with active_support_logger tests
# appraise 'rails-6.0' do
# gem 'rails', '~> 6.0.0'
# end

# appraise 'rails-6.1' do
# gem 'rails', '~> 6.1.0'
# end

# appraise 'rails-7.0' do
# gem 'rails', '~> 7.0.0'
# end
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 haven't been able to get Appraisal to work with gems installed from git source. This might just be due to my limited knowledge of Appraisal. We may need to wait until the opentelemetry-logs-related gems are released before we can re-instate these.

Copy link
Contributor

Choose a reason for hiding this comment

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

Have you tried something like:

gem 'opentelemetry-logs-api', github: 'open-telemetry/opentelemetry-ruby', branch: 'main', glob: 'logs_api/opentelemetry-logs-api.gemspec'
gem 'opentelemetry-logs-sdk', github: 'open-telemetry/opentelemetry-ruby', branch: 'main', glob: 'logs_sdk/opentelemetry-logs-sdk.gemspec'

1 change: 1 addition & 0 deletions instrumentation/logger/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Release History: opentelemetry-instrumentation-logger
22 changes: 22 additions & 0 deletions instrumentation/logger/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# frozen_string_literal: true

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

source 'https://rubygems.org'

### TODO: Ignore the below comment during development, fix before release ###
# DO NOT ADD DEPENDENCIES HERE!
# Please declare a minimum development dependency in the gemspec,
# then target specific versions in the Appraisals file.

gemspec

group :test do
gem 'opentelemetry-instrumentation-base', path: '../base'
gem 'opentelemetry-api', git: 'https://github.com/kaylareopelle/opentelemetry-ruby', branch: 'log-record-processor3', glob: 'api/*.gemspec'
gem 'opentelemetry-logs-api', git: 'https://github.com/kaylareopelle/opentelemetry-ruby', branch: 'log-record-processor3', glob: 'logs_api/*.gemspec'
gem 'opentelemetry-logs-sdk', git: 'https://github.com/kaylareopelle/opentelemetry-ruby', branch: 'log-record-processor3', glob: 'logs_sdk/*.gemspec'
gem 'opentelemetry-sdk', git: 'https://github.com/kaylareopelle/opentelemetry-ruby', branch: 'log-record-processor3', glob: 'sdk/*.gemspec'
Comment on lines +17 to +21
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Current workaround to test against the WIP SDK/etc. code.

end
201 changes: 201 additions & 0 deletions instrumentation/logger/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.
54 changes: 54 additions & 0 deletions instrumentation/logger/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# OpenTelemetry Logger Instrumentation

TODO: Update description. This README is incomplete.

## How do I get started?

Install the gem using:

```
gem install opentelemetry-instrumentation-logger
```

Or, if you use [bundler][bundler-home], include `opentelemetry-instrumentation-logger` 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::Logger'
end
```

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

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

TODO: Add documentation for config options.

## Examples

TODO: Create example

## How can I get involved?

The `opentelemetry-instrumentation-logger` 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-logger` 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
Loading