fix: use OTEL env vars for service name and namespace

kiva · Jan 10, 2024 · 21a27d2 · 21a27d2
1 parent 2af71b9
commit 21a27d2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/server/dev-server.js b/server/dev-server.js
@@ -3,7 +3,7 @@ require('../build/check-versions')();
 
 const { setupTracing } = require('./util/tracer');
 
-setupTracing('ui');
+setupTracing();
 
 // dependencies
 require('dotenv').config({ path: '/etc/kiva-ui-server/config.env' });

diff --git a/server/index.js b/server/index.js
@@ -3,7 +3,7 @@ require('dotenv').config({ path: '/etc/kiva-ui-server/config.env' });
 // eslint-disable-next-line import/order
 const { setupTracing } = require('./util/tracer');
 
-setupTracing('ui');
+setupTracing();
 
 const cluster = require('cluster');
 const http = require('http');

diff --git a/server/util/tracer.js b/server/util/tracer.js
@@ -44,12 +44,13 @@ function ignoreTheseSpans(spanName, spanKind, attributes) {
 	return spanKind !== opentelemetry.SpanKind.SERVER;
 }
 
-function setupTracing(serviceName) {
+function setupTracing() {
+	const serviceName = process.env?.OTEL_SERVICE_NAME || 'ui';
 	if (!otlpDisabled) {
 		const provider = new NodeTracerProvider({
 			resource: new Resource({
 				[SemanticResourceAttributes.SERVICE_NAME]: serviceName,
-				[SemanticResourceAttributes.SERVICE_NAMESPACE]: 'kiva',
+				[SemanticResourceAttributes.SERVICE_NAMESPACE]: process.env?.OTEL_SERVICE_NAMESPACE || 'kiva',
 			}),
 			sampler: filterSampler(ignoreTheseSpans, new AlwaysOnSampler()),
 		});