@tramvai/module-opentelemetry 7.5.3 → 7.7.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 +7 -3
  2. package/lib/server.js +7 -3
  3. package/package.json +11 -10
package/lib/server.es.js CHANGED
@@ -5,6 +5,7 @@ import { Resource } from '@opentelemetry/resources';
5
5
  import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
6
6
  import { LOGGER_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';
8
9
  import { SpanKind } from '@opentelemetry/api';
9
10
  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';
10
11
  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';
@@ -64,11 +65,13 @@ OpenTelemetryModule = __decorate([
64
65
  }),
65
66
  provide({
66
67
  provide: commandLineListTokens.generatePage,
67
- useFactory: ({ tracer, resourcesRegistry }) => {
68
+ useFactory: ({ tracer, resourcesRegistry, staticPageService }) => {
68
69
  return function insertTraceIdToResourcesRegistry() {
69
70
  tracer.startActiveSpan('BROWSER', { kind: SpanKind.CLIENT }, () => {
70
71
  const traceparent = getTraceparentHeader(tracer);
71
- if (traceparent !== undefined) {
72
+ if (traceparent !== undefined &&
73
+ // remove traceparent meta tag from cached page, because it can lead to incorrect traces correlation
74
+ !staticPageService?.shouldUseCache()) {
72
75
  resourcesRegistry.register({
73
76
  slot: ResourceSlot.HEAD_META,
74
77
  type: ResourceType.meta,
@@ -81,6 +84,7 @@ OpenTelemetryModule = __decorate([
81
84
  deps: {
82
85
  tracer: OPENTELEMETRY_TRACER_TOKEN,
83
86
  resourcesRegistry: RESOURCES_REGISTRY,
87
+ staticPageService: optional(STATIC_PAGES_SERVICE),
84
88
  },
85
89
  }),
86
90
  provide({
@@ -143,7 +147,7 @@ OpenTelemetryModule = __decorate([
143
147
  },
144
148
  }),
145
149
  // todo open telemetry debug flag or wrap ConsoleSpanExporter in logger
146
- ...(process.env.NODE_ENV === 'development'
150
+ ...(process.env.TRAMVAI_OPENTELEMETRY_DEBUG === 'true'
147
151
  ? [
148
152
  provide({
149
153
  provide: OPENTELEMETRY_PROVIDER_SPAN_PROCESSOR_TOKEN,
package/lib/server.js CHANGED
@@ -9,6 +9,7 @@ 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');
12
13
  var api = require('@opentelemetry/api');
13
14
  var tokens = require('./tokens.js');
14
15
  var tracer = require('./tracer/tracer.js');
@@ -67,11 +68,13 @@ exports.OpenTelemetryModule = tslib.__decorate([
67
68
  }),
68
69
  core.provide({
69
70
  provide: core.commandLineListTokens.generatePage,
70
- useFactory: ({ tracer, resourcesRegistry }) => {
71
+ useFactory: ({ tracer, resourcesRegistry, staticPageService }) => {
71
72
  return function insertTraceIdToResourcesRegistry() {
72
73
  tracer.startActiveSpan('BROWSER', { kind: api.SpanKind.CLIENT }, () => {
73
74
  const traceparent = getTraceparentHeader.getTraceparentHeader(tracer);
74
- if (traceparent !== undefined) {
75
+ if (traceparent !== undefined &&
76
+ // remove traceparent meta tag from cached page, because it can lead to incorrect traces correlation
77
+ !staticPageService?.shouldUseCache()) {
75
78
  resourcesRegistry.register({
76
79
  slot: tokensRender.ResourceSlot.HEAD_META,
77
80
  type: tokensRender.ResourceType.meta,
@@ -84,6 +87,7 @@ exports.OpenTelemetryModule = tslib.__decorate([
84
87
  deps: {
85
88
  tracer: tokens.OPENTELEMETRY_TRACER_TOKEN,
86
89
  resourcesRegistry: tokensRender.RESOURCES_REGISTRY,
90
+ staticPageService: core.optional(modulePageRenderMode.STATIC_PAGES_SERVICE),
87
91
  },
88
92
  }),
89
93
  core.provide({
@@ -146,7 +150,7 @@ exports.OpenTelemetryModule = tslib.__decorate([
146
150
  },
147
151
  }),
148
152
  // todo open telemetry debug flag or wrap ConsoleSpanExporter in logger
149
- ...(process.env.NODE_ENV === 'development'
153
+ ...(process.env.TRAMVAI_OPENTELEMETRY_DEBUG === 'true'
150
154
  ? [
151
155
  core.provide({
152
156
  provide: tokens.OPENTELEMETRY_PROVIDER_SPAN_PROCESSOR_TOKEN,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/module-opentelemetry",
3
- "version": "7.5.3",
3
+ "version": "7.7.0",
4
4
  "description": "Интеграция OpenTelemetry",
5
5
  "browser": "lib/browser.js",
6
6
  "main": "lib/server.js",
@@ -29,19 +29,20 @@
29
29
  "@opentelemetry/semantic-conventions": "^1.28.0",
30
30
  "@tinkoff/errors": "0.8.1",
31
31
  "@tinkoff/utils": "^2.1.2",
32
- "@tramvai/tokens-child-app": "7.5.3",
33
- "@tramvai/tokens-common": "7.5.3",
34
- "@tramvai/tokens-http-client": "7.5.3",
35
- "@tramvai/tokens-metrics": "7.5.3",
36
- "@tramvai/tokens-render": "7.5.3",
37
- "@tramvai/tokens-router": "7.5.3",
38
- "@tramvai/tokens-server": "7.5.3",
39
- "@tramvai/tokens-server-private": "7.5.3",
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",
40
41
  "path-to-regexp": "^0.1.12"
41
42
  },
42
43
  "peerDependencies": {
43
44
  "@tinkoff/dippy": "0.13.2",
44
- "@tramvai/core": "7.5.3",
45
+ "@tramvai/core": "7.7.0",
45
46
  "tslib": "^2.4.0"
46
47
  }
47
48
  }