Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
f8dddfe
Implement LoggerProvider#logger
kaylareopelle Aug 9, 2023
0dc0f7c
Associate a Resource with LoggerProvider
kaylareopelle Aug 9, 2023
b917fa9
resource, processors, mutex
kaylareopelle Aug 9, 2023
b618b84
Write test for add_log_record_processor
kaylareopelle Aug 14, 2023
d9609be
Implement LoggerProvider#shutdown
kaylareopelle Aug 14, 2023
e7aa448
LoggerProvider#shutdown with arg on processor
kaylareopelle Aug 15, 2023
8869933
Temp class comment on LogRecordProcessor
kaylareopelle Aug 15, 2023
dcb307a
LogRecordProcessor#force_flush
kaylareopelle Aug 15, 2023
96f89bd
Cleanup
kaylareopelle Aug 16, 2023
44665d3
Bump versions
kaylareopelle Aug 16, 2023
201e517
Address feedback from fallwith
kaylareopelle Aug 18, 2023
6feaf08
Add more tests
kaylareopelle Aug 22, 2023
6a9abd3
Update tests and error handling
kaylareopelle Aug 22, 2023
2c8c3d3
Docs updates
kaylareopelle Aug 22, 2023
6791bc9
Add links
kaylareopelle Aug 22, 2023
7652a59
feat: Create SDK LogRecord
kaylareopelle Aug 16, 2023
78e6008
Update documentation
kaylareopelle Aug 25, 2023
98b5b06
draft log record processors
kaylareopelle Aug 16, 2023
71b6414
More WIP log record processors
kaylareopelle Aug 25, 2023
c943ca9
Initial log_record_processor
kaylareopelle Sep 1, 2023
db1a5a5
Initial simple log record processor
kaylareopelle Sep 1, 2023
81873ac
Initial Batch log record processor
kaylareopelle Sep 1, 2023
44e6d14
Add Logger#emit
kaylareopelle Sep 1, 2023
e53996a
Add LogRecordData
kaylareopelle Sep 1, 2023
d93f7b1
Add LogRecordExporter
kaylareopelle Sep 1, 2023
7845691
Remove processor from logs.rb
kaylareopelle Sep 1, 2023
55cb5d2
Move log record processor out of export
kaylareopelle Sep 1, 2023
b8a8304
Fix module name Log => Logs
kaylareopelle Sep 1, 2023
e0bdfe0
Trace => Logs test definition for log record processor
kaylareopelle Sep 1, 2023
5093d82
Trace => Logs exporter test
kaylareopelle Sep 1, 2023
43afe4d
Add log record processor tests
kaylareopelle Sep 1, 2023
e8cedbc
Move log_record_processor test out of export
kaylareopelle Sep 2, 2023
4e5d312
Sketch out tests for simple processor
kaylareopelle Sep 2, 2023
98ac3c6
Add test for #force_flush return value on exporter
kaylareopelle Sep 2, 2023
fdba25b
Remove hex methods from log_record_data, not used
kaylareopelle Sep 5, 2023
1704f42
Add Logger#emit tests
kaylareopelle Sep 5, 2023
5f7a051
Add tests for simple log record processor
kaylareopelle Sep 6, 2023
133c97a
Define LogRecord#to_log_record_data
kaylareopelle Sep 6, 2023
535af7b
Exclude test files from Simplecov
kaylareopelle Sep 6, 2023
a071638
WIP test
kaylareopelle Sep 13, 2023
b1e3756
initial in memory log record exporter
kaylareopelle Sep 13, 2023
baab58b
Add ExportError
kaylareopelle Sep 13, 2023
354cb85
Update BatchLogRecordProcessor
kaylareopelle Sep 13, 2023
7488f7a
Finish batch_log_record_processor tests
kaylareopelle Sep 13, 2023
0b638af
Add ConsoleLogRecordExporter
kaylareopelle Sep 13, 2023
8a403a8
Finish InMemoryLogRecordExporter
kaylareopelle Sep 13, 2023
b5ace43
Update ConsoleLogRecordExporter tests
kaylareopelle Sep 13, 2023
c5b2194
Add force_flush test for InMemoryLogRecordExporter
kaylareopelle Sep 13, 2023
00ab8df
Initial LogRecordLimits work
kaylareopelle Sep 14, 2023
703f57a
Fix LogRecordLimits
kaylareopelle Sep 14, 2023
e1deddc
Remote limits todo
kaylareopelle Sep 15, 2023
03eb454
Remove log record processor todo
kaylareopelle Sep 15, 2023
2e57f60
Remove simple span processor todo
kaylareopelle Sep 15, 2023
679c222
Implement log record attribute limits
kaylareopelle Sep 15, 2023
b56739b
Fix assert_nil in log record test
kaylareopelle Sep 15, 2023
2b000ee
Remove sampling from simple log record processor
kaylareopelle Sep 15, 2023
bb0d736
LogRecordExporter remove sampled text
kaylareopelle Sep 15, 2023
cf30286
InMemoryLogRecordExporter remove sampled text
kaylareopelle Sep 15, 2023
702502b
BatchLogRecordProcessor remove sampled
kaylareopelle Sep 15, 2023
6c3c252
Make SpanContext optional in LogRecord#to_log_record_data
kaylareopelle Sep 15, 2023
dd9b877
Add @skip_instrumenting to OpenTelemetry.logger
kaylareopelle Sep 25, 2023
46011ab
Initial commit otlp-logs
kaylareopelle Sep 25, 2023
4d8e5f3
Add logger_provider methods to logs_api
kaylareopelle Sep 25, 2023
b964d45
Create proxy_logger and proxy_logger_provider
kaylareopelle Sep 25, 2023
de28615
Add instrument_registry to Logs::Logger
kaylareopelle Sep 25, 2023
7f877d3
Create configuration patch to export logs w/sdk
kaylareopelle Sep 25, 2023
15e1fd8
Add unix_nano methods for LogRecordData timestamps
kaylareopelle Sep 25, 2023
41fe05b
Add instrumentation_regirstry to LoggerProvider
kaylareopelle Sep 25, 2023
63936a4
Logger - span_context by default, remove arg
kaylareopelle Sep 25, 2023
74d7878
Update logger provider tests to account for error message constant an…
kaylareopelle Sep 25, 2023
8e93285
LogRecordProcessor on_emit => emit
kaylareopelle Sep 25, 2023
59d06a9
Fix logger#emit test
kaylareopelle Sep 25, 2023
c0d5507
Add severity_number and dropped attributes logic
kaylareopelle Oct 3, 2023
86fc525
Update copied exporter test for logs exporter
kaylareopelle Oct 3, 2023
04b8144
Add create_log_record_data to test helpers
kaylareopelle Oct 3, 2023
5c85a3d
Create add_log_record_processor method in Configurator
kaylareopelle Oct 3, 2023
9776315
Add stopped and registry tests to logger provider
kaylareopelle Oct 3, 2023
60e7378
Update timestamp default to include :nanosecond in Logger
kaylareopelle Oct 3, 2023
6c93b03
Document log record limits arg on LoggerProvider#initialize
kaylareopelle Oct 3, 2023
7a3c42c
LogRecord updates for attribute counting, nanosecond time
kaylareopelle Oct 3, 2023
23bfc49
Logger update docs to use :nanosecond
kaylareopelle Oct 3, 2023
c74c92b
Create add_log_record_processor method in configuration patch
kaylareopelle Oct 3, 2023
5cf254d
Update timestamp methods to use correct format, add total_recorded_attrs
kaylareopelle Oct 3, 2023
3c03cc9
Merge branch 'main' into log-record-processor3
kaylareopelle Jan 3, 2024
adda555
Log result code
kaylareopelle Jan 10, 2024
f524ee6
Add some logging
kaylareopelle Jan 10, 2024
c0595b7
Remove API Severity Number
kaylareopelle Feb 27, 2024
35d861f
Add changes from LoggerProvider PR, merge main
kaylareopelle Feb 27, 2024
6c1b008
Merge branch 'main' into log-record-processor3
kaylareopelle Apr 4, 2024
55799eb
Merge branch 'main' into log-record-processor3
kaylareopelle Apr 9, 2024
65e13be
Update version of OTLP logs
kaylareopelle Apr 9, 2024
619dd16
Remove error logs with HTTP response
kaylareopelle Apr 19, 2024
9bf5910
feat: Update use of Context/SpanContext
kaylareopelle Apr 26, 2024
ccecc77
Skip failing logger provider registry test
kaylareopelle Apr 26, 2024
3795ae9
chore: Update logger test
kaylareopelle May 14, 2024
0171761
chore: Update condition to match upstream
kaylareopelle May 14, 2024
bd16be2
Merge pull request #8 from kaylareopelle/span_context_to_context
kaylareopelle May 14, 2024
5c01a4c
Merge branch 'main' into log-record-processor-with-emit-updates
kaylareopelle Jul 26, 2024
98580c5
Update log_record_limits
kaylareopelle Jul 26, 2024
c79f528
Merge pull request #9 from kaylareopelle/log-record-processor-with-em…
kaylareopelle Jul 31, 2024
1d7f17e
chore: Refactor log attribute truncation
kaylareopelle Jul 31, 2024
97880fe
chore: Test refactors
kaylareopelle Jul 31, 2024
1f7c92c
chore: Rubocop
kaylareopelle Jul 31, 2024
bcfa2af
Merge branch 'main' into log-record-processor3
kaylareopelle Aug 26, 2024
ea0a49c
Merge branch 'main' into log-record-processor3
kaylareopelle Aug 27, 2024
d44183d
feat: Create OTLP Logs Exporter
kaylareopelle Aug 26, 2024
ee8cda1
test: Skip intermittently failing test
kaylareopelle Sep 12, 2024
a64bdaa
ci: Add OTLP logs exporter to CI
kaylareopelle Sep 12, 2024
112cd21
test: Skip intermittent failure
kaylareopelle Sep 12, 2024
41d32fd
test: Client cert fixes
kaylareopelle Sep 13, 2024
7cba668
chore: Readme updates
kaylareopelle Sep 13, 2024
e5c03c3
Merge branch 'main' into log-record-processor3
kaylareopelle Sep 17, 2024
bcd4041
Merge branch 'main' into otlp-log-record-exporter
kaylareopelle Oct 15, 2024
1e6545d
Merge branch 'otlp-log-record-exporter' of github.com:kaylareopelle/o…
kaylareopelle Oct 15, 2024
18ec40f
ci: Exclude otlp-logs from JRuby CI, alphabetize
kaylareopelle Oct 15, 2024
a1bcf49
docs: Update README to use logs URL
kaylareopelle Oct 17, 2024
385ed1d
chore: Add tiny version to Appraisal
kaylareopelle Oct 17, 2024
f8ead31
chore: Update google-protobuf version, Appraisals
kaylareopelle Oct 22, 2024
4dc0f9f
chore: Rubocop single quotes over double quotes
kaylareopelle Oct 22, 2024
e7af001
test: Add minitest-stub-const
kaylareopelle Oct 31, 2024
abfcd54
feat: Add log output for send_bytes failure cases
kaylareopelle Oct 31, 2024
6fbbce6
Merge branch 'main' into otlp-log-record-exporter
kaylareopelle Nov 16, 2024
60c0021
chore: Remove outdated :exception kwarg
kaylareopelle Nov 18, 2024
77192b5
test: Loosen message match for SystemCallError
kaylareopelle Nov 18, 2024
09ad663
Merge branch 'main' into otlp-log-record-exporter
kaylareopelle Nov 18, 2024
91a2edd
Merge branch 'main' into log-record-processor3
kaylareopelle Nov 20, 2024
e8f058c
Merge branch 'otlp-log-record-exporter' into log-record-processor3
kaylareopelle Nov 20, 2024
1f12daa
chore: Remove outdated file
kaylareopelle Nov 20, 2024
31ff063
chore: misc backports to sync with main
kaylareopelle Nov 20, 2024
9fe2faa
fix: Add Logs namespace to exporter
kaylareopelle Nov 22, 2024
0b105b8
style: Rubocop spacing
kaylareopelle Nov 25, 2024
e9e872b
Merge branch 'main' into log-record-processor3
kaylareopelle Dec 3, 2024
e87ed23
chore: Clean up code to match upstream
kaylareopelle Dec 4, 2024
873f64a
Merge branch 'log-record-processor3' of github.com:kaylareopelle/open…
kaylareopelle Dec 4, 2024
5d243bb
chore: Remove unncessary mutex/instrument registry
kaylareopelle Dec 4, 2024
43ca962
Add post_install message warning branch deletion
kaylareopelle Dec 13, 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
17 changes: 16 additions & 1 deletion api/lib/opentelemetry.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ module OpenTelemetry

