edited open telemetry js and test file

Author: larnelleankunda

packages/pwa-kit-react-sdk/src/utils/opentelemetry.js

@@ -19,8 +19,6 @@ export const OTEL_CONFIG = {
 
 export const getServiceName = () => OTEL_CONFIG.serviceName
 
-const SERVICE_NAME = OTEL_CONFIG.serviceName
-
 const logSpanData = (span, event = 'start', res = null) => {
     const spanContext = span.spanContext()
     const startTime = span.startTime
@@ -37,7 +35,7 @@ const logSpanData = (span, event = 'start', res = null) => {
         timestamp: hrTimeToTimeStamp(startTime),
         duration: duration,
         attributes: {
-            'service.name': SERVICE_NAME,
+            'service.name': getServiceName(),
             ...span.attributes,
             event: event // Add event type to distinguish start/end
         },
@@ -77,10 +75,7 @@ const logSpanData = (span, event = 'start', res = null) => {
  */
 export const createSpan = (name, options = {}) => {
     try {
-        const tracer = trace.getTracer(SERVICE_NAME)
-        // Get the current context and active span
-        const ctx = context.active()
-        // Note: currentSpan is not used in this implementation
+        const tracer = trace.getTracer(getServiceName())
 
         // Create a new span with the current context
         const span = tracer.startSpan(
@@ -89,15 +84,15 @@ export const createSpan = (name, options = {}) => {
                 ...options,
                 attributes: {
                     ...options.attributes,
-                    'service.name': SERVICE_NAME
+                    'service.name': getServiceName()
                 }
             },
-            ctx
+            context.active()
         )
 
         // Set the new span as active
         logSpanData(span, 'start')
-        return trace.setSpan(ctx, span)
+        return trace.setSpan(context.active(), span)
     } catch (error) {
         logger.error('Failed to create span', {
             namespace: 'opentelemetry',
@@ -118,7 +113,7 @@ export const createSpan = (name, options = {}) => {
  */
 export const createChildSpan = (name, attributes = {}) => {
     try {
-        const tracer = trace.getTracer(SERVICE_NAME)
+        const tracer = trace.getTracer(getServiceName())
         const ctx = context.active()
         const parentSpan = trace.getSpan(ctx)
 
@@ -130,7 +125,7 @@ export const createChildSpan = (name, attributes = {}) => {
         const {performance_mark, performance_detail, ...otherAttributes} = attributes
 
         const spanAttributes = {
-            'service.name': SERVICE_NAME,
+            'service.name': getServiceName(),
             ...otherAttributes
         }
 
@@ -176,9 +171,6 @@ export const endSpan = (span) => {
     }
 
     try {
-        const ctx = context.active()
-        // Note: parentSpan is not used in this implementation
-
         span.end()
 
         // Log completion data
@@ -202,11 +194,11 @@ export const endSpan = (span) => {
  * @returns {Promise<any>} The result of the function
  */
 export const tracePerformance = async (name, fn, res = null) => {
-    const tracer = trace.getTracer(SERVICE_NAME)
+    const tracer = trace.getTracer(getServiceName())
     // Create the root span
     const rootSpan = tracer.startSpan(name, {
         attributes: {
-            'service.name': SERVICE_NAME
+            'service.name': getServiceName()
         }
     })
 
@@ -254,7 +246,7 @@ export const tracePerformance = async (name, fn, res = null) => {
  */
 export const logPerformanceMetric = (name, duration, attributes = {}) => {
     try {
-        const tracer = trace.getTracer(SERVICE_NAME)
+        const tracer = trace.getTracer(getServiceName())
         const ctx = context.active()
         const parentSpan = trace.getSpan(ctx)
 
@@ -271,7 +263,7 @@ export const logPerformanceMetric = (name, duration, attributes = {}) => {
 
         // Build metric attributes
         const metricAttributes = {
-            'service.name': SERVICE_NAME,
+            'service.name': getServiceName(),
             'metric.duration': duration,
             ...otherAttributes
         }

packages/pwa-kit-react-sdk/src/utils/opentelemetry.test.js

@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: BSD-3-Clause
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-/*
- * Copyright (c) 2025, Salesforce, Inc.
- * All rights reserved.
- * SPDX-License-Identifier: BSD-3-Clause
- * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
 
 // Mock OpenTelemetry dependencies
 jest.mock('@opentelemetry/api', () => ({