diff --git a/Gemfile b/Gemfile index 3179a3f..24e3568 100644 --- a/Gemfile +++ b/Gemfile @@ -28,37 +28,10 @@ group :test do gem 'rack-test' end -# OpenTelemetry gems with logging-related enhancements -gem 'opentelemetry-api', - git: 'https://github.com/kaylareopelle/opentelemetry-ruby', - branch: 'log-record-processor3', - glob: 'api/*.gemspec' - -gem 'opentelemetry-sdk', - git: 'https://github.com/kaylareopelle/opentelemetry-ruby', - branch: 'log-record-processor3', - glob: 'sdk/*.gemspec' - -# Unreleased, logs-specific gems -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' - -# OTLP Exporters -# We don't need to change anything with the main OTLP exporter +gem 'opentelemetry-sdk', '~> 1.6' +gem 'opentelemetry-logs-sdk' gem 'opentelemetry-exporter-otlp' - -# The OTLP logging exporter has not been released -gem 'opentelemetry-exporter-otlp-logs', - git: 'https://github.com/kaylareopelle/opentelemetry-ruby', - branch: 'log-record-processor3', - glob: 'exporter/otlp-logs/*.gemspec' +gem 'opentelemetry-exporter-otlp-logs' # Instrumentation and Ruby Logger bridge gem 'opentelemetry-instrumentation-all', diff --git a/Gemfile.lock b/Gemfile.lock index c81b2ba..f7bf29a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,69 +1,13 @@ -GIT - remote: https://github.com/kaylareopelle/opentelemetry-ruby - revision: 31ff06315824c4130a8f9fa4dfcba7d8fd865a78 - branch: log-record-processor3 - glob: exporter/otlp-logs/*.gemspec - specs: - opentelemetry-exporter-otlp-logs (0.1.0) - google-protobuf (>= 3.18) - googleapis-common-protos-types (~> 1.3) - opentelemetry-api (~> 1.1) - opentelemetry-common (~> 0.20) - opentelemetry-logs-api (~> 0.1) - opentelemetry-logs-sdk (~> 0.1) - opentelemetry-sdk - opentelemetry-semantic_conventions - -GIT - remote: https://github.com/kaylareopelle/opentelemetry-ruby - revision: 31ff06315824c4130a8f9fa4dfcba7d8fd865a78 - branch: log-record-processor3 - glob: logs_api/*.gemspec - specs: - opentelemetry-logs-api (0.1.0) - opentelemetry-api (~> 1.0) - -GIT - remote: https://github.com/kaylareopelle/opentelemetry-ruby - revision: 31ff06315824c4130a8f9fa4dfcba7d8fd865a78 - branch: log-record-processor3 - glob: logs_sdk/*.gemspec - specs: - opentelemetry-logs-sdk (0.1.0) - opentelemetry-api (~> 1.2) - opentelemetry-logs-api (~> 0.1) - opentelemetry-sdk (~> 1.3) - -GIT - remote: https://github.com/kaylareopelle/opentelemetry-ruby - revision: 31ff06315824c4130a8f9fa4dfcba7d8fd865a78 - branch: log-record-processor3 - glob: sdk/*.gemspec - specs: - opentelemetry-sdk (1.5.0) - opentelemetry-api (~> 1.1) - opentelemetry-common (~> 0.20) - opentelemetry-registry (~> 0.2) - opentelemetry-semantic_conventions - -GIT - remote: https://github.com/kaylareopelle/opentelemetry-ruby - revision: 31ff06315824c4130a8f9fa4dfcba7d8fd865a78 - branch: log-record-processor3 - glob: api/*.gemspec - specs: - opentelemetry-api (1.4.0) - GIT remote: https://github.com/kaylareopelle/opentelemetry-ruby-contrib - revision: d00bc1da07fe5302d592773a4e769568c4cd985e + revision: b0cace23725585d2b2a0d17f1f9c3f083ebf4add branch: logger-instrumentation glob: instrumentation/all/*.gemspec specs: - opentelemetry-instrumentation-all (0.64.0) + opentelemetry-instrumentation-all (0.69.1) opentelemetry-instrumentation-active_model_serializers (~> 0.20.1) opentelemetry-instrumentation-aws_lambda (~> 0.1.0) - opentelemetry-instrumentation-aws_sdk (~> 0.5.0) + opentelemetry-instrumentation-aws_sdk (~> 0.7.0) opentelemetry-instrumentation-bunny (~> 0.21.0) opentelemetry-instrumentation-concurrent_ruby (~> 0.21.1) opentelemetry-instrumentation-dalli (~> 0.25.0) @@ -78,15 +22,15 @@ GIT opentelemetry-instrumentation-http_client (~> 0.22.1) opentelemetry-instrumentation-koala (~> 0.20.1) opentelemetry-instrumentation-lmdb (~> 0.22.1) - opentelemetry-instrumentation-logger (~> 0.0.0) + opentelemetry-instrumentation-logger (~> 0.1.0) opentelemetry-instrumentation-mongo (~> 0.22.1) opentelemetry-instrumentation-mysql2 (~> 0.28.0) opentelemetry-instrumentation-net_http (~> 0.22.1) opentelemetry-instrumentation-pg (~> 0.29.0) opentelemetry-instrumentation-que (~> 0.8.0) opentelemetry-instrumentation-racecar (~> 0.3.0) - opentelemetry-instrumentation-rack (~> 0.24.0) - opentelemetry-instrumentation-rails (~> 0.31.0) + opentelemetry-instrumentation-rack (~> 0.25.0) + opentelemetry-instrumentation-rails (~> 0.33.0) opentelemetry-instrumentation-rake (~> 0.2.1) opentelemetry-instrumentation-rdkafka (~> 0.4.0) opentelemetry-instrumentation-redis (~> 0.25.1) @@ -99,13 +43,13 @@ GIT GIT remote: https://github.com/kaylareopelle/opentelemetry-ruby-contrib - revision: d00bc1da07fe5302d592773a4e769568c4cd985e + revision: b0cace23725585d2b2a0d17f1f9c3f083ebf4add branch: logger-instrumentation glob: instrumentation/logger/*.gemspec specs: - opentelemetry-instrumentation-logger (0.0.0) - opentelemetry-api (~> 1.2) + opentelemetry-instrumentation-logger (0.1.0) opentelemetry-instrumentation-base (~> 0.22) + opentelemetry-logs-api (~> 0.1) GEM remote: https://rubygems.org/ @@ -246,6 +190,7 @@ GEM racc (~> 1.4) nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) + opentelemetry-api (1.4.0) opentelemetry-common (0.21.0) opentelemetry-api (~> 1.0) opentelemetry-exporter-otlp (0.29.0) @@ -255,16 +200,25 @@ GEM opentelemetry-common (~> 0.20) opentelemetry-sdk (~> 1.2) opentelemetry-semantic_conventions - opentelemetry-helpers-mysql (0.1.1) + opentelemetry-exporter-otlp-logs (0.1.0) + google-protobuf (>= 3.18) + googleapis-common-protos-types (~> 1.3) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.20) + opentelemetry-logs-api (~> 0.1) + opentelemetry-logs-sdk (~> 0.1) + opentelemetry-sdk + opentelemetry-semantic_conventions + opentelemetry-helpers-mysql (0.1.2) opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.21) - opentelemetry-helpers-sql-obfuscation (0.2.0) + opentelemetry-helpers-sql-obfuscation (0.2.1) opentelemetry-common (~> 0.21) - opentelemetry-instrumentation-action_mailer (0.1.0) + opentelemetry-instrumentation-action_mailer (0.2.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-active_support (~> 0.1) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-action_pack (0.9.0) + opentelemetry-instrumentation-action_pack (0.10.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) @@ -272,13 +226,14 @@ GEM opentelemetry-api (~> 1.0) opentelemetry-instrumentation-active_support (~> 0.6) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_job (0.7.7) + opentelemetry-instrumentation-active_job (0.7.8) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_model_serializers (0.20.2) + opentelemetry-instrumentation-active_model_serializers (0.20.3) opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-active_support (>= 0.6.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_record (0.7.4) + opentelemetry-instrumentation-active_record (0.8.1) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-active_support (0.6.0) @@ -287,7 +242,7 @@ GEM opentelemetry-instrumentation-aws_lambda (0.1.1) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-aws_sdk (0.5.4) + opentelemetry-instrumentation-aws_sdk (0.7.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-base (0.22.6) @@ -306,13 +261,13 @@ GEM opentelemetry-instrumentation-delayed_job (0.22.4) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-ethon (0.21.8) + opentelemetry-instrumentation-ethon (0.21.9) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-excon (0.22.4) + opentelemetry-instrumentation-excon (0.22.5) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-faraday (0.24.6) + opentelemetry-instrumentation-faraday (0.24.7) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-grape (0.2.0) @@ -325,10 +280,10 @@ GEM opentelemetry-instrumentation-gruf (0.2.1) opentelemetry-api (>= 1.0.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-http (0.23.4) + opentelemetry-instrumentation-http (0.23.5) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-http_client (0.22.7) + opentelemetry-instrumentation-http_client (0.22.8) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-koala (0.20.5) @@ -345,29 +300,29 @@ GEM opentelemetry-helpers-mysql opentelemetry-helpers-sql-obfuscation opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-net_http (0.22.7) + opentelemetry-instrumentation-net_http (0.22.8) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-pg (0.29.0) + opentelemetry-instrumentation-pg (0.29.1) opentelemetry-api (~> 1.0) opentelemetry-helpers-sql-obfuscation opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-que (0.8.3) + opentelemetry-instrumentation-que (0.8.4) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-racecar (0.3.4) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rack (0.24.6) + opentelemetry-instrumentation-rack (0.25.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rails (0.31.2) + opentelemetry-instrumentation-rails (0.33.1) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-action_mailer (~> 0.1.0) - opentelemetry-instrumentation-action_pack (~> 0.9.0) + opentelemetry-instrumentation-action_mailer (~> 0.2.0) + opentelemetry-instrumentation-action_pack (~> 0.10.0) opentelemetry-instrumentation-action_view (~> 0.7.0) opentelemetry-instrumentation-active_job (~> 0.7.0) - opentelemetry-instrumentation-active_record (~> 0.7.0) + opentelemetry-instrumentation-active_record (~> 0.8.0) opentelemetry-instrumentation-active_support (~> 0.6.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rake (0.2.2) @@ -382,7 +337,7 @@ GEM opentelemetry-instrumentation-resque (0.5.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-restclient (0.22.7) + opentelemetry-instrumentation-restclient (0.22.8) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-ruby_kafka (0.21.3) @@ -401,8 +356,19 @@ GEM opentelemetry-helpers-sql-obfuscation opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-semantic_conventions (>= 1.8.0) + opentelemetry-logs-api (0.1.0) + opentelemetry-api (~> 1.0) + opentelemetry-logs-sdk (0.1.0) + opentelemetry-api (~> 1.2) + opentelemetry-logs-api (~> 0.1) + opentelemetry-sdk (~> 1.3) opentelemetry-registry (0.3.1) opentelemetry-api (~> 1.1) + opentelemetry-sdk (1.6.0) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.20) + opentelemetry-registry (~> 0.2) + opentelemetry-semantic_conventions opentelemetry-semantic_conventions (1.10.1) opentelemetry-api (~> 1.0) opentelemetry-test-helpers (0.4.0) @@ -474,14 +440,12 @@ PLATFORMS DEPENDENCIES debug minitest - opentelemetry-api! opentelemetry-exporter-otlp - opentelemetry-exporter-otlp-logs! + opentelemetry-exporter-otlp-logs opentelemetry-instrumentation-all! opentelemetry-instrumentation-logger! - opentelemetry-logs-api! - opentelemetry-logs-sdk! - opentelemetry-sdk! + opentelemetry-logs-sdk + opentelemetry-sdk (~> 1.6) opentelemetry-test-helpers puma (~> 6.4) rack-test