# @return [Object, Logger] configured Logger or a default STDOUT Logger.
def logger
@logger ||= Logger.new($stdout, level: ENV['OTEL_LOG_LEVEL'] || Logger::INFO)
@logger ||= create_logger
Copy link
Owner Author

Choose a reason for hiding this comment

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

These changes are directly related to the Logs instrumentation. They need a PR when the logs instrumentation is ready for review.

# alternately: Logger.new($stdout, level: ENV['OTEL_LOG_LEVEL'] || Logger::INF, progname: 'OpenTelemetry')
# and clean up the log messages that are prefixed with "OpenTelemetry"
# if we want log records generated for OpenTelemetry logs, I think we can do that, but I imagine this is
# "untraced" territory
end

# @return [Callable] configured error handler or a default that logs the
Expand Down Expand Up @@ -69,4 +73,15 @@ def tracer_provider
def propagation
@propagation ||= Context::Propagation::NoopTextMapPropagator.new
end

private

def create_logger
logger = Logger.new($stdout, level: ENV['OTEL_LOG_LEVEL'] || Logger::INFO)
# @skip_instrumenting prevents Ruby Logger instrumentation from
# triggering a stack overflow. Logs emitted using OpenTelemetry.logger
# will not be turned into OpenTelemetry LogRecords.
logger.instance_variable_set(:@skip_instrumenting, true)
logger
end
end
2 changes: 2 additions & 0 deletions api/opentelemetry-api.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,6 @@ Gem::Specification.new do |spec|
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-api/v#{OpenTelemetry::VERSION}"
end

