Skip to content

Repo sync #36023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 22, 2025
Merged

Repo sync #36023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f5ea00
fix MODA_PROD_SERVICE_ENV env to use boolean string in checks (#54043)
Ebonsignori Jan 22, 2025
03fa6cc
Merge pull request #54050 from github/repo-sync
docs-bot Jan 22, 2025
2f10744
Create engineer specific staging environment (#54006)
octosteve Jan 22, 2025
6c789b8
Revert "Create engineer specific staging environment" (#54052)
Ebonsignori Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/frame/middleware/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export default function (app: Express) {
}

// *** Observability ***
if (process.env.MODA_PROD_SERVICE_ENV) {
if (process.env.MODA_PROD_SERVICE_ENV === 'true') {
app.use(datadog)
}

Expand Down
2 changes: 1 addition & 1 deletion src/observability/lib/statsd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const {
DD_AGENT_HOST,
} = process.env

const mock = NODE_ENV === 'test' || !MODA_PROD_SERVICE_ENV
const mock = NODE_ENV === 'test' || MODA_PROD_SERVICE_ENV !== 'true'

// MODA_APP_NAME gets set when the deploy target is Moda
const modaApp = MODA_APP_NAME ? `moda_app_name:${MODA_APP_NAME}` : false
Expand Down
3 changes: 2 additions & 1 deletion src/observability/middleware/trigger-error.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ export default async function triggerError(
// pattern used on async middleware! This is an intentional omission!

// prevent this from being used in production
if (process.env.NODE_ENV === 'production' && process.env.MODA_PROD_SERVICE_ENV) return next()
if (process.env.NODE_ENV === 'production' && process.env.MODA_PROD_SERVICE_ENV === 'true')
return next()

throw new Error('Intentional error')
}