@apolitical/server 3.0.1-3224.2 → 3.0.1-3224.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apolitical/server",
-  "version": "3.0.1-3224.2",
+  "version": "3.0.1-3224.4",
   "description": "Node.js module to encapsulate Apolitical's express server setup",
   "author": "Apolitical Group Limited <engineering@apolitical.co>",
   "license": "MIT",

package/src/helpers/otel.helper.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const { NodeSDK } = require('@opentelemetry/sdk-node');
+const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-grpc');
+const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node');
+const { resourceFromAttributes } = require('@opentelemetry/resources');
+const { ATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
+
+module.exports = () => {
+  console.log('Starting OpenTelemetry SDK...');
+  const sdk = new NodeSDK({
+    resource: resourceFromAttributes({
+      [ATTRS_SERVICE_NAME]: process.env.OTEL_SERVICE_NAME,
+    }),
+    traceExporter: new OTLPTraceExporter({ url: process.env.OTEL_EXPORTER_OTLP_ENDPOINT }),
+    instrumentations: [getNodeAutoInstrumentations()],
+  });
+  sdk.start();
+  console.log('OpenTelemetry SDK started');
+  return {};
+};

package/src/index.js

@@ -2,4 +2,7 @@
 
 const { resolve } = require('./container');
 
+// Must be loaded early
+resolve('otelLoader')();
+
 module.exports = resolve('serverService');

package/src/loaders/express.loader.js

@@ -3,7 +3,6 @@
 module.exports = ({
   documentationLoader,
   loggerLoader,
-  otelLoader,
   errorMiddleware,
   middlewaresLoader,
   probesLoader,
@@ -15,8 +14,6 @@ module.exports = ({
     if (opts.strictRouting) {
       app.enable('strict routing');
     }
-    // Load opentelemetry
-    otelLoader(opts);
     // Load probes
     probesLoader(app, opts);
     // Load useful middlewares

package/src/loaders/otel.loader.js

@@ -4,25 +4,21 @@ const { NodeSDK } = require('@opentelemetry/sdk-node');
 const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-grpc');
 const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node');
 const { resourceFromAttributes } = require('@opentelemetry/resources');
-const { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } = require('@opentelemetry/semantic-conventions');
+const { ATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
 
-module.exports = () => {
-  return async function load({ labels }) {
-    console.log('Starting OpenTelemetry SDK...');
+module.exports = ({ logger }) => {
+  return async function load() {
+    const serviceName = process.env.PROJECT_NAME;
+    const oltpEndpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT;
     const sdk = new NodeSDK({
       resource: resourceFromAttributes({
-        [ATTR_SERVICE_NAME]: labels.name,
-        [ATTR_SERVICE_VERSION]: labels.version,
+        [ATTRS_SERVICE_NAME]: serviceName,
       }),
-      traceExporter: new OTLPTraceExporter({ url: process.env.OTEL_EXPORTER_OTLP_ENDPOINT }),
+      traceExporter: new OTLPTraceExporter({ url: oltpEndpoint }),
       instrumentations: [getNodeAutoInstrumentations()],
     });
     sdk.start();
-    console.log(
-      'OpenTelemetry SDK started with labels:',
-      labels,
-      'and endpoint:',
-      process.env.OTEL_EXPORTER_OTLP_ENDPOINT,
-    );
+    const log = logger.where(__filename, 'load');
+    log.info(`OpenTelemetry SDK started with service name ${serviceName} and endpoint ${oltpEndpoint}`);
   };
 };