spec.post_install_message = "The OTel Logs gems have been released on RubyGems! The log-record-processor3 branch is going away on 13 January 2025. Please update your Gemfile to install `opentelemetry-api` directly from RubyGems."
end
4 changes: 1 addition & 3 deletions exporter/otlp-logs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@ This gem supports the [v0.20.0 release][otel-proto-release] of OTLP.
Install the gem using:

```console

gem install opentelemetry-logs-sdk
gem install opentelemetry-exporter-otlp

gem install opentelemetry-exporter-otlp-logs
```

Or, if you use [bundler][bundler-home], include `opentelemetry-sdk` in your `Gemfile`.
Expand Down
2 changes: 2 additions & 0 deletions exporter/otlp-logs/opentelemetry-exporter-otlp-logs.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,6 @@ Gem::Specification.new do |spec|
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-exporter-otlp/v#{OpenTelemetry::Exporter::OTLP::Logs::VERSION}"
end

spec.post_install_message = "The OTel Logs gems have been released on RubyGems! The log-record-processor3 branch is going away on 13 January 2025. Please update your Gemfile to install `opentelemetry-exporter-otlp-logs` directly from RubyGems."
end
2 changes: 2 additions & 0 deletions exporter/otlp/opentelemetry-exporter-otlp.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,6 @@ Gem::Specification.new do |spec|
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-exporter-otlp/v#{OpenTelemetry::Exporter::OTLP::VERSION}"
end

