Skip to content
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
342 changes: 220 additions & 122 deletions docker-compose.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion services/ads/python/ads.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from bootstrap import create_app
from models import Advertisement, db

from ddtrace import patch; patch(logging=True)
from ddtrace import patch; patch(logging=True)
import logging
from ddtrace import tracer
import json_log_formatter
Expand Down
2 changes: 1 addition & 1 deletion services/backend/config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
config.lograge.formatter = Lograge::Formatters::Json.new

## Enable log coloration
config.colorize_logging = true
config.colorize_logging = false

# Log to a dedicated file
config.lograge.logger = ActiveSupport::Logger.new(STDOUT)
Expand Down
8 changes: 5 additions & 3 deletions services/backend/config/initializers/datadog-tracer.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Datadog.configure do |c|
c.env = ENV['DD_ENV'] || 'development'
c.service = ENV['DD_SERVICE'] || 'store-backend'
c.tracing.sampling.default_rate = 1.0
c.profiling.enabled = true
# Activates and configures an integration
c.tracing.instrument :pg, service_name: 'postgres'
c.tracing.instrument :aws, service_name: 'store-backend-aws'
c.tracing.instrument :dalli, service_name: 'store-backend-memcached'
c.tracing.instrument :active_support, cache_service: 'store-backend-cache'
end
Loading