diff --git a/.gitignore b/.gitignore index 046b2a376..b2172861a 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,16 @@ yarn-debug.log* app/javascript/storybook-static/ yarn-error.log +# Ignore yarn related files +.pnp.* +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions +.yarn/install-state.gz + # Ignore package-lock.json because we use yarn package-lock.json diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz deleted file mode 100644 index cbb245a4c..000000000 Binary files a/.yarn/install-state.gz and /dev/null differ diff --git a/config/initializers/datadog.rb b/config/initializers/datadog.rb index aabd9550b..c5345177d 100644 --- a/config/initializers/datadog.rb +++ b/config/initializers/datadog.rb @@ -2,6 +2,7 @@ Datadog.configure do |c| c.env = Rails.env c.tracing.enabled = ENV["DD_API_KEY"].present? c.tracing.partial_flush.enabled = true + c.diagnostics.startup_logs.enabled = Rails.env.production? c.tracing.log_injection = Rails.env.production? service_name = ENV.fetch("DD_SERVICE") { "rails-#{Rails.env}" } @@ -26,7 +27,7 @@ Datadog.configure do |c| # enable it only when needed. if ENV["DD_ENABLE_REDIS_SIDEKIQ"] == "true" c.tracing.instrument :redis, service_name: "#{service_name}-redis-sidekiq", - describes: { url: ENV.fetch("REDIS_SIDEKIQ_URL", nil) } + describes: { url: ENV.fetch("REDIS_SIDEKIQ_URL", nil) } end # Generic REDIS_URL comes last, allowing it to overwrite any of the # above when multiple Redis use cases are backed by the same Redis URL.