fix: re-enable apm in meteor

uses a fork of `meteor-elastic-apm` until the PR is merged upstream. Meteor-Community-Packages/meteor-elastic-apm#77
nrkno · Feb 20, 2023 · 2f79e7e · 2f79e7e
1 parent 757a183
commit 2f79e7e
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 63 deletions.
diff --git a/meteor/.meteor/packages b/meteor/.meteor/packages
@@ -33,4 +33,4 @@ meteorhacks:picker
 ostrio:meteor-root
 [email protected]
 
-# kschingiz:meteor-elastic-apm
+julusian:meteor-elastic-apm@2.5.2
diff --git a/meteor/.meteor/versions b/meteor/.meteor/versions
@@ -34,6 +34,8 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
+julusian:[email protected]
+kschingiz:[email protected]
 [email protected]
 [email protected]
 [email protected]

diff --git a/meteor/__mocks__/_setupMocks.ts b/meteor/__mocks__/_setupMocks.ts
@@ -25,9 +25,9 @@ jest.mock('meteor/reactive-var', (...args) => require('./reactive-var').setup(ar
 
 jest.mock('meteor/meteorhacks:picker', (...args) => require('./meteorhacks-picker').setup(args), { virtual: true })
 jest.mock('meteor/mdg:validated-method', (...args) => require('./validated-method').setup(args), { virtual: true })
-// jest.mock('meteor/kschingiz:meteor-elastic-apm', (...args) => require('./meteor-elastic-apm').setup(args), {
-// 	virtual: true,
-// })
+jest.mock('meteor/julusian:meteor-elastic-apm', (...args) => require('./meteor-elastic-apm').setup(args), {
+	virtual: true,
+})
 
 jest.mock('meteor/mongo', (...args) => require('./mongo').setup(args), { virtual: true })
 

diff --git a/meteor/server/api/profiler.ts b/meteor/server/api/profiler.ts
@@ -1,27 +1,4 @@
-/*
-	Note: meteor-elastic-apm has been temporarily disabled due to being incompatible Meteor 2.3
-	See https://github.com/Meteor-Community-Packages/meteor-elastic-apm/pull/61
-	So instead I've just added a temporary black-hole replacement for now /Johan Nyman 2022-01-18
-*/
-type StartSpan = (name: string) => undefined | { end: Function; addLabels: Function }
-type StartTransaction = (
-	description: string,
-	name: string
-) => undefined | { end: Function; addLabels: Function; startSpan: StartSpan }
-
-const Agent: {
-	startSpan: StartSpan
-	startTransaction: StartTransaction
-} = {
-	startSpan: (_name: string) => {
-		return undefined
-	},
-	startTransaction: (_descr: string, _name: string) => {
-		return undefined
-	},
-}
-
-// import Agent from 'meteor/kschingiz:meteor-elastic-apm'
+import Agent from 'meteor/julusian:meteor-elastic-apm'
 
 class Profiler {
 	private active: boolean = false

diff --git a/meteor/server/coreSystem/index.ts b/meteor/server/coreSystem/index.ts
@@ -16,8 +16,8 @@ import { Studios } from '../../lib/collections/Studios'
 import { getEnvLogLevel, logger, LogLevel, setLogLevel } from '../logging'
 import { ShowStyleVariants } from '../../lib/collections/ShowStyleVariants'
 const PackageInfo = require('../../package.json')
-// import Agent from 'meteor/kschingiz:meteor-elastic-apm'
-// import { profiler } from './api/profiler'
+import Agent from 'meteor/julusian:meteor-elastic-apm'
+import { profiler } from '../api/profiler'
 import { TMP_TSR_VERSION } from '@sofie-automation/blueprints-integration'
 import { getAbsolutePath } from '../lib'
 import * as fs from 'fs/promises'
@@ -193,33 +193,29 @@ function startInstrumenting() {
 	}
 
 	// attempt init elastic APM
-
-	// Note: meteor-elastic-apm has been temporarily disabled due to being incompatible Meteor 2.3
-	// See https://github.com/Meteor-Community-Packages/meteor-elastic-apm/pull/61
-	//
-	// const system = getCoreSystem()
-	// const { APM_HOST, APM_SECRET, KIBANA_INDEX, APP_HOST } = process.env
-
-	// if (APM_HOST && system && system.apm) {
-	// 	logger.info(`APM agent starting up`)
-	// 	Agent.start({
-	// 		serviceName: KIBANA_INDEX || 'tv-automation-server-core',
-	// 		hostname: APP_HOST,
-	// 		serverUrl: APM_HOST,
-	// 		secretToken: APM_SECRET,
-	// 		active: system.apm.enabled,
-	// 		transactionSampleRate: system.apm.transactionSampleRate,
-	// 		disableMeteorInstrumentations: ['methods', 'http-out', 'session', 'async', 'metrics'],
-	// 	})
-	// 	profiler.setActive(system.apm.enabled || false)
-	// } else {
-	// 	logger.info(`APM agent inactive`)
-	// 	Agent.start({
-	// 		serviceName: 'tv-automation-server-core',
-	// 		active: false,
-	// 		disableMeteorInstrumentations: ['methods', 'http-out', 'session', 'async', 'metrics'],
-	// 	})
-	// }
+	const system = getCoreSystem()
+	const { APM_HOST, APM_SECRET, KIBANA_INDEX, APP_HOST } = process.env
+
+	if (APM_HOST && system && system.apm) {
+		logger.info(`APM agent starting up`)
+		Agent.start({
+			serviceName: KIBANA_INDEX || 'tv-automation-server-core',
+			hostname: APP_HOST,
+			serverUrl: APM_HOST,
+			secretToken: APM_SECRET,
+			active: system.apm.enabled,
+			transactionSampleRate: system.apm.transactionSampleRate,
+			disableMeteorInstrumentations: ['methods', 'http-out', 'session', 'async', 'metrics'],
+		})
+		profiler.setActive(system.apm.enabled || false)
+	} else {
+		logger.info(`APM agent inactive`)
+		Agent.start({
+			serviceName: 'tv-automation-server-core',
+			active: false,
+			disableMeteorInstrumentations: ['methods', 'http-out', 'session', 'async', 'metrics'],
+		})
+	}
 }
 function updateLoggerLevel(startup: boolean) {
 	if (Meteor.isTest) return // ignore this when running in tests

diff --git a/meteor/server/typings/meteor-kschingiz-elastic-apm.d.ts b/meteor/server/typings/meteor-kschingiz-elastic-apm.d.ts
@@ -3,11 +3,7 @@
  * As they do not export any of the inner types, adding `disableMeteorInstrumentations` to `AgentConfigOptions` is not trivial without just copying it all
  */
 
-/*
-Note: meteor-elastic-apm has been temporarily disabled due to being incompatible Meteor 2.3
-See https://github.com/Meteor-Community-Packages/meteor-elastic-apm/pull/61
-
-declare module 'meteor/kschingiz:meteor-elastic-apm' {
+declare module 'meteor/julusian:meteor-elastic-apm' {
 	/// <reference types="node" />
 
 	import { IncomingMessage, ServerResponse } from 'http'
@@ -357,4 +353,3 @@ declare module 'meteor/kschingiz:meteor-elastic-apm' {
 		type ErrorHandleFunction = (err: any, req: IncomingMessage, res: ServerResponse, next: NextFunction) => void
 	}
 }
-*/