update for apm rum agent

mjj203 · Dec 9, 2022 · f67c472 · f67c472
1 parent cd3eb59
commit f67c472
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -40,8 +40,6 @@
     "request": "2.88.2",
     "sharp": "0.31.2",
     "tileserver-gl-styles": "2.0.0",
-    "elastic-apm-node": "3.40.1",
-    "@elastic/apm-rum": "5.12.0",
     "sanitize-filename": "1.6.3"
   },
   "devDependencies": {

diff --git a/public/templates/data.tmpl b/public/templates/data.tmpl
@@ -27,6 +27,16 @@
     #map { position:absolute; top:0; bottom:0; width:100%; }
   </style>
   {{/is_vector}}
+  <script src="/elastic-apm-rum.umd.min.js" ></script>
+  <script>
+    elasticApm.init({
+          serviceName: 'RBT-TileserverGL',
+          serverUrl: 'http://10.232.234.20:8200',
+          serviceVersion: '5.2.0',
+          logLevel: 'info',
+          breakdownMetrics: 'true'
+   })
+  </script>
 </head>
 <body>
   {{#is_vector}}

diff --git a/public/templates/index.tmpl b/public/templates/index.tmpl
@@ -14,6 +14,16 @@
       return false;
     }
   </script>
+  <script src="/elastic-apm-rum.umd.min.js" ></script>
+  <script>
+    elasticApm.init({
+          serviceName: 'RBT-TileserverGL',
+          serverUrl: 'http://10.232.234.20:8200',
+          serviceVersion: '5.2.0',
+          logLevel: 'info',
+          breakdownMetrics: 'true'
+   })
+  </script>
 </head>
 <body>
   <section>
@@ -109,4 +119,4 @@
     </p>
   </footer>
 </body>
-</html>
+</html>
diff --git a/public/templates/viewer.tmpl b/public/templates/viewer.tmpl
@@ -16,6 +16,16 @@
     body { margin:0; padding:0; }
     #map { position:absolute; top:0; bottom:0; width:100%; }
   </style>
+  <script src="/elastic-apm-rum.umd.min.js" ></script>
+  <script>
+    elasticApm.init({
+          serviceName: 'RBT-TileserverGL',
+          serverUrl: 'http://10.232.234.20:8200',
+          serviceVersion: '5.2.0',
+          logLevel: 'info',
+          breakdownMetrics: 'true'
+   })
+  </script>
 </head>
 <body>
   <h1 style="display:none;">{{name}}</h1>

diff --git a/src/main.js b/src/main.js
@@ -1,25 +1,6 @@
 #!/usr/bin/env node
 
 'use strict';
-const apmUrl = process.env.APM_URL
-import { init as initApm } from '@elastic/apm-rum'
-const rum = initApm({
-  serviceName: 'RBT-TileserverGL',
-  serverUrl: '${apmUrl}',
-  serviceVersion: '5.2.0',
-  breakdownMetrics: true,
-  logLevel: 'debug'
-})
-import elasticapm from 'elastic-apm-node';
-const apm = elasticapm.start({
-  serviceName: 'RBT-TileserverGL',
-  serverUrl: '${apmUrl}',
-  serviceVersion: '5.2.0',
-  captureBody: 'all',
-  errorOnAbortedRequests: true,
-  logLevel: 'debug',
-  logUncaughtExceptions: true
-})
 import fs from 'node:fs';
 import path from 'path';
 import { fileURLToPath } from 'url';

diff --git a/src/server.js b/src/server.js
@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+
 'use strict';
 
 import os from 'os';