@veryfront/ext-observability-opentelemetry 0.1.1040 → 0.1.1042

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "veryfront",
-    "version": "0.1.1040",
+    "version": "0.1.1042",
     "license": "Apache-2.0",
     "nodeModulesDir": "auto",
     "minimumDependencyAge": {

package/esm/extensions/ext-observability-opentelemetry/src/index.d.ts

@@ -64,6 +64,12 @@ export declare function unifiedServiceResourceAttributes(options: {
 export declare function logAttributes(record: NodeTelemetryLogRecord): Record<string, string | number | boolean>;
 export declare function resolveOtlpSignalUrl(endpoint: string | undefined, signal: "traces" | "metrics" | "logs"): string | undefined;
 export declare function resolveOtlpExtensionConfig(read?: EnvReader): ResolvedOtlpExtensionConfig;
+type LlmObservabilityServiceIdentity = {
+    serviceName: string;
+    serviceVersion: string;
+    deploymentEnvironment: string;
+};
+export declare function rewriteLlmObservabilitySpanResource(span: unknown, fallback?: LlmObservabilityServiceIdentity): unknown;
 declare class OtlpTracingExporter implements TracingExporter {
     private sdkProvider;
     private meterProvider;

package/esm/extensions/ext-observability-opentelemetry/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/extensions/ext-observability-opentelemetry/src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/extensions/ext-observability-opentelemetry/src/index.ts"],"names":[],"mappings":"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"}

package/esm/extensions/ext-observability-opentelemetry/src/index.js

@@ -195,7 +195,7 @@ function resolveLlmObservabilityEnabled(read, tracesHeaders) {
         return explicitFlag;
     return getHeaderValue(tracesHeaders, "dd-otlp-source") === "llmobs";
 }
-function resolveLlmObservabilityHeaders(read, tracesHeaders) {
+function resolveLlmObservabilityHeaders(read, tracesHeaders, mlAppFallback) {
     const headers = { ...tracesHeaders };
     const datadogApiKey = getHeaderValue(headers, "dd-api-key") ??
         read("DD_API_KEY") ??
@@ -204,7 +204,9 @@ function resolveLlmObservabilityHeaders(read, tracesHeaders) {
         setHeaderValue(headers, "dd-api-key", datadogApiKey);
     }
     setHeaderValue(headers, "dd-otlp-source", "llmobs");
-    const mlApp = read("DD_LLMOBS_ML_APP");
+    const mlApp = read("DD_LLMOBS_ML_APP")?.trim() ||
+        getHeaderValue(headers, "dd-ml-app")?.trim() ||
+        mlAppFallback?.trim();
     if (mlApp) {
         setHeaderValue(headers, "dd-ml-app", mlApp);
     }
@@ -383,11 +385,14 @@ export function resolveOtlpExtensionConfig(read = readEnv) {
     const tracesHeaders = mergeHeaders(headers, parseHeaders(read("OTEL_EXPORTER_OTLP_TRACES_HEADERS")));
     const metricsHeaders = mergeHeaders(headers, parseHeaders(read("OTEL_EXPORTER_OTLP_METRICS_HEADERS")));
     const logsHeaders = mergeHeaders(headers, parseHeaders(read("OTEL_EXPORTER_OTLP_LOGS_HEADERS")));
-    const llmObservabilityHeaders = resolveLlmObservabilityHeaders(read, tracesHeaders);
+    const serviceName = resolveServiceName(read, resourceAttributes);
+    const serviceVersion = resolveServiceVersion(read, resourceAttributes);
+    const deploymentEnvironment = resolveDeploymentEnvironment(read, resourceAttributes);
+    const llmObservabilityHeaders = resolveLlmObservabilityHeaders(read, tracesHeaders, serviceName);
     return {
-        serviceName: resolveServiceName(read, resourceAttributes),
-        serviceVersion: resolveServiceVersion(read, resourceAttributes),
-        deploymentEnvironment: resolveDeploymentEnvironment(read, resourceAttributes),
+        serviceName,
+        serviceVersion,
+        deploymentEnvironment,
         headers,
         tracesHeaders,
         metricsHeaders,
@@ -411,6 +416,103 @@ function isGenAiSpan(span) {
     const attributes = span.attributes;
     return typeof attributes?.["gen_ai.operation.name"] === "string";
 }
+function getStringAttribute(attributes, key) {
+    const value = attributes?.[key];
+    if (typeof value !== "string")
+        return undefined;
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : undefined;
+}
+function getSpanTraceId(span) {
+    const context = span.spanContext;
+    const spanContext = typeof context === "function" ? context.call(span) : context;
+    return typeof spanContext?.traceId === "string" ? spanContext.traceId : undefined;
+}
+function resolveLlmObservabilityServiceIdentity(span, fallback) {
+    const readableSpan = span;
+    const spanAttributes = readableSpan.attributes;
+    const resourceAttributes = readableSpan.resource?.attributes;
+    const serviceName = getStringAttribute(spanAttributes, "service.name") ??
+        getStringAttribute(spanAttributes, "service") ??
+        fallback?.serviceName;
+    if (!serviceName)
+        return null;
+    const serviceVersion = getStringAttribute(spanAttributes, "service.version") ??
+        getStringAttribute(spanAttributes, "version") ??
+        fallback?.serviceVersion ??
+        getStringAttribute(resourceAttributes, "service.version") ??
+        getStringAttribute(resourceAttributes, "version") ??
+        VERSION;
+    const deploymentEnvironment = getStringAttribute(spanAttributes, "deployment.environment.name") ??
+        getStringAttribute(spanAttributes, "deployment.environment") ??
+        getStringAttribute(spanAttributes, "env") ??
+        fallback?.deploymentEnvironment ??
+        getStringAttribute(resourceAttributes, "deployment.environment.name") ??
+        getStringAttribute(resourceAttributes, "deployment.environment") ??
+        getStringAttribute(resourceAttributes, "env") ??
+        "development";
+    return { serviceName, serviceVersion, deploymentEnvironment };
+}
+function cloneResourceWithAttributes(resource, attributes) {
+    if (!resource)
+        return { attributes };
+    const clone = Object.create(Object.getPrototypeOf(resource));
+    Object.defineProperties(clone, Object.getOwnPropertyDescriptors(resource));
+    Object.defineProperty(clone, "attributes", {
+        configurable: true,
+        enumerable: true,
+        writable: true,
+        value: {
+            ...(resource.attributes ?? {}),
+            ...attributes,
+        },
+    });
+    return clone;
+}
+function cloneInstrumentationScopeWithName(instrumentationScope, name) {
+    return {
+        ...(instrumentationScope ?? {}),
+        name,
+    };
+}
+function cloneReadableSpanWithResource(span, resource, instrumentationScope) {
+    const clone = Object.create(Object.getPrototypeOf(span));
+    Object.defineProperties(clone, Object.getOwnPropertyDescriptors(span));
+    Object.defineProperty(clone, "resource", {
+        configurable: true,
+        enumerable: true,
+        writable: true,
+        value: resource,
+    });
+    Object.defineProperty(clone, "instrumentationScope", {
+        configurable: true,
+        enumerable: true,
+        writable: true,
+        value: instrumentationScope,
+    });
+    return clone;
+}
+export function rewriteLlmObservabilitySpanResource(span, fallback) {
+    const identity = resolveLlmObservabilityServiceIdentity(span, fallback);
+    if (!identity)
+        return span;
+    const readableSpan = span;
+    const resource = cloneResourceWithAttributes(readableSpan.resource, unifiedServiceResourceAttributes(identity));
+    const instrumentationScope = cloneInstrumentationScopeWithName(readableSpan.instrumentationScope, identity.serviceName);
+    return cloneReadableSpanWithResource(span, resource, instrumentationScope);
+}
+function rewriteLlmObservabilitySpanResources(spans) {
+    const identitiesByTraceId = new Map();
+    for (const span of spans) {
+        const traceId = getSpanTraceId(span);
+        if (!traceId)
+            continue;
+        const identity = resolveLlmObservabilityServiceIdentity(span);
+        if (identity)
+            identitiesByTraceId.set(traceId, identity);
+    }
+    return spans.map((span) => rewriteLlmObservabilitySpanResource(span, identitiesByTraceId.get(getSpanTraceId(span) ?? "")));
+}
 class FilteringSpanExporter {
     delegate;
     includeSpan;
@@ -421,7 +523,7 @@ class FilteringSpanExporter {
         this.successCode = successCode;
     }
     export(spans, resultCallback) {
-        const includedSpans = spans.filter(this.includeSpan);
+        const includedSpans = rewriteLlmObservabilitySpanResources(spans.filter(this.includeSpan));
         if (includedSpans.length === 0) {
             resultCallback({ code: this.successCode });
             return;

package/esm/src/utils/version-constant.d.ts

@@ -1,3 +1,3 @@
 /** Shared version value. */
-export declare const VERSION = "0.1.1040";
+export declare const VERSION = "0.1.1042";
 //# sourceMappingURL=version-constant.d.ts.map

package/esm/src/utils/version-constant.js

@@ -1,4 +1,4 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
 /** Shared version value. */
-export const VERSION = "0.1.1040";
+export const VERSION = "0.1.1042";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veryfront/ext-observability-opentelemetry",
-  "version": "0.1.1040",
+  "version": "0.1.1042",
   "description": "Veryfront first-party extension package for ext-observability-opentelemetry",
   "keywords": [
     "veryfront",
@@ -109,7 +109,7 @@
     "@opentelemetry/semantic-conventions": "1.41.1"
   },
   "peerDependencies": {
-    "veryfront": "^0.1.1040"
+    "veryfront": "^0.1.1042"
   },
   "type": "module",
   "types": "./esm/extensions/ext-observability-opentelemetry/src/index.d.ts",