From 03054ea442813d1bb4380c9e7365c04fd4a26f2f Mon Sep 17 00:00:00 2001
From: Jan Calanog <jan.calanog@elastic.co>
Date: Wed, 26 Nov 2025 22:14:33 +0100
Subject: [PATCH] Fix frontend OTel resource attributes

---
 .../Assets/telemetry/instrumentation.ts             | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Elastic.Documentation.Site/Assets/telemetry/instrumentation.ts b/src/Elastic.Documentation.Site/Assets/telemetry/instrumentation.ts
index 7ccfe9747..e6ed4ead3 100644
--- a/src/Elastic.Documentation.Site/Assets/telemetry/instrumentation.ts
+++ b/src/Elastic.Documentation.Site/Assets/telemetry/instrumentation.ts
@@ -14,7 +14,10 @@ import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http'
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'
 import { registerInstrumentations } from '@opentelemetry/instrumentation'
 import { FetchInstrumentation } from '@opentelemetry/instrumentation-fetch'
-import { resourceFromAttributes } from '@opentelemetry/resources'
+import {
+    defaultResource,
+    resourceFromAttributes,
+} from '@opentelemetry/resources'
 import {
     LoggerProvider,
     BatchLogRecordProcessor,
@@ -96,8 +99,10 @@ function createSharedResource(config: ResolvedConfig) {
         [ATTR_SERVICE_NAME]: config.serviceName,
         [ATTR_SERVICE_VERSION]: config.serviceVersion,
         ['deployment.environment']: config.deploymentEnvironment,
+        ['service.language.name']: 'javascript',
     }
-    return resourceFromAttributes(resourceAttributes)
+    // Merge with default resource to preserve telemetry.sdk.* attributes
+    return defaultResource().merge(resourceFromAttributes(resourceAttributes))
 }
 
 function createCommonHeaders(): Record<string, string> {
@@ -107,7 +112,7 @@ function createCommonHeaders(): Record<string, string> {
 }
 
 function initializeTracing(
-    resource: ReturnType<typeof resourceFromAttributes>,
+    resource: ReturnType<typeof defaultResource>,
     config: ResolvedConfig,
     commonHeaders: Record<string, string>
 ): void {
@@ -150,7 +155,7 @@ function registerFetchInstrumentation(): void {
 }
 
 function initializeLogging(
-    resource: ReturnType<typeof resourceFromAttributes>,
+    resource: ReturnType<typeof defaultResource>,
     config: ResolvedConfig,
     commonHeaders: Record<string, string>
 ): void {