Skip to content

Commit 7dcd307

Browse files
authored
Merge pull request #6431 from rubyforgood/scout-logs-new
bundle add scout_apm_logging
2 parents 5a3e54d + dec24ed commit 7dcd307

File tree

2 files changed

+46
-0
lines changed

2 files changed

+46
-0
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,5 @@ group :test do
109109
gem "simplecov", require: false
110110
gem "webmock" # HTTP request stubber
111111
end
112+
113+
gem "scout_apm_logging", "~> 2.1"

Gemfile.lock

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,8 @@ GEM
267267
google-protobuf (4.30.2-x86_64-linux)
268268
bigdecimal
269269
rake (>= 13)
270+
googleapis-common-protos-types (1.20.0)
271+
google-protobuf (>= 3.18, < 5.a)
270272
groupdate (6.7.0)
271273
activesupport (>= 7.1)
272274
hashdiff (1.1.2)
@@ -355,6 +357,37 @@ GEM
355357
oj (3.16.11)
356358
bigdecimal (>= 3.0)
357359
ostruct (>= 0.2)
360+
opentelemetry-api (1.5.0)
361+
opentelemetry-common (0.22.0)
362+
opentelemetry-api (~> 1.0)
363+
opentelemetry-exporter-otlp-logs (0.2.0)
364+
google-protobuf (>= 3.18)
365+
googleapis-common-protos-types (~> 1.3)
366+
opentelemetry-api (~> 1.1)
367+
opentelemetry-common (~> 0.20)
368+
opentelemetry-logs-api (~> 0.1)
369+
opentelemetry-logs-sdk (~> 0.1)
370+
opentelemetry-sdk
371+
opentelemetry-semantic_conventions
372+
opentelemetry-instrumentation-base (0.23.0)
373+
opentelemetry-api (~> 1.0)
374+
opentelemetry-common (~> 0.21)
375+
opentelemetry-registry (~> 0.1)
376+
opentelemetry-logs-api (0.2.0)
377+
opentelemetry-api (~> 1.0)
378+
opentelemetry-logs-sdk (0.2.0)
379+
opentelemetry-api (~> 1.2)
380+
opentelemetry-logs-api (~> 0.1)
381+
opentelemetry-sdk (~> 1.3)
382+
opentelemetry-registry (0.4.0)
383+
opentelemetry-api (~> 1.1)
384+
opentelemetry-sdk (1.8.0)
385+
opentelemetry-api (~> 1.1)
386+
opentelemetry-common (~> 0.20)
387+
opentelemetry-registry (~> 0.2)
388+
opentelemetry-semantic_conventions
389+
opentelemetry-semantic_conventions (1.11.0)
390+
opentelemetry-api (~> 1.0)
358391
orm_adapter (0.5.0)
359392
ostruct (0.6.1)
360393
pagy (9.3.4)
@@ -543,6 +576,16 @@ GEM
543576
nokogiri (>= 1.16.8)
544577
scout_apm (5.6.4)
545578
parser
579+
scout_apm_logging (2.1.0)
580+
google-protobuf (>= 3.18)
581+
googleapis-common-protos-types
582+
opentelemetry-api
583+
opentelemetry-common
584+
opentelemetry-exporter-otlp-logs (>= 0.2.0)
585+
opentelemetry-instrumentation-base
586+
opentelemetry-logs-sdk (>= 0.2.0)
587+
opentelemetry-sdk (>= 1.2)
588+
scout_apm
546589
securerandom (0.4.1)
547590
selenium-webdriver (4.32.0)
548591
base64 (~> 0.2)
@@ -718,6 +761,7 @@ DEPENDENCIES
718761
rubocop-rspec_rails
719762
sablon
720763
scout_apm
764+
scout_apm_logging (~> 2.1)
721765
selenium-webdriver
722766
shoulda-matchers
723767
simplecov

0 commit comments

Comments
 (0)