npm - @tramvai/module-opentelemetry - Versions diffs - 6.68.4 → 6.77.2 - Mend

@tramvai/module-opentelemetry 6.68.4 → 6.77.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/lib/browser.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 export * from './tokens';
+export declare const extractTraceparentHeader: () => string | undefined;
 export declare class OpenTelemetryModule {
 }
 //# sourceMappingURL=browser.d.ts.map

package/lib/browser.js CHANGED Viewed

@@ -1,8 +1,6 @@
 import { __decorate } from 'tslib';
-import { Module, provide } from '@tramvai/core';
+import { Module } from '@tramvai/core';
 import once from '@tinkoff/utils/function/once';
-import { DEFAULT_HTTP_CLIENT_INTERCEPTORS } from '@tramvai/tokens-http-client';
-import { OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_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';
 const extractTraceparentHeader = once(() => {
@@ -20,33 +18,9 @@ let OpenTelemetryModule = class OpenTelemetryModule {
 OpenTelemetryModule = __decorate([
     Module({
         imports: [],
-        providers: [
-            provide({
-                provide: DEFAULT_HTTP_CLIENT_INTERCEPTORS,
-                useFactory: ({ headerInclude }) => (req, next) => {
-                    const url = req.url ?? (req.baseUrl ? `${req.baseUrl}${req.path}` : (req.path ?? ''));
-                    if (!headerInclude(url)) {
-                        return next(req);
-                    }
-                    return next({
-                        ...req,
-                        headers: {
-                            traceparent: extractTraceparentHeader(),
-                            ...req.headers,
-                        },
-                    });
-                },
-                deps: {
-                    headerInclude: OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_TOKEN,
-                },
-            }),
-            provide({
-                provide: OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_TOKEN,
-                useValue: () => true,
-            }),
-        ],
+        providers: [],
     })
 ], OpenTelemetryModule);
 // todo declareModule!
-export { OpenTelemetryModule };
+export { OpenTelemetryModule, extractTraceparentHeader };

package/lib/server.es.js CHANGED Viewed

@@ -5,6 +5,7 @@ import { Resource } from '@opentelemetry/resources';
 import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
 import { LOGGER_TOKEN, ENV_MANAGER_TOKEN } from '@tramvai/tokens-common';
 import { ResourceSlot, ResourceType, RESOURCES_REGISTRY } from '@tramvai/tokens-render';
+import { SpanKind } from '@opentelemetry/api';
 import { OPENTELEMETRY_PROVIDER_TOKEN, OPENTELEMETRY_TRACER_TOKEN, OPENTELEMETRY_PROVIDER_CONFIG_TOKEN, OPENTELEMETRY_PROVIDER_RESOURCE_TOKEN, OPENTELEMETRY_PROVIDER_SPAN_PROCESSOR_TOKEN, OPENTELEMETRY_PROVIDER_RESOURCE_ATTRIBUTES_TOKEN } from './tokens.es.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.es.js';
 import { TramvaiTracerImpl } from './tracer/tracer.es.js';
@@ -62,17 +63,19 @@ OpenTelemetryModule = __decorate([
                 },
             }),
             provide({
-                provide: commandLineListTokens.customerStart,
+                provide: commandLineListTokens.generatePage,
                 useFactory: ({ tracer, resourcesRegistry }) => {
                     return function insertTraceIdToResourcesRegistry() {
-                        const traceparent = getTraceparentHeader(tracer);
-                        if (traceparent !== undefined) {
-                            resourcesRegistry.register({
-                                slot: ResourceSlot.HEAD_META,
-                                type: ResourceType.meta,
-                                payload: `<meta name="traceparent" content="${traceparent}">`,
-                            });
-                        }
+                        tracer.startActiveSpan('BROWSER', { kind: SpanKind.CLIENT }, () => {
+                            const traceparent = getTraceparentHeader(tracer);
+                            if (traceparent !== undefined) {
+                                resourcesRegistry.register({
+                                    slot: ResourceSlot.HEAD_META,
+                                    type: ResourceType.meta,
+                                    payload: `<meta name="traceparent" content="${traceparent}">`,
+                                });
+                            }
+                        });
                     };
                 },
                 deps: {

package/lib/server.js CHANGED Viewed

@@ -9,6 +9,7 @@ var resources = require('@opentelemetry/resources');
 var semanticConventions = require('@opentelemetry/semantic-conventions');
 var tokensCommon = require('@tramvai/tokens-common');
 var tokensRender = require('@tramvai/tokens-render');
+var api = require('@opentelemetry/api');
 var tokens = require('./tokens.js');
 var tracer = require('./tracer/tracer.js');
 var server = require('./instrumentation/server.js');
@@ -65,17 +66,19 @@ exports.OpenTelemetryModule = tslib.__decorate([
                 },
             }),
             core.provide({
-                provide: core.commandLineListTokens.customerStart,
+                provide: core.commandLineListTokens.generatePage,
                 useFactory: ({ tracer, resourcesRegistry }) => {
                     return function insertTraceIdToResourcesRegistry() {
-                        const traceparent = getTraceparentHeader.getTraceparentHeader(tracer);
-                        if (traceparent !== undefined) {
-                            resourcesRegistry.register({
-                                slot: tokensRender.ResourceSlot.HEAD_META,
-                                type: tokensRender.ResourceType.meta,
-                                payload: `<meta name="traceparent" content="${traceparent}">`,
-                            });
-                        }
+                        tracer.startActiveSpan('BROWSER', { kind: api.SpanKind.CLIENT }, () => {
+                            const traceparent = getTraceparentHeader.getTraceparentHeader(tracer);
+                            if (traceparent !== undefined) {
+                                resourcesRegistry.register({
+                                    slot: tokensRender.ResourceSlot.HEAD_META,
+                                    type: tokensRender.ResourceType.meta,
+                                    payload: `<meta name="traceparent" content="${traceparent}">`,
+                                });
+                            }
+                        });
                     };
                 },
                 deps: {

package/lib/tokens.browser.js CHANGED Viewed

@@ -6,6 +6,7 @@ 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 });
-const OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_TOKEN = createToken('tramvai opentelemetry http client browser traceparent header filter');
+// 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 CHANGED Viewed

@@ -6,6 +6,7 @@ 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 });
-const OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_TOKEN = createToken('tramvai opentelemetry http client browser traceparent header filter');
+// 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 CHANGED Viewed

@@ -10,7 +10,8 @@ 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 });
-const OPENTELEMETRY_HTTP_CLIENT_BROWSER_HEADERS_INCLUDE_TOKEN = dippy.createToken('tramvai opentelemetry http client browser traceparent header filter');
+// 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;
 exports.OPENTELEMETRY_PROVIDER_CONFIG_TOKEN = OPENTELEMETRY_PROVIDER_CONFIG_TOKEN;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-opentelemetry",
-  "version": "6.68.4",
+  "version": "6.77.2",
   "description": "Интеграция OpenTelemetry",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -27,21 +27,21 @@
     "@opentelemetry/resources": "^1.28.0",
     "@opentelemetry/sdk-trace-node": "^1.28.0",
     "@opentelemetry/semantic-conventions": "^1.28.0",
-    "@tinkoff/errors": "0.7.1",
+    "@tinkoff/errors": "0.7.2",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/tokens-child-app": "6.68.4",
-    "@tramvai/tokens-common": "6.68.4",
-    "@tramvai/tokens-http-client": "6.68.4",
-    "@tramvai/tokens-metrics": "6.68.4",
-    "@tramvai/tokens-render": "6.68.4",
-    "@tramvai/tokens-router": "6.68.4",
-    "@tramvai/tokens-server": "6.68.4",
-    "@tramvai/tokens-server-private": "6.68.4",
+    "@tramvai/tokens-child-app": "6.77.2",
+    "@tramvai/tokens-common": "6.77.2",
+    "@tramvai/tokens-http-client": "6.77.2",
+    "@tramvai/tokens-metrics": "6.77.2",
+    "@tramvai/tokens-render": "6.77.2",
+    "@tramvai/tokens-router": "6.77.2",
+    "@tramvai/tokens-server": "6.77.2",
+    "@tramvai/tokens-server-private": "6.77.2",
     "path-to-regexp": "^0.1.12"
   },
   "peerDependencies": {
-    "@tinkoff/dippy": "0.12.3",
-    "@tramvai/core": "6.68.4",
+    "@tinkoff/dippy": "0.12.6",
+    "@tramvai/core": "6.77.2",
     "tslib": "^2.4.0"
   }
 }