Skip to content

Commit 8b190d7

Browse files
Merge pull request #23 from DataDog/WEB-2688-ddtrace-ruby
Adds ddtrace and new db restore / storage
2 parents 4e9d4f8 + 9556535 commit 8b190d7

File tree

5 files changed

+12530
-14219
lines changed

5 files changed

+12530
-14219
lines changed

services/backend/Gemfile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@ group :development, :test do
3232

3333
gem 'rspec_junit_formatter'
3434

35-
# monitoring
36-
gem 'bullet'
37-
gem 'rack-mini-profiler', require: false
38-
gem 'flamegraph'
39-
gem 'stackprof'
40-
gem 'memory_profiler'
41-
4235
gem 'webmock'
4336
end
4437

@@ -102,3 +95,6 @@ gem 'oj'
10295

10396
# Fix SCSS errors with Ruby 3 on MacOS
10497
gem 'sassc', github: 'sass/sassc-ruby', group: :development
98+
99+
# monitoring
100+
gem 'ddtrace', require: 'ddtrace/auto_instrument'

services/backend/Gemfile.lock

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@ GEM
141141
popper_js (>= 1.14.3, < 2)
142142
sassc-rails (>= 2.0.0)
143143
builder (3.2.4)
144-
bullet (7.0.1)
145-
activesupport (>= 3.0.0)
146-
uniform_notifier (~> 1.11)
147144
cancancan (3.3.0)
148145
capybara (3.36.0)
149146
addressable
@@ -176,6 +173,12 @@ GEM
176173
activerecord (>= 5.a)
177174
database_cleaner-core (~> 2.0.0)
178175
database_cleaner-core (2.0.1)
176+
ddtrace (1.4.1)
177+
debase-ruby_core_source (= 0.10.16)
178+
libdatadog (~> 0.7.0.1.1)
179+
libddwaf (~> 1.3.0.2.0)
180+
msgpack
181+
debase-ruby_core_source (0.10.16)
179182
devise (4.8.1)
180183
bcrypt (~> 3.0)
181184
orm_adapter (~> 0.1)
@@ -224,7 +227,6 @@ GEM
224227
ffaker (2.20.0)
225228
ffi (1.15.5)
226229
fiber-local (1.0.0)
227-
flamegraph (0.9.5)
228230
flatpickr (4.6.6.0)
229231
font_assets (0.1.14)
230232
rack
@@ -292,6 +294,9 @@ GEM
292294
addressable (~> 2.7)
293295
letter_opener (1.7.0)
294296
launchy (~> 2.2)
297+
libdatadog (0.7.0.1.1)
298+
libddwaf (1.3.0.2.0)
299+
ffi (~> 1.0)
295300
listen (3.7.1)
296301
rb-fsevent (~> 0.10, >= 0.10.3)
297302
rb-inotify (~> 0.9, >= 0.9.10)
@@ -302,7 +307,6 @@ GEM
302307
mini_mime (>= 0.1.1)
303308
marcel (1.0.2)
304309
matrix (0.4.2)
305-
memory_profiler (1.0.0)
306310
method_source (1.0.0)
307311
mini_magick (4.11.0)
308312
mini_mime (1.1.2)
@@ -352,8 +356,6 @@ GEM
352356
rack (>= 0.4)
353357
rack-cors (1.1.1)
354358
rack (>= 2.0.0)
355-
rack-mini-profiler (2.3.3)
356-
rack (>= 1.2.0)
357359
rack-test (1.1.0)
358360
rack (>= 1.0, < 3)
359361
rack-timeout (0.6.0)
@@ -609,7 +611,6 @@ GEM
609611
actionpack (>= 5.2)
610612
activesupport (>= 5.2)
611613
sprockets (>= 3.0.0)
612-
stackprof (0.2.17)
613614
state_machines (0.5.0)
614615
state_machines-activemodel (0.8.0)
615616
activemodel (>= 5.1)
@@ -635,7 +636,6 @@ GEM
635636
tzinfo (2.0.4)
636637
concurrent-ruby (~> 1.0)
637638
unicode-display_width (2.1.0)
638-
uniform_notifier (1.14.2)
639639
validates_zipcode (0.5.0)
640640
activemodel (>= 4.2.0)
641641
vcr (6.0.0)
@@ -669,20 +669,17 @@ DEPENDENCIES
669669
awesome_print
670670
aws-sdk-s3
671671
bootsnap
672-
bullet
673672
dalli
673+
ddtrace
674674
dotenv-rails (~> 2.1, >= 2.1.1)
675-
flamegraph
676675
font_assets
677676
letter_opener
678677
listen
679-
memory_profiler
680678
oj
681679
pg
682680
puma
683681
rack-cache
684682
rack-cors
685-
rack-mini-profiler
686683
rack-timeout
687684
rails (~> 6.1.4)
688685
remote_syslog_logger
@@ -702,7 +699,6 @@ DEPENDENCIES
702699
spree_i18n (>= 5.0)
703700
spree_sample (>= 4.4.0)
704701
spring
705-
stackprof
706702
terser
707703
vcr
708704
web-console (~> 4.0)
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Datadog.configure do |c|
2+
c.env = ENV['DD_ENV'] || 'development'
3+
c.service = ENV['DD_SERVICE'] || 'store-backend'
4+
c.tracing.sampling.default_rate = 1.0
5+
end

services/backend/config/initializers/rack_profiler.rb

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)