fix: possible "elasticApm.isStarted is not a function" crash (#61)

trentm · web-flow · commit 839d6575a46c · 2021-03-16T13:24:03.000-07:00
Fixes: #60
diff --git a/loggers/morgan/CHANGELOG.md b/loggers/morgan/CHANGELOG.md
@@ -1,5 +1,10 @@
 # @elastic/ecs-morgan-format Changelog
 
+## Unreleased
+
+- Fix "elasticApm.isStarted is not a function" crash on startup.
+  ([#60](https://github.com/elastic/ecs-logging-nodejs/issues/60))
+
 ## v1.0.0
 
 - Update to @elastic/ecs-helpers@1.0.0: ecs.version is now "1.6.0",
diff --git a/loggers/morgan/index.js b/loggers/morgan/index.js
@@ -43,7 +43,7 @@ function ecsFormat (format = morgan.combined) {
   }
 
   // If there is a *started* APM agent, then use it.
-  const apm = elasticApm && elasticApm.isStarted() ? elasticApm : null
+  const apm = elasticApm && elasticApm.isStarted && elasticApm.isStarted() ? elasticApm : null
   let serviceField
   let eventField
   if (apm) {
diff --git a/loggers/pino/CHANGELOG.md b/loggers/pino/CHANGELOG.md
@@ -1,5 +1,10 @@
 # @elastic/ecs-pino-format Changelog
 
+## Unreleased
+
+- Fix "elasticApm.isStarted is not a function" crash on startup.
+  ([#60](https://github.com/elastic/ecs-logging-nodejs/issues/60))
+
 ## v1.0.0
 
 - Update to @elastic/ecs-helpers@1.0.0: ecs.version is now "1.6.0",
diff --git a/loggers/pino/index.js b/loggers/pino/index.js
@@ -52,7 +52,7 @@ function createEcsPinoOptions (opts) {
   }
 
   // If there is a *started* APM agent, then use it.
-  const apm = elasticApm && elasticApm.isStarted() ? elasticApm : null
+  const apm = elasticApm && elasticApm.isStarted && elasticApm.isStarted() ? elasticApm : null
 
   const ecsPinoOptions = {
     formatters: {
diff --git a/loggers/winston/CHANGELOG.md b/loggers/winston/CHANGELOG.md
@@ -1,5 +1,10 @@
 # @elastic/ecs-winston-format Changelog
 
+## Unreleased
+
+- Fix "elasticApm.isStarted is not a function" crash on startup.
+  ([#60](https://github.com/elastic/ecs-logging-nodejs/issues/60))
+
 ## v1.0.0
 
 - Update to @elastic/ecs-helpers@1.0.0: ecs.version is now "1.6.0",
diff --git a/loggers/winston/index.js b/loggers/winston/index.js
@@ -79,7 +79,7 @@ function ecsTransform (info, opts) {
   }
 
   // If there is a *started* APM agent, then use it.
-  const apm = elasticApm && elasticApm.isStarted() ? elasticApm : null
+  const apm = elasticApm && elasticApm.isStarted && elasticApm.isStarted() ? elasticApm : null
 
   // istanbul ignore else
   if (apm) {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ function ecsFormat (format = morgan.combined) {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`// If there is a started APM agent, then use it.`
`46`		`- const apm = elasticApm && elasticApm.isStarted() ? elasticApm : null`
	`46`	`+ const apm = elasticApm && elasticApm.isStarted && elasticApm.isStarted() ? elasticApm : null`
`47`	`47`	`let serviceField`
`48`	`48`	`let eventField`
`49`	`49`	`if (apm) {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ function createEcsPinoOptions (opts) {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`// If there is a started APM agent, then use it.`
`55`		`- const apm = elasticApm && elasticApm.isStarted() ? elasticApm : null`
	`55`	`+ const apm = elasticApm && elasticApm.isStarted && elasticApm.isStarted() ? elasticApm : null`
`56`	`56`
`57`	`57`	`const ecsPinoOptions = {`
`58`	`58`	`formatters: {`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ function ecsTransform (info, opts) {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`// If there is a started APM agent, then use it.`
`82`		`- const apm = elasticApm && elasticApm.isStarted() ? elasticApm : null`
	`82`	`+ const apm = elasticApm && elasticApm.isStarted && elasticApm.isStarted() ? elasticApm : null`
`83`	`83`
`84`	`84`	`// istanbul ignore else`
`85`	`85`	`if (apm) {`