Skip to content

Commit edb8b89

Browse files
ericmustinericmustin
authored
Merge pull request #1566 from DataDog/add_semantic_logger_via_patching
Add rails automatic log injection with semantic logger via patching
2 parents b196dc3 + 913f40e commit edb8b89

File tree

60 files changed

+7364
-5
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+7364
-5
lines changed

‎Appraisals

+131
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,14 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
8484
gem 'lograge', '~> 0.11'
8585
end
8686

87+
appraise 'rails4-semantic-logger' do
88+
gem 'rails', '4.2.11.1'
89+
gem 'pg', '< 1.0', platform: :ruby
90+
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
91+
gem 'sprockets', '< 4'
92+
gem 'rails_semantic_logger', '~> 4.0'
93+
end
94+
8795
appraise 'rails4-postgres-redis' do
8896
gem 'rails', '4.2.11.1'
8997
gem 'pg', '< 1.0', platform: :ruby
@@ -123,6 +131,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
123131
gem 'resque', '< 2.0'
124132
gem 'ruby-kafka', '>= 0.7.10'
125133
gem 'rspec', '>= 3.0.0'
134+
gem 'semantic_logger', '~> 4.0'
126135
gem 'sequel', '~> 4.0', '< 4.37'
127136
gem 'shoryuken'
128137
gem 'sidekiq', '~> 3.5.4'
@@ -210,6 +219,14 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
210219
gem 'lograge', '~> 0.11'
211220
end
212221

222+
appraise 'rails4-semantic-logger' do
223+
gem 'rails', '4.2.11.1'
224+
gem 'pg', '< 1.0', platform: :ruby
225+
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
226+
gem 'sprockets', '< 4'
227+
gem 'rails_semantic_logger', '~> 4.0'
228+
end
229+
213230
appraise 'rails4-postgres-redis' do
214231
gem 'rails', '4.2.11.1'
215232
gem 'pg', '< 1.0', platform: :ruby
@@ -274,6 +291,14 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
274291
gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
275292
end
276293

294+
appraise 'rails5-semantic-logger' do
295+
gem 'rails', '5.2.3'
296+
gem 'pg', '< 1.0', platform: :ruby
297+
gem 'sprockets', '< 4'
298+
gem 'rails_semantic_logger', '~> 4.0'
299+
gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
300+
end
301+
277302
appraise 'contrib' do
278303
gem 'actionpack'
279304
gem 'actionview'
@@ -310,6 +335,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
310335
gem 'resque', '< 2.0'
311336
gem 'ruby-kafka', '>= 0.7.10'
312337
gem 'rspec', '>= 3.0.0'
338+
gem 'semantic_logger', '~> 4.0'
313339
gem 'sequel'
314340
gem 'shoryuken'
315341
gem 'sidekiq'
@@ -398,6 +424,14 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
398424
gem 'lograge', '~> 0.11'
399425
end
400426

427+
appraise 'rails4-semantic-logger' do
428+
gem 'rails', '4.2.11.1'
429+
gem 'pg', '< 1.0', platform: :ruby
430+
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
431+
gem 'sprockets', '< 4'
432+
gem 'rails_semantic_logger', '~> 4.0'
433+
end
434+
401435
appraise 'rails4-postgres-redis' do
402436
gem 'rails', '4.2.11.1'
403437
gem 'pg', '< 1.0', platform: :ruby
@@ -440,6 +474,13 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
440474
gem 'lograge', '~> 0.11'
441475
end
442476

477+
appraise 'rails5-semantic-logger' do
478+
gem 'rails', '~> 5.2.1'
479+
gem 'pg', '< 1.0', platform: :ruby
480+
gem 'sprockets', '< 4'
481+
gem 'rails_semantic_logger', '~> 4.0'
482+
end
483+
443484
appraise 'rails5-postgres-redis-activesupport' do
444485
gem 'rails', '~> 5.2.1'
445486
gem 'pg', '< 1.0', platform: :ruby
@@ -506,6 +547,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
506547
gem 'resque'
507548
gem 'ruby-kafka', '>= 0.7.10'
508549
gem 'rspec', '>= 3.0.0'
550+
gem 'semantic_logger', '~> 4.0'
509551
gem 'sequel'
510552
gem 'shoryuken'
511553
gem 'sidekiq'
@@ -542,6 +584,13 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
542584
gem 'lograge', '~> 0.11'
543585
end
544586

