@tramvai/module-opentelemetry 7.7.0 → 7.11.0

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 (3) hide show
  1. package/lib/server.es.js +6 -6
  2. package/lib/server.js +5 -5
  3. package/package.json +10 -11
package/lib/server.es.js CHANGED
@@ -3,9 +3,8 @@ import { Module, provide, commandLineListTokens, optional, APP_INFO_TOKEN } from
3
3
  import { NodeTracerProvider, SimpleSpanProcessor, ConsoleSpanExporter } from '@opentelemetry/sdk-trace-node';
4
4
  import { Resource } from '@opentelemetry/resources';
5
5
  import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
6
- import { LOGGER_TOKEN, ENV_MANAGER_TOKEN } from '@tramvai/tokens-common';
6
+ import { LOGGER_TOKEN, REQUEST_MANAGER_TOKEN, ENV_MANAGER_TOKEN } from '@tramvai/tokens-common';
7
7
  import { ResourceSlot, ResourceType, RESOURCES_REGISTRY } from '@tramvai/tokens-render';
8
- import { STATIC_PAGES_SERVICE } from '@tramvai/module-page-render-mode';
9
8
  import { SpanKind } from '@opentelemetry/api';
10
9
  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';
11
10
  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';
@@ -65,13 +64,14 @@ OpenTelemetryModule = __decorate([
65
64
  }),
66
65
  provide({
67
66
  provide: commandLineListTokens.generatePage,
68
- useFactory: ({ tracer, resourcesRegistry, staticPageService }) => {
67
+ useFactory: ({ tracer, resourcesRegistry, requestManager }) => {
69
68
  return function insertTraceIdToResourcesRegistry() {
70
69
  tracer.startActiveSpan('BROWSER', { kind: SpanKind.CLIENT }, () => {
71
70
  const traceparent = getTraceparentHeader(tracer);
72
71
  if (traceparent !== undefined &&
73
- // remove traceparent meta tag from cached page, because it can lead to incorrect traces correlation
74
- !staticPageService?.shouldUseCache()) {
72
+ // remove traceparent meta tag from static pages, because it can lead to incorrect traces correlation
73
+ !requestManager.getHeader('x-tramvai-static-page-revalidate') &&
74
+ !requestManager.getHeader('x-tramvai-prerender')) {
75
75
  resourcesRegistry.register({
76
76
  slot: ResourceSlot.HEAD_META,
77
77
  type: ResourceType.meta,
@@ -84,7 +84,7 @@ OpenTelemetryModule = __decorate([
84
84
  deps: {
85
85
  tracer: OPENTELEMETRY_TRACER_TOKEN,
86
86
  resourcesRegistry: RESOURCES_REGISTRY,
87
- staticPageService: optional(STATIC_PAGES_SERVICE),
87
+ requestManager: REQUEST_MANAGER_TOKEN,
88
88
  },
89
89
  }),
90
90
  provide({
package/lib/server.js CHANGED
@@ -9,7 +9,6 @@ var resources = require('@opentelemetry/resources');
9
9
  var semanticConventions = require('@opentelemetry/semantic-conventions');
10
10
  var tokensCommon = require('@tramvai/tokens-common');
11
11
  var tokensRender = require('@tramvai/tokens-render');
12
- var modulePageRenderMode = require('@tramvai/module-page-render-mode');
13
12
  var api = require('@opentelemetry/api');
14
13
  var tokens = require('./tokens.js');
15
14
  var tracer = require('./tracer/tracer.js');
@@ -68,13 +67,14 @@ exports.OpenTelemetryModule = tslib.__decorate([
68
67
  }),
69
68
  core.provide({
70
69
  provide: core.commandLineListTokens.generatePage,
71
- useFactory: ({ tracer, resourcesRegistry, staticPageService }) => {
70
+ useFactory: ({ tracer, resourcesRegistry, requestManager }) => {
72
71
  return function insertTraceIdToResourcesRegistry() {
73
72
  tracer.startActiveSpan('BROWSER', { kind: api.SpanKind.CLIENT }, () => {
74
73
  const traceparent = getTraceparentHeader.getTraceparentHeader(tracer);
75
74
  if (traceparent !== undefined &&
76
- // remove traceparent meta tag from cached page, because it can lead to incorrect traces correlation
77
- !staticPageService?.shouldUseCache()) {
75
+ // remove traceparent meta tag from static pages, because it can lead to incorrect traces correlation
76
+ !requestManager.getHeader('x-tramvai-static-page-revalidate') &&
77
+ !requestManager.getHeader('x-tramvai-prerender')) {
78
78
  resourcesRegistry.register({
79
79
  slot: tokensRender.ResourceSlot.HEAD_META,
80
80
  type: tokensRender.ResourceType.meta,
@@ -87,7 +87,7 @@ exports.OpenTelemetryModule = tslib.__decorate([
87
87
  deps: {
88
88
  tracer: tokens.OPENTELEMETRY_TRACER_TOKEN,
89
89
  resourcesRegistry: tokensRender.RESOURCES_REGISTRY,
90
- staticPageService: core.optional(modulePageRenderMode.STATIC_PAGES_SERVICE),
90
+ requestManager: tokensCommon.REQUEST_MANAGER_TOKEN,
91
91
  },
92
92
  }),
93
93
  core.provide({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/module-opentelemetry",
3
- "version": "7.7.0",
3
+ "version": "7.11.0",
4
4
  "description": "Интеграция OpenTelemetry",
5
5
  "browser": "lib/browser.js",
6
6
  "main": "lib/server.js",
@@ -29,20 +29,19 @@
29
29
  "@opentelemetry/semantic-conventions": "^1.28.0",
30
30
  "@tinkoff/errors": "0.8.1",
31
31
  "@tinkoff/utils": "^2.1.2",
32
- "@tramvai/module-page-render-mode": "7.7.0",
33
- "@tramvai/tokens-child-app": "7.7.0",
34
- "@tramvai/tokens-common": "7.7.0",
35
- "@tramvai/tokens-http-client": "7.7.0",
36
- "@tramvai/tokens-metrics": "7.7.0",
37
- "@tramvai/tokens-render": "7.7.0",
38
- "@tramvai/tokens-router": "7.7.0",
39
- "@tramvai/tokens-server": "7.7.0",
40
- "@tramvai/tokens-server-private": "7.7.0",
32
+ "@tramvai/tokens-child-app": "7.11.0",
33
+ "@tramvai/tokens-common": "7.11.0",
34
+ "@tramvai/tokens-http-client": "7.11.0",
35
+ "@tramvai/tokens-metrics": "7.11.0",
36
+ "@tramvai/tokens-render": "7.11.0",
37
+ "@tramvai/tokens-router": "7.11.0",
38
+ "@tramvai/tokens-server": "7.11.0",
39
+ "@tramvai/tokens-server-private": "7.11.0",
41
40
  "path-to-regexp": "^0.1.12"
42
41
  },
43
42
  "peerDependencies": {
44
43
  "@tinkoff/dippy": "0.13.2",
45
- "@tramvai/core": "7.7.0",
44
+ "@tramvai/core": "7.11.0",
46
45
  "tslib": "^2.4.0"
47
46
  }
48
47
  }