@tramvai/module-opentelemetry 7.28.1 → 7.29.0

package/lib/browser.d.ts

@@ -1,4 +1,6 @@
 export * from './tokens';
+export { generateTraceId, generateSpanId } from './generateIds';
+export { BrowserTracer } from './tracer/tracer.browser';
 export declare const extractTraceparentHeader: () => string | undefined;
 export declare class OpenTelemetryModule {
 }

package/lib/browser.js

@@ -1,8 +1,13 @@
 import { __decorate } from 'tslib';
-import { Module } from '@tramvai/core';
+import { Module, provide } from '@tramvai/core';
 import once from '@tinkoff/utils/function/once';
 import { providers } from './instrumentation/logs.browser.browser.js';
+import { providers as providers$1 } from './instrumentation/httpClient.browser.browser.js';
+import { BrowserTracer } from './tracer/tracer.browser.browser.js';
+export { BrowserTracer } from './tracer/tracer.browser.browser.js';
+import { OPENTELEMETRY_TRACER_TOKEN } from './tokens.browser.js';
 export { OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_TOKEN, OPENTELEMETRY_PROVIDER_CONFIG_TOKEN, OPENTELEMETRY_PROVIDER_RESOURCE_ATTRIBUTES_TOKEN, OPENTELEMETRY_PROVIDER_RESOURCE_TOKEN, OPENTELEMETRY_PROVIDER_SPAN_PROCESSOR_TOKEN, OPENTELEMETRY_PROVIDER_TOKEN, OPENTELEMETRY_TRACER_TOKEN } from './tokens.browser.js';
