Merge branch 'main' into i1682-policy-update

.circleci/config.yml

@@ -6,7 +6,8 @@ commands:
       - run: cp Gemfile.lock Gemfile.lock.bak
       - restore_cache:
           key: &gem_key rails_template-cimg-{{ checksum "Gemfile.lock.bak" }}
-      - run: bundle install --path ./vendor/bundle
+      - run: bundle config set path './vendor/bundle'
+      - run: bundle config set --local without production
       - save_cache:
           key: *gem_key
           paths:

Gemfile

@@ -6,7 +6,6 @@ gem "aasm"
 gem "amazing_print"
 gem "aws-sdk-s3"
 gem "datacite-mapping"
-gem "ddtrace", require: "ddtrace/auto_instrument"
 gem "dogstatsd-ruby"
 gem "health-monitor-rails"
 gem "honeybadger"
@@ -103,5 +102,9 @@ group :test do
   gem "webmock"
 end
 
+group :staging, :production do
+  gem "ddtrace", require: "ddtrace/auto_instrument"
+end
+
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]

config/application.rb

@@ -4,9 +4,9 @@
 require "rails/all"
 require_relative "lando_env"
 
-# Require the gems listed in Gemfile, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(*Rails.groups)
+# Require the gems listed in Gemfile,  but only the default ones
+# and those for the environment rails is running in.
+Bundler.require(:default, Rails.env)
 
 module PdcDescribe
   class Application < Rails::Application