Skip to content
Permalink
Browse files

Merge train-131 into master

#7004
r=vbudhram,vladikoff
  • Loading branch information...
philbooth committed Feb 25, 2019
2 parents 8a4d10a + 4dc497c commit e6291a0458a4a2dd240a3cd29a00a65664d5c642
Showing with 112 additions and 122 deletions.
  1. +10 −0 CHANGELOG.md
  2. +1 −1 package.json
  3. +2 −1 server/lib/amplitude.js
  4. +99 −120 tests/server/amplitude.js
@@ -1,3 +1,13 @@
<a name="1.131.2"></a>
## [1.131.2](https://github.com/mozilla/fxa-content-server/compare/v1.131.1...v1.131.2) (2019-02-25)


### Bug Fixes

* **metrics:** update amplitude events to mozlog 2 format ([9867325](https://github.com/mozilla/fxa-content-server/commit/9867325))



<a name="1.131.1"></a>
## [1.131.1](https://github.com/mozilla/fxa-content-server/compare/v1.131.0...v1.131.1) (2019-02-20)

@@ -1,6 +1,6 @@
{
"name": "fxa-content-server",
"version": "1.131.1",
"version": "1.131.2",
"description": "Firefox Accounts Content Server",
"scripts": {
"build-production": "NODE_ENV=production grunt build",
@@ -15,6 +15,7 @@
'use strict';

const { GROUPS, initialize } = require('fxa-shared/metrics/amplitude');
const logger = require('./logging/log')();
const ua = require('./user-agent');

const SERVICES = require('./configuration').get('oauth_client_id_map');
@@ -151,7 +152,7 @@ function receiveEvent (event, request, data) {
);

if (amplitudeEvent) {
process.stderr.write(`${JSON.stringify(amplitudeEvent)}\n`);
logger.info('amplitudeEvent', amplitudeEvent);
}
}

Oops, something went wrong.

0 comments on commit e6291a0

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.