coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: Init dd trace sooner, closes #2528

Browse Source
This commit is contained in:
Tom Moor
2021-09-02 23:22:31 -07:00
parent 47953b3354
commit c709e54738
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/index.js
View File

@ -1,5 +1,7 @@
// @flow // @flow
import env from "./env"; // eslint-disable-line import/order import env from "./env"; // eslint-disable-line import/order
import "./tracing"; // must come before importing any instrumented module
import http from "http"; import http from "http";
import debug from "debug"; import debug from "debug";
import Koa from "koa"; import Koa from "koa";
@ -12,12 +14,10 @@ import stoppable from "stoppable";
import throng from "throng"; import throng from "throng";
import "./sentry"; import "./sentry";
import services from "./services"; import services from "./services";
import { initTracing } from "./tracing";
import { checkEnv, checkMigrations } from "./utils/startup"; import { checkEnv, checkMigrations } from "./utils/startup";
import { checkUpdates } from "./utils/updates"; import { checkUpdates } from "./utils/updates";
checkEnv(); checkEnv();
initTracing();
checkMigrations(); checkMigrations();
// If a services flag is passed it takes priority over the enviroment variable // If a services flag is passed it takes priority over the enviroment variable

18
server/tracing.js
View File

@ -1,13 +1,11 @@
// @flow // @flow
export function initTracing() { // If the DataDog agent is installed and the DD_API_KEY environment variable is
// If the DataDog agent is installed and the DD_API_KEY environment variable is // in the environment then we can safely attempt to start the DD tracer
// in the environment then we can safely attempt to start the DD tracer if (process.env.DD_API_KEY) {
if (process.env.DD_API_KEY) { require("dd-trace").init({
require("dd-trace").init({ // SOURCE_COMMIT is used by Docker Hub
// SOURCE_COMMIT is used by Docker Hub // SOURCE_VERSION is used by Heroku
// SOURCE_VERSION is used by Heroku version: process.env.SOURCE_COMMIT || process.env.SOURCE_VERSION,
version: process.env.SOURCE_COMMIT || process.env.SOURCE_VERSION, });
});
}
} }