зеркало из https://github.com/mozilla/fxa.git
task(customs): Add tracing to customs server
Because: - We want to see traces This Commit: - Adds tracing to the customs server
This commit is contained in:
Родитель
57844ad5eb
Коммит
24ece51ea9
|
@ -4,10 +4,14 @@
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
const server = require('../lib/server');
|
|
||||||
const config = require('../lib/config').getProperties();
|
const config = require('../lib/config').getProperties();
|
||||||
const log = require('../lib/log')(config.log.level, 'customs-server');
|
const log = require('../lib/log')(config.log.level, 'customs-server');
|
||||||
|
|
||||||
|
// Tracing must be initialized asap
|
||||||
|
require('fxa-shared/tracing/node-tracing').init(config.tracing, log);
|
||||||
|
|
||||||
|
const server = require('../lib/server');
|
||||||
|
|
||||||
log.info({ op: 'config', config: config });
|
log.info({ op: 'config', config: config });
|
||||||
|
|
||||||
function shutdown(code) {
|
function shutdown(code) {
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
const { tracingConfig } = require('fxa-shared/tracing/config');
|
||||||
|
|
||||||
module.exports = function (fs, path, url, convict) {
|
module.exports = function (fs, path, url, convict) {
|
||||||
var conf = convict({
|
var conf = convict({
|
||||||
env: {
|
env: {
|
||||||
|
@ -325,6 +327,7 @@ module.exports = function (fs, path, url, convict) {
|
||||||
env: 'SENTRY_SERVER_NAME',
|
env: 'SENTRY_SERVER_NAME',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
tracing: tracingConfig,
|
||||||
userDefinedRateLimitRules: {
|
userDefinedRateLimitRules: {
|
||||||
totpCodeRules: {
|
totpCodeRules: {
|
||||||
actions: {
|
actions: {
|
||||||
|
|
|
@ -19,6 +19,7 @@ module.exports = {
|
||||||
PATH,
|
PATH,
|
||||||
SENTRY_ENV: 'local',
|
SENTRY_ENV: 'local',
|
||||||
SENTRY_DSN: process.env.SENTRY_DSN_CUSTOMS,
|
SENTRY_DSN: process.env.SENTRY_DSN_CUSTOMS,
|
||||||
|
TRACING_SERVICE_NAME: 'fxa-customs-server',
|
||||||
},
|
},
|
||||||
filter_env: ['npm_'],
|
filter_env: ['npm_'],
|
||||||
watch: ['bin', 'lib'],
|
watch: ['bin', 'lib'],
|
||||||
|
|
Загрузка…
Ссылка в новой задаче