587+
appraise 'rails5-semantic-logger' do
588+
gem 'rails', '~> 5.2.1'
589+
gem 'pg', '< 1.0', platform: :ruby
590+
gem 'sprockets', '< 4'
591+
gem 'rails_semantic_logger', '~> 4.0'
592+
end
593+
545594
appraise 'rails5-postgres-redis' do
546595
gem 'rails', '~> 5.2.1'
547596
gem 'pg', '< 1.0', platform: :ruby
@@ -617,6 +666,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
617666
gem 'resque'
618667
gem 'ruby-kafka', '>= 0.7.10'
619668
gem 'rspec', '>= 3.0.0'
669+
gem 'semantic_logger', '~> 4.0'
620670
gem 'sequel'
621671
gem 'shoryuken'
622672
gem 'sidekiq'
@@ -656,6 +706,15 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
656706
gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
657707
end
658708

709+
appraise 'rails5-semantic-logger' do
710+
gem 'rails', '~> 5.2.1'
711+
gem 'pg', '< 1.0', platform: :ruby
712+
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
713+
gem 'sprockets', '< 4'
714+
gem 'rails_semantic_logger', '~> 4.0'
715+
gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
716+
end
717+
659718
appraise 'rails5-postgres-redis' do
660719
gem 'rails', '~> 5.2.1'
661720
gem 'pg', '< 1.0', platform: :ruby
@@ -705,6 +764,15 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
705764
gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
706765
end
707766

767+
appraise 'rails6-semantic-logger' do
768+
gem 'rails', '~> 6.0.0'
769+
gem 'pg', '< 1.0', platform: :ruby
770+
gem 'activerecord-jdbcpostgresql-adapter', '>= 60', platform: :jruby
771+
gem 'sprockets', '< 4'
772+
gem 'rails_semantic_logger', '~> 4.0'
773+
gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
774+
end
775+
708776
appraise 'rails6-postgres-redis' do
709777
gem 'rails', '~> 6.0.0'
710778
gem 'pg', '< 1.0', platform: :ruby
@@ -774,6 +842,15 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
774842
gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
775843
end
776844

845+
appraise 'rails61-semantic-logger' do
846+
gem 'rails', '~> 6.1.0'
847+
gem 'pg', '>= 1.1', platform: :ruby
848+
gem 'activerecord-jdbcpostgresql-adapter', '>= 61', platform: :jruby
849+
gem 'sprockets', '< 4'
850+
gem 'rails_semantic_logger', '~> 4.0'
851+
gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
852+
end
853+
777854
appraise 'resque2-redis3' do
778855
gem 'redis', '< 4.0'
779856
gem 'resque', '>= 2.0'
@@ -826,6 +903,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
826903
gem 'resque'
827904
gem 'ruby-kafka', '>= 0.7.10'
828905
gem 'rspec', '>= 3.0.0'
906+
gem 'semantic_logger', '~> 4.0'
829907
gem 'sequel'
830908
gem 'shoryuken'
831909
gem 'sidekiq'
@@ -862,6 +940,13 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
862940
gem 'lograge', '~> 0.11'
863941
end
864942

943+
appraise 'rails5-semantic-logger' do
944+
gem 'rails', '~> 5.2.1'
945+
gem 'pg', '< 1.0', platform: :ruby
946+
gem 'sprockets', '< 4'
947+
gem 'rails_semantic_logger', '~> 4.0'
948+
end
949+
865950
appraise 'rails5-postgres-redis' do
866951
gem 'rails', '~> 5.2.1'
867952
gem 'pg', '< 1.0', platform: :ruby
@@ -901,6 +986,13 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
901986
gem 'lograge', '~> 0.11'
902987
end
903988

989+
appraise 'rails6-semantic-logger' do
990+
gem 'rails', '~> 6.0.0'
991+
gem 'pg', '< 1.0', platform: :ruby
992+
gem 'sprockets', '< 4'
993+
gem 'rails_semantic_logger', '~> 4.0'
994+
end
995+
904996
appraise 'rails6-postgres-redis' do
905997
gem 'rails', '~> 6.0.0'
906998
gem 'pg', '< 1.0', platform: :ruby
@@ -956,6 +1048,13 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
9561048
gem 'lograge', '~> 0.11'
9571049
end
9581050

