Skip to content

Commit 8626d44

Browse files
Merge pull request #428 from openedx/saad/dd-setup
feat: setup datadog instrumentation
2 parents 0dc490e + 2e4f302 commit 8626d44

File tree

4 files changed

+31
-0
lines changed

4 files changed

+31
-0
lines changed

Gemfile3

+1
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,4 @@ gem "rack-contrib", :git => 'https://github.com/rack/rack-contrib.git', :ref =>
7070

7171

7272
gem "timecop", "~> 0.9.5"
73+
gem 'ddtrace', require: 'ddtrace/auto_instrument'

Gemfile3.lock

+20
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,15 @@ GEM
3737
bigdecimal
3838
rexml
3939
dalli (3.2.8)
40+
datadog-ci (0.8.3)
41+
msgpack
42+
ddtrace (1.21.1)
43+
datadog-ci (~> 0.8.1)
44+
debase-ruby_core_source (= 3.3.1)
45+
libdatadog (~> 6.0.0.2.0)
46+
libddwaf (~> 1.14.0.0.0)
47+
msgpack
48+
debase-ruby_core_source (3.3.1)
4049
delayed_job (4.1.11)
4150
activesupport (>= 3.0, < 8.0)
4251
delayed_job_mongoid (3.0.0)
@@ -107,6 +116,15 @@ GEM
107116
i18n (1.14.1)
108117
concurrent-ruby (~> 1.0)
109118
kgio (2.11.4)
119+
libdatadog (6.0.0.2.0)
120+
libdatadog (6.0.0.2.0-aarch64-linux)
121+
libdatadog (6.0.0.2.0-x86_64-linux)
122+
libddwaf (1.14.0.0.0-aarch64-linux)
123+
ffi (~> 1.0)
124+
libddwaf (1.14.0.0.0-arm64-darwin)
125+
ffi (~> 1.0)
126+
libddwaf (1.14.0.0.0-x86_64-linux)
127+
ffi (~> 1.0)
110128
listen (3.8.0)
111129
rb-fsevent (~> 0.10, >= 0.10.3)
112130
rb-inotify (~> 0.9, >= 0.9.10)
@@ -128,6 +146,7 @@ GEM
128146
mongoid_magic_counter_cache (1.1.1)
129147
mongoid
130148
rake
149+
msgpack (1.7.2)
131150
multi_json (1.15.0)
132151
multipart-post (2.4.0)
133152
mustermann (3.0.0)
@@ -235,6 +254,7 @@ DEPENDENCIES
235254
bundler
236255
codecov
237256
dalli
257+
ddtrace
238258
delayed_job
239259
delayed_job_mongoid
240260
elasticsearch (~> 7.8.0)

config.ru

+1
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ use Mongoid::QueryCache::Middleware
2020

2121
require './app'
2222
run Sinatra::Application
23+

config/unicorn_tcp.rb

+9
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@
1010
timeout 25
1111
preload_app true
1212

13+
service_name = 'forum'
14+
15+
require 'ddtrace'
16+
# Add Datadog APM configuration
17+
Datadog.configure do |c|
18+
c.tracing.instrument :rails, service_name: service_name
19+
c.tracing.instrument :sinatra, service_name: service_name
20+
end
21+
1322
listen_host = ENV['LISTEN_HOST'] || '0.0.0.0'
1423
listen_port = ENV['LISTEN_PORT'] || '4567'
1524
listen "#{listen_host}:#{listen_port}", :tcp_nopush => true, :backlog => 512

0 commit comments

Comments
 (0)