fix(metrics): remove specific timestamp from log

Because:
* Our timestamps are being recorded as from `1970-01-01` for some reason but only from the content server.  We hypothesize the downstream mozlog is failing to convert this timestamp properly.  Since content server is the only server that is specifying a timestamp we think if we remove it things might start working for free.  Let's find out!

This commit:

* removes the timestamp

Closes FXA-6472
This commit is contained in:
Wil Clouser 2022-12-19 13:19:06 -08:00
Родитель 37f5f7d4ea
Коммит 8dc914ee15
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: DB61495C4A403229
2 изменённых файлов: 7 добавлений и 30 удалений

Просмотреть файл

@ -187,7 +187,6 @@ function logFlowEvent(event, data, request) {
op: 'flowEvent', op: 'flowEvent',
pid: process.pid, pid: process.pid,
region: location && location.state, region: location && location.state,
time: new Date(event.time).toISOString(),
userAgent: request.headers['user-agent'], userAgent: request.headers['user-agent'],
v: VERSION, v: VERSION,
}, },

Просмотреть файл

@ -165,7 +165,6 @@ registerSuite('flow-event', {
pid: process.pid, pid: process.pid,
region: 'California', region: 'California',
service: '1234567890abcdef', service: '1234567890abcdef',
time: new Date(mocks.time - 1000).toISOString(),
userAgent: mocks.request.headers['user-agent'], userAgent: mocks.request.headers['user-agent'],
utm_campaign: '.-Mock%20utm_campaign', utm_campaign: '.-Mock%20utm_campaign',
utm_content: '.-Mock%20utm_content', utm_content: '.-Mock%20utm_content',
@ -178,41 +177,33 @@ registerSuite('flow-event', {
'second call to process.stderr.write was correct': () => { 'second call to process.stderr.write was correct': () => {
const arg = JSON.parse(process.stderr.write.args[1][0]); const arg = JSON.parse(process.stderr.write.args[1][0]);
assert.lengthOf(Object.keys(arg), 19); assert.lengthOf(Object.keys(arg), 18);
assert.equal(arg.event, 'flow.signup.view'); assert.equal(arg.event, 'flow.signup.view');
assert.equal(arg.flow_time, 5); assert.equal(arg.flow_time, 5);
assert.equal(arg.time, new Date(mocks.time - 995).toISOString());
}, },
'third call to process.stderr.write was correct': () => { 'third call to process.stderr.write was correct': () => {
const arg = JSON.parse(process.stderr.write.args[2][0]); const arg = JSON.parse(process.stderr.write.args[2][0]);
assert.lengthOf(Object.keys(arg), 19); assert.lengthOf(Object.keys(arg), 18);
assert.equal(arg.event, 'flow.signup.good-offset-now'); assert.equal(arg.event, 'flow.signup.good-offset-now');
assert.equal(arg.time, new Date(mocks.time).toISOString());
}, },
'fourth call to process.stderr.write was correct': () => { 'fourth call to process.stderr.write was correct': () => {
const arg = JSON.parse(process.stderr.write.args[3][0]); const arg = JSON.parse(process.stderr.write.args[3][0]);
assert.lengthOf(Object.keys(arg), 19); assert.lengthOf(Object.keys(arg), 18);
assert.equal(arg.event, 'flow.signup.good-offset-oldest'); assert.equal(arg.event, 'flow.signup.good-offset-oldest');
assert.equal(
arg.time,
new Date(mocks.time - config.flow_id_expiry).toISOString()
);
}, },
'fifth call to process.stderr.write was correct': () => { 'fifth call to process.stderr.write was correct': () => {
const arg = JSON.parse(process.stderr.write.args[4][0]); const arg = JSON.parse(process.stderr.write.args[4][0]);
assert.equal(arg.event, 'flow.timing.foo'); assert.equal(arg.event, 'flow.timing.foo');
assert.equal(arg.flow_time, 1); assert.equal(arg.flow_time, 1);
assert.equal(arg.time, new Date(mocks.time - 500).toISOString());
}, },
'sixth call to process.stderr.write was correct': () => { 'sixth call to process.stderr.write was correct': () => {
const arg = JSON.parse(process.stderr.write.args[5][0]); const arg = JSON.parse(process.stderr.write.args[5][0]);
assert.equal(arg.event, 'flow.timing.bar.baz'); assert.equal(arg.event, 'flow.timing.bar.baz');
assert.equal(arg.flow_time, 2); assert.equal(arg.flow_time, 2);
assert.equal(arg.time, new Date(mocks.time - 500).toISOString());
}, },
'amplitude was called seven times': () => { 'amplitude was called seven times': () => {
@ -310,37 +301,24 @@ registerSuite('flow-event', {
'first call to process.stderr.write was correct': () => { 'first call to process.stderr.write was correct': () => {
const arg = JSON.parse(process.stderr.write.args[0][0]); const arg = JSON.parse(process.stderr.write.args[0][0]);
assert.equal(arg.event, 'flow.performance.signup'); assert.equal(arg.event, 'flow.performance.signup');
assert.equal(arg.time, new Date(mocks.time).toISOString());
assert.equal(arg.flow_time, 2000); assert.equal(arg.flow_time, 2000);
}, },
'second call to process.stderr.write was correct': () => { 'second call to process.stderr.write was correct': () => {
const arg = JSON.parse(process.stderr.write.args[1][0]); const arg = JSON.parse(process.stderr.write.args[1][0]);
assert.equal(arg.event, 'flow.performance.signup.network'); assert.equal(arg.event, 'flow.performance.signup.network');
assert.equal(
arg.time,
new Date(mocks.time - 2000 + 300).toISOString()
);
assert.equal(arg.flow_time, 300); assert.equal(arg.flow_time, 300);
}, },
'third call to process.stderr.write was correct': () => { 'third call to process.stderr.write was correct': () => {
const arg = JSON.parse(process.stderr.write.args[2][0]); const arg = JSON.parse(process.stderr.write.args[2][0]);
assert.equal(arg.event, 'flow.performance.signup.server'); assert.equal(arg.event, 'flow.performance.signup.server');
assert.equal(
arg.time,
new Date(mocks.time - 2000 + 100).toISOString()
);
assert.equal(arg.flow_time, 100); assert.equal(arg.flow_time, 100);
}, },
'fourth call to process.stderr.write was correct': () => { 'fourth call to process.stderr.write was correct': () => {
const arg = JSON.parse(process.stderr.write.args[3][0]); const arg = JSON.parse(process.stderr.write.args[3][0]);
assert.equal(arg.event, 'flow.performance.signup.client'); assert.equal(arg.event, 'flow.performance.signup.client');
assert.equal(
arg.time,
new Date(mocks.time - 2000 + 200).toISOString()
);
assert.equal(arg.flow_time, 200); assert.equal(arg.flow_time, 200);
}, },
@ -959,7 +937,7 @@ registerSuite('flow-event', {
'process.stderr.write was called correctly': () => { 'process.stderr.write was called correctly': () => {
assert.equal(process.stderr.write.callCount, 1); assert.equal(process.stderr.write.callCount, 1);
const arg = JSON.parse(process.stderr.write.args[0][0]); const arg = JSON.parse(process.stderr.write.args[0][0]);
assert.lengthOf(Object.keys(arg), 18); assert.lengthOf(Object.keys(arg), 17);
assert.isUndefined(arg.utm_campaign); //eslint-disable-line camelcase assert.isUndefined(arg.utm_campaign); //eslint-disable-line camelcase
}, },
}, },
@ -979,7 +957,7 @@ registerSuite('flow-event', {
'process.stderr.write was called correctly': () => { 'process.stderr.write was called correctly': () => {
assert.equal(process.stderr.write.callCount, 1); assert.equal(process.stderr.write.callCount, 1);
const arg = JSON.parse(process.stderr.write.args[0][0]); const arg = JSON.parse(process.stderr.write.args[0][0]);
assert.lengthOf(Object.keys(arg), 18); assert.lengthOf(Object.keys(arg), 17);
assert.isUndefined(arg.utm_content); //eslint-disable-line camelcase assert.isUndefined(arg.utm_content); //eslint-disable-line camelcase
}, },
}, },
@ -999,7 +977,7 @@ registerSuite('flow-event', {
'process.stderr.write was called correctly': () => { 'process.stderr.write was called correctly': () => {
assert.equal(process.stderr.write.callCount, 1); assert.equal(process.stderr.write.callCount, 1);
const arg = JSON.parse(process.stderr.write.args[0][0]); const arg = JSON.parse(process.stderr.write.args[0][0]);
assert.lengthOf(Object.keys(arg), 18); assert.lengthOf(Object.keys(arg), 17);
assert.isUndefined(arg.utm_medium); //eslint-disable-line camelcase assert.isUndefined(arg.utm_medium); //eslint-disable-line camelcase
}, },
}, },
@ -1019,7 +997,7 @@ registerSuite('flow-event', {
'process.stderr.write was called correctly': () => { 'process.stderr.write was called correctly': () => {
assert.equal(process.stderr.write.callCount, 1); assert.equal(process.stderr.write.callCount, 1);
const arg = JSON.parse(process.stderr.write.args[0][0]); const arg = JSON.parse(process.stderr.write.args[0][0]);
assert.lengthOf(Object.keys(arg), 18); assert.lengthOf(Object.keys(arg), 17);
assert.isUndefined(arg.utm_source); //eslint-disable-line camelcase assert.isUndefined(arg.utm_source); //eslint-disable-line camelcase
}, },
}, },