1051+
appraise 'rails61-semantic-logger' do
1052+
gem 'rails', '~> 6.1.0'
1053+
gem 'pg', '>= 1.1', platform: :ruby
1054+
gem 'sprockets', '< 4'
1055+
gem 'rails_semantic_logger', '~> 4.0'
1056+
end
1057+
9591058
appraise 'resque2-redis3' do
9601059
gem 'redis', '< 4.0'
9611060
gem 'resque', '>= 2.0'
@@ -1005,6 +1104,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
10051104
gem 'resque'
10061105
gem 'ruby-kafka', '>= 0.7.10'
10071106
gem 'rspec', '>= 3.0.0'
1107+
gem 'semantic_logger', '~> 4.0'
10081108
gem 'sequel'
10091109
gem 'shoryuken'
10101110
gem 'sidekiq'
@@ -1041,6 +1141,13 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
10411141
gem 'lograge', '~> 0.11'
10421142
end
10431143

1144+
appraise 'rails5-semantic-logger' do
1145+
gem 'rails', '~> 5.2.1'
1146+
gem 'pg', '< 1.0', platform: :ruby
1147+
gem 'sprockets', '< 4'
1148+
gem 'rails_semantic_logger', '~> 4.0'
1149+
end
1150+
10441151
appraise 'rails5-postgres-redis' do
10451152
gem 'rails', '~> 5.2.1'
10461153
gem 'pg', '< 1.0', platform: :ruby
@@ -1082,6 +1189,13 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
10821189
gem 'lograge', '~> 0.11'
10831190
end
10841191

1192+
appraise 'rails6-semantic-logger' do
1193+
gem 'rails', '~> 6.0.0'
1194+
gem 'pg', '< 1.0', platform: :ruby
1195+
gem 'sprockets', '< 4'
1196+
gem 'rails_semantic_logger', '~> 4.0'
1197+
end
1198+
10851199
appraise 'rails6-postgres-redis' do
10861200
gem 'rails', '~> 6.0.0'
10871201
gem 'pg', '< 1.0', platform: :ruby
@@ -1139,6 +1253,13 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
11391253
gem 'lograge', '~> 0.11'
11401254
end
11411255

1256+
appraise 'rails61-semantic-logger' do
1257+
gem 'rails', '~> 6.1.0'
1258+
gem 'pg', '>= 1.1', platform: :ruby
1259+
gem 'sprockets', '< 4'
1260+
gem 'rails_semantic_logger', '~> 4.0'
1261+
end
1262+
11421263
appraise 'resque2-redis3' do
11431264
gem 'redis', '< 4.0'
11441265
gem 'resque', '>= 2.0'
@@ -1188,6 +1309,7 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
11881309
gem 'ruby-kafka', '>= 0.7.10'
11891310
gem 'rspec', '>= 3.0.0'
11901311
gem 'sequel'
1312+
gem 'semantic_logger', '~> 4.0'
11911313
gem 'shoryuken'
11921314
gem 'sidekiq'
11931315
gem 'sinatra'
@@ -1235,6 +1357,14 @@ elsif Gem::Version.new('3.0.0') <= Gem::Version.new(RUBY_VERSION)
12351357
gem 'sidekiq', '>= 6.1.2'
12361358
gem 'sprockets', '< 4'
12371359
gem 'lograge', '~> 0.11'
1360+
gem 'rails_semantic_logger', '~> 4.0'
1361+
end
1362+
1363+
appraise 'rails61-semantic-logger' do
1364+
gem 'rails', '~> 6.1.0'
1365+
gem 'pg', '>= 1.1', platform: :ruby
1366+
gem 'sprockets', '< 4'
1367+
gem 'rails_semantic_logger', '~> 4.0'
12381368
end
12391369

12401370
appraise 'resque2-redis3' do
@@ -1285,6 +1415,7 @@ elsif Gem::Version.new('3.0.0') <= Gem::Version.new(RUBY_VERSION)
12851415
gem 'resque'
12861416
gem 'ruby-kafka', '>= 0.7.10'
12871417
gem 'rspec', '>= 3.0.0'
1418+
gem 'semantic_logger', '~> 4.0'
12881419
gem 'sequel'
12891420
gem 'shoryuken'
12901421
gem 'sidekiq'

0 commit comments

Comments
 (0)