spec.post_install_message = "The OTel Logs gems have been released on RubyGems! The log-record-processor3 branch is going away on 13 January 2025. Please update your Gemfile to install `opentelemetry-exporter-otlp` directly from RubyGems."
end
3 changes: 3 additions & 0 deletions logs_api/opentelemetry-logs-api.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,7 @@ Gem::Specification.new do |spec|
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-logs-api/v#{OpenTelemetry::Logs::VERSION}"
end

spec.post_install_message = "This code has been released on RubyGems! The log-record-processor3 branch is going away on 13 January 2025. Please update your Gemfiles to install `opentelemetry-logs-api` directly from RubyGems."
end

2 changes: 1 addition & 1 deletion logs_sdk/lib/opentelemetry/sdk/logs/logger_provider.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def initialize(resource: OpenTelemetry::SDK::Resources::Resource.create, log_rec
@registry_mutex = Mutex.new
end

# Returns an {OpenTelemetry::SDK::Logs::Logger} instance.
# Creates an {OpenTelemetry::SDK::Logs::Logger} instance.
#
# @param [String] name Instrumentation package name
# @param [optional String] version Instrumentation package version
Expand Down
3 changes: 3 additions & 0 deletions logs_sdk/opentelemetry-logs-sdk.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,7 @@ Gem::Specification.new do |spec|
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-logs-sdk/v#{OpenTelemetry::SDK::Logs::VERSION}"
end

spec.post_install_message = "The OTel Logs gems have been released on RubyGems! The log-record-processor3 branch is going away on 13 January 2025. Please update your Gemfile to install `opentelemetry-logs-sdk` directly from RubyGems."
end

2 changes: 2 additions & 0 deletions sdk/opentelemetry-sdk.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,6 @@ Gem::Specification.new do |spec|
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-sdk/v#{OpenTelemetry::SDK::VERSION}"
end

spec.post_install_message = "The OTel Logs gems have been released on RubyGems! The log-record-processor3 branch is going away on 13 January 2025. Please update your Gemfile to install `opentelemetry-sdk` directly from RubyGems."
end