Merge pull request #11 from talis/ELE-3188-new-relic-logging-update

pogotc · web-flow · commit 25f12f0d07ec · 2020-02-21T12:45:52.000Z
ELE-3188 Make NewRelic work in addition to existing remote logging.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "app-logger-angular",
-    "version": "2.1.6",
+    "version": "2.1.7",
     "main": "./js/logging.js",
     "description": "Client side logging sent to the server",
     "repository": {
diff --git a/js/logging.js b/js/logging.js
@@ -49,7 +49,7 @@ loggingModule.factory(
                 $log.error.apply($log, arguments);
             }
 
-            if (LOGGING_CONFIG.LOGGING_TYPE === 'newrelic' && $window.NREUM && $window.NREUM.noticeError) {
+            if (LOGGING_CONFIG.FORWARD_TO_NEWRELIC && $window.NREUM && $window.NREUM.noticeError) {
                 $window.NREUM.noticeError(exception);
             }
 
@@ -139,6 +139,10 @@ loggingModule.factory(
                 }
             }
 
+            if (LOGGING_CONFIG.FORWARD_TO_NEWRELIC && $window.NREUM && $window.NREUM.noticeError) {
+                $window.NREUM.noticeError(message, {desc: desc});
+            }
+
             // check if the config says we should log to the remote, and also if a remote endpoint was specified
             if (LOGGING_CONFIG.LOGGING_TYPE === 'remote' && LOGGING_CONFIG.REMOTE_LOGGING_ENDPOINT) {
                 // send server side

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "app-logger-angular",`
`3`		`- "version": "2.1.6",`
	`3`	`+ "version": "2.1.7",`
`4`	`4`	`"main": "./js/logging.js",`
`5`	`5`	`"description": "Client side logging sent to the server",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ loggingModule.factory(`
`49`	`49`	`$log.error.apply($log, arguments);`
`50`	`50`	`}`
`51`	`51`
`52`		`- if (LOGGING_CONFIG.LOGGING_TYPE === 'newrelic' && $window.NREUM && $window.NREUM.noticeError) {`
	`52`	`+ if (LOGGING_CONFIG.FORWARD_TO_NEWRELIC && $window.NREUM && $window.NREUM.noticeError) {`
`53`	`53`	`$window.NREUM.noticeError(exception);`
`54`	`54`	`}`
`55`	`55`
`@@ -139,6 +139,10 @@ loggingModule.factory(`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`
	`142`	`+ if (LOGGING_CONFIG.FORWARD_TO_NEWRELIC && $window.NREUM && $window.NREUM.noticeError) {`
	`143`	`+ $window.NREUM.noticeError(message, {desc: desc});`
	`144`	`+ }`
	`145`	`+`
`142`	`146`	`// check if the config says we should log to the remote, and also if a remote endpoint was specified`
`143`	`147`	`if (LOGGING_CONFIG.LOGGING_TYPE === 'remote' && LOGGING_CONFIG.REMOTE_LOGGING_ENDPOINT) {`
`144`	`148`	`// send server side`