+export { generateSpanId, generateTraceId } from './generateIds.browser.js';
 
 const extractTraceparentHeader = once(() => {
     if (typeof window !== 'undefined') {
@@ -19,7 +24,14 @@ let OpenTelemetryModule = class OpenTelemetryModule {
 OpenTelemetryModule = __decorate([
     Module({
         imports: [],
-        providers: [...providers],
+        providers: [
+            ...providers,
+            ...providers$1,
+            provide({
+                provide: OPENTELEMETRY_TRACER_TOKEN,
+                useFactory: () => new BrowserTracer(),
+            }),
+        ],
     })
 ], OpenTelemetryModule);
 // todo declareModule!

package/lib/generateIds.browser.js

@@ -0,0 +1,11 @@
+function randomHex(length) {
+    return Array.from(crypto.getRandomValues(new Uint8Array(length)), (b) => b.toString(16).padStart(2, '0')).join('');
+}
+function generateTraceId() {
+    return randomHex(16);
+}
+function generateSpanId() {
+    return randomHex(8);
+}
+
+export { generateSpanId, generateTraceId };

package/lib/generateIds.d.ts

@@ -0,0 +1,3 @@
+export declare function generateTraceId(): string;
+export declare function generateSpanId(): string;
+//# sourceMappingURL=generateIds.d.ts.map

package/lib/instrumentation/httpClient.browser.browser.js

@@ -0,0 +1,41 @@
+import { provide } from '@tramvai/core';
+import { DEFAULT_HTTP_CLIENT_INTERCEPTORS } from '@tramvai/tokens-http-client';
+import { getUrlFromRequest } from '@tramvai/module-http-client';
+import { OPENTELEMETRY_TRACER_TOKEN, OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_TOKEN } from '../tokens.browser.js';
+
+const providers = [
+    provide({
+        provide: DEFAULT_HTTP_CLIENT_INTERCEPTORS,
+        useFactory: ({ tracer, includeHeaders }) => {
+            return (request, next) => {
+                // avoid wrapping the request if the traceparent header has already been passed
+                if (request.headers?.traceparent) {
+                    return next(request);
+                }
+                if (includeHeaders && !includeHeaders(getUrlFromRequest(request))) {
+                    return next(request);
+                }
+                const method = request.method ?? 'GET';
+                const serviceName = request.baseUrlEnv ?? 'unknown';
+                return tracer.trace(`${method} ${serviceName}`, (span) => {
+                    if (!request.headers) {
+                        request.headers = {};
+                    }
+                    // TODO: Enrich the span with the same attributes as the server tracer once the client SDK is integrated
+                    const { traceId, spanId } = span.spanContext();
+                    request.headers.traceparent = `00-${traceId}-${spanId}-01`;
+                    return next(request);
+                });
+            };
+        },
+        deps: {
+            tracer: OPENTELEMETRY_TRACER_TOKEN,
+            includeHeaders: {
+                token: OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_TOKEN,
+                optional: true,
+            },
+        },
+    }),
+];
+
+export { providers };

package/lib/instrumentation/httpClient.browser.d.ts

@@ -0,0 +1,14 @@
+export declare const providers: import("@tramvai/core").Provider<{
+    tracer: import("../tokens").TramvaiTracer & {
+        __type?: "base token" | undefined;
+    };
+    includeHeaders: {
+        token: ((url: string) => boolean) & {
+            __type?: "base token" | undefined;
+        };
+        optional: boolean;
+    };
+}, import("@tramvai/module-http-client").HttpClientInterceptor & {
+    __type?: "multi token" | undefined;
+}>[];
+//# sourceMappingURL=httpClient.browser.d.ts.map

package/lib/instrumentation/httpClient.d.ts

@@ -5,7 +5,7 @@ export declare const providers: import("@tramvai/core").Provider<{
     metricsServicesRegistry: import("@tramvai/tokens-metrics").MetricsServicesRegistryInterface & {
         __type?: "base token" | undefined;
     };
-}, import("@tramvai/http-client").HttpClientInterceptor & {
+}, import("@tramvai/module-http-client").HttpClientInterceptor & {
     __type?: "multi token" | undefined;
 }>[];
 //# sourceMappingURL=httpClient.d.ts.map

package/lib/instrumentation/httpClient.es.js

@@ -3,6 +3,7 @@ import { DEFAULT_HTTP_CLIENT_INTERCEPTORS } from '@tramvai/tokens-http-client';
 import { METRICS_SERVICES_REGISTRY_TOKEN } from '@tramvai/tokens-metrics';
 import { SpanKind } from '@opentelemetry/api';
 import { ATTR_HTTP_REQUEST_METHOD, ATTR_SERVER_ADDRESS, ATTR_URL_PATH, ATTR_URL_QUERY, ATTR_URL_SCHEME, ATTR_URL_FULL, ATTR_HTTP_RESPONSE_STATUS_CODE } from '@opentelemetry/semantic-conventions';
+import { getUrlFromRequest } from '@tramvai/module-http-client';
 import { OPENTELEMETRY_TRACER_TOKEN } from '../tokens.es.js';
 
 const providers = [
@@ -10,9 +11,7 @@ const providers = [
         provide: DEFAULT_HTTP_CLIENT_INTERCEPTORS,
         useFactory: ({ tracer, metricsServicesRegistry }) => {
             return (request, next) => {
-                const url = request.url ??
-                    // todo add leading slash before path if needed
-                    (request.baseUrl ? `${request.baseUrl}${request.path}` : (request.path ?? ''));
+                const url = getUrlFromRequest(request);
                 const parsedUrl = new URL(request.query ? `${url}?${new URLSearchParams(request.query).toString()}` : url);
                 const serviceName = metricsServicesRegistry.getServiceName(url, request) ?? 'unknown';
                 const method = request.method ?? 'GET';

package/lib/instrumentation/httpClient.js

@@ -7,6 +7,7 @@ var tokensHttpClient = require('@tramvai/tokens-http-client');
 var tokensMetrics = require('@tramvai/tokens-metrics');
 var api = require('@opentelemetry/api');
 var semanticConventions = require('@opentelemetry/semantic-conventions');
+var moduleHttpClient = require('@tramvai/module-http-client');
 var tokens = require('../tokens.js');
 
 const providers = [
@@ -14,9 +15,7 @@ const providers = [
         provide: tokensHttpClient.DEFAULT_HTTP_CLIENT_INTERCEPTORS,
         useFactory: ({ tracer, metricsServicesRegistry }) => {
             return (request, next) => {
-                const url = request.url ??
-                    // todo add leading slash before path if needed
-                    (request.baseUrl ? `${request.baseUrl}${request.path}` : (request.path ?? ''));
+                const url = moduleHttpClient.getUrlFromRequest(request);
                 const parsedUrl = new URL(request.query ? `${url}?${new URLSearchParams(request.query).toString()}` : url);
                 const serviceName = metricsServicesRegistry.getServiceName(url, request) ?? 'unknown';
                 const method = request.method ?? 'GET';

package/lib/tokens.browser.js

@@ -6,7 +6,6 @@ const OPENTELEMETRY_PROVIDER_SPAN_PROCESSOR_TOKEN = createToken('tramvai opentel
 const OPENTELEMETRY_PROVIDER_RESOURCE_TOKEN = createToken('tramvai opentelemetry provider resource', { scope: Scope.SINGLETON });
 const OPENTELEMETRY_PROVIDER_RESOURCE_ATTRIBUTES_TOKEN = createToken('tramvai opentelemetry provider resource attributes', { multi: true, scope: Scope.SINGLETON });
 const OPENTELEMETRY_TRACER_TOKEN = createToken('tramvai opentelemetry tracer', { scope: Scope.SINGLETON });
-// TODO: not used for now, wait for TCORE-5381
 const OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_TOKEN = createToken('tramvai opentelemetry http client browser headers filter');
 
 export { OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_TOKEN, OPENTELEMETRY_PROVIDER_CONFIG_TOKEN, OPENTELEMETRY_PROVIDER_RESOURCE_ATTRIBUTES_TOKEN, OPENTELEMETRY_PROVIDER_RESOURCE_TOKEN, OPENTELEMETRY_PROVIDER_SPAN_PROCESSOR_TOKEN, OPENTELEMETRY_PROVIDER_TOKEN, OPENTELEMETRY_TRACER_TOKEN };

package/lib/tokens.es.js

@@ -6,7 +6,6 @@ const OPENTELEMETRY_PROVIDER_SPAN_PROCESSOR_TOKEN = createToken('tramvai opentel
 const OPENTELEMETRY_PROVIDER_RESOURCE_TOKEN = createToken('tramvai opentelemetry provider resource', { scope: Scope.SINGLETON });
 const OPENTELEMETRY_PROVIDER_RESOURCE_ATTRIBUTES_TOKEN = createToken('tramvai opentelemetry provider resource attributes', { multi: true, scope: Scope.SINGLETON });
 const OPENTELEMETRY_TRACER_TOKEN = createToken('tramvai opentelemetry tracer', { scope: Scope.SINGLETON });
-// TODO: not used for now, wait for TCORE-5381
 const OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_TOKEN = createToken('tramvai opentelemetry http client browser headers filter');
 
 export { OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_TOKEN, OPENTELEMETRY_PROVIDER_CONFIG_TOKEN, OPENTELEMETRY_PROVIDER_RESOURCE_ATTRIBUTES_TOKEN, OPENTELEMETRY_PROVIDER_RESOURCE_TOKEN, OPENTELEMETRY_PROVIDER_SPAN_PROCESSOR_TOKEN, OPENTELEMETRY_PROVIDER_TOKEN, OPENTELEMETRY_TRACER_TOKEN };

package/lib/tokens.js

@@ -10,7 +10,6 @@ const OPENTELEMETRY_PROVIDER_SPAN_PROCESSOR_TOKEN = dippy.createToken('tramvai o
 const OPENTELEMETRY_PROVIDER_RESOURCE_TOKEN = dippy.createToken('tramvai opentelemetry provider resource', { scope: dippy.Scope.SINGLETON });
 const OPENTELEMETRY_PROVIDER_RESOURCE_ATTRIBUTES_TOKEN = dippy.createToken('tramvai opentelemetry provider resource attributes', { multi: true, scope: dippy.Scope.SINGLETON });
 const OPENTELEMETRY_TRACER_TOKEN = dippy.createToken('tramvai opentelemetry tracer', { scope: dippy.Scope.SINGLETON });
-// TODO: not used for now, wait for TCORE-5381
 const OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_TOKEN = dippy.createToken('tramvai opentelemetry http client browser headers filter');
 
 exports.OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_TOKEN = OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_TOKEN;

package/lib/tracer/tracer.browser.browser.js

@@ -0,0 +1,103 @@
+import isPromise from '@tinkoff/utils/is/promise';
+import { generateTraceId, generateSpanId } from '../generateIds.browser.js';
+
+/* eslint-disable prefer-destructuring */
+class BrowserSpan {
+    traceIdValue;
+    spanIdValue;
+    nameValue;
+    endedValue = false;
+    constructor(name) {
+        this.nameValue = name;
+        this.traceIdValue = generateTraceId();
+        this.spanIdValue = generateSpanId();
+    }
+    spanContext() {
+        return {
+            traceId: this.traceIdValue,
+            spanId: this.spanIdValue,
+            traceFlags: 1,
+        };
+    }
+    setAttribute(key, value) {
+        return this;
+    }
+    setAttributes(attributes) {
+        return this;
+    }
+    addEvent(name, attributesOrStartTime, startTime) {
+        return this;
+    }
+    addLink(link) {
+        return this;
+    }
+    addLinks(links) {
+        return this;
+    }
+    setStatus(status) {
+        return this;
+    }
+    updateName(name) {
+        this.nameValue = name;
+        return this;
+    }
+    end(endTime) {
+        this.endedValue = true;
+    }
+    isRecording() {
+        return !this.endedValue;
+    }
+    recordException(exception, time) { }
+}
+class BrowserTracer {
+    startSpan(name, options, context) {
+        return new BrowserSpan(name);
+    }
+    startActiveSpan(...args) {
+        const name = args[0];
+        const fn = args[args.length - 1];
+        const options = args.length > 2 ? args[1] : {};
+        const span = this.startSpan(name, options);
+        return fn(span);
+    }
+    getActiveSpan() {
+        return undefined;
+    }
+    trace(...args) {
+        const name = args[0];
+        let fn;
+        let options;
+        if (args.length === 2 || (args.length === 3 && typeof args[2] === 'object')) {
+            fn = args[1];
+            options = {};
+        }
+        else {
+            options = args[1] ?? {};
+            fn = args[2];
+        }
+        const span = this.startSpan(name, options);
+        try {
+            const result = fn(span);
+            if (isPromise(result)) {
+                return result.then((res) => {
+                    span.end();
+                    return res;
+                }, (error) => {
+                    span.end();
+                    throw error;
+                });
+            }
+            span.end();
+            return result;
+        }
+        catch (error) {
+            span.end();
+            throw error;
+        }
+    }
+    propagateContext(carrier) {
+        return carrier ?? {};
+    }
+}
+
+export { BrowserTracer };

package/lib/tracer/tracer.browser.d.ts

@@ -0,0 +1,15 @@
+import type { Context, Span, SpanOptions } from '@opentelemetry/api';
+import type { PropagationCarrier, TraceParams, TramvaiTracer } from '../tokens';
+export declare class BrowserTracer implements TramvaiTracer {
+    startSpan(name: string, options?: SpanOptions, context?: Context): Span;
+    startActiveSpan<F extends (span: Span) => unknown>(name: string, fn: F): ReturnType<F>;
+    startActiveSpan<F extends (span: Span) => unknown>(name: string, options: SpanOptions, fn: F): ReturnType<F>;
+    startActiveSpan<F extends (span: Span) => unknown>(name: string, options: SpanOptions, context: Context, fn: F): ReturnType<F>;
+    getActiveSpan(): Span | undefined;
+    trace<T>(name: string, fn: (span: Span) => Promise<T>, params?: TraceParams): Promise<T>;
+    trace<T>(name: string, fn: (span: Span) => T, params?: TraceParams): T;
+    trace<T>(name: string, options: SpanOptions, fn: (span: Span) => Promise<T>, params?: TraceParams): Promise<T>;
+    trace<T>(name: string, options: SpanOptions, fn: (span: Span) => T, params?: TraceParams): T;
+    propagateContext(carrier?: PropagationCarrier): PropagationCarrier;
+}
+//# sourceMappingURL=tracer.browser.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-opentelemetry",
-  "version": "7.28.1",
+  "version": "7.29.0",
   "description": "Интеграция OpenTelemetry",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -29,19 +29,20 @@
     "@opentelemetry/semantic-conventions": "^1.28.0",
     "@tinkoff/errors": "0.8.1",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/tokens-child-app": "7.28.1",
-    "@tramvai/tokens-common": "7.28.1",
-    "@tramvai/tokens-http-client": "7.28.1",
-    "@tramvai/tokens-metrics": "7.28.1",
-    "@tramvai/tokens-render": "7.28.1",
-    "@tramvai/tokens-router": "7.28.1",
-    "@tramvai/tokens-server": "7.28.1",
-    "@tramvai/tokens-server-private": "7.28.1",
+    "@tramvai/module-http-client": "7.29.0",
+    "@tramvai/tokens-child-app": "7.29.0",
+    "@tramvai/tokens-common": "7.29.0",
+    "@tramvai/tokens-http-client": "7.29.0",
+    "@tramvai/tokens-metrics": "7.29.0",
+    "@tramvai/tokens-render": "7.29.0",
+    "@tramvai/tokens-router": "7.29.0",
+    "@tramvai/tokens-server": "7.29.0",
+    "@tramvai/tokens-server-private": "7.29.0",
     "path-to-regexp": "^0.1.12"
   },
   "peerDependencies": {
     "@tinkoff/dippy": "^1.0.0",
-    "@tramvai/core": "7.28.1",
+    "@tramvai/core": "7.29.0",
     "tslib": "^2.4.0"
   }
 }