@sima-land/isomorph 11.0.0-alpha.53 → 11.0.0-alpha.54

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 (164) hide show
  1. package/dist/cjs/package.json +7 -9
  2. package/dist/cjs/preset/node/index.js +8 -8
  3. package/dist/cjs/preset/node/index.js.map +1 -1
  4. package/dist/cjs/preset/node/providers/express-tracing-middleware.js +15 -4
  5. package/dist/cjs/preset/node/providers/express-tracing-middleware.js.map +1 -1
  6. package/dist/cjs/preset/node/providers/{tracer-provider.js → telemetry-tracer-provider.js} +7 -10
  7. package/dist/cjs/preset/node/providers/telemetry-tracer-provider.js.map +1 -0
  8. package/dist/cjs/preset/{bun/utils/get-stats-handler.js → node/providers/telemetry-tracer-resource.js} +19 -20
  9. package/dist/cjs/preset/node/providers/telemetry-tracer-resource.js.map +1 -0
  10. package/dist/cjs/preset/node/providers/{span-exporter.js → telemetry-tracer-span-exporter.js} +6 -5
  11. package/dist/cjs/preset/node/providers/telemetry-tracer-span-exporter.js.map +1 -0
  12. package/dist/cjs/preset/node/providers/{tracer.js → telemetry-tracer.js} +2 -2
  13. package/dist/cjs/preset/node/providers/telemetry-tracer.js.map +1 -0
  14. package/dist/cjs/preset/node/utils/axios-tracing-middleware.js +9 -24
  15. package/dist/cjs/preset/node/utils/axios-tracing-middleware.js.map +1 -1
  16. package/dist/cjs/preset/node/utils/get-fetch-tracing.js +6 -11
  17. package/dist/cjs/preset/node/utils/get-fetch-tracing.js.map +1 -1
  18. package/dist/cjs/preset/node/utils/telemetry.js +23 -0
  19. package/dist/cjs/preset/node/utils/telemetry.js.map +1 -0
  20. package/dist/cjs/tokens.js +2 -3
  21. package/dist/cjs/tokens.js.map +1 -1
  22. package/dist/esm/package.json +7 -9
  23. package/dist/esm/preset/node/index.js +6 -6
  24. package/dist/esm/preset/node/index.js.map +1 -1
  25. package/dist/esm/preset/node/providers/express-tracing-middleware.js +15 -4
  26. package/dist/esm/preset/node/providers/express-tracing-middleware.js.map +1 -1
  27. package/dist/esm/preset/node/providers/telemetry-tracer-provider.js +19 -0
  28. package/dist/esm/preset/node/providers/telemetry-tracer-provider.js.map +1 -0
  29. package/dist/esm/preset/node/providers/telemetry-tracer-resource.js +21 -0
  30. package/dist/esm/preset/node/providers/telemetry-tracer-resource.js.map +1 -0
  31. package/dist/esm/preset/node/providers/{span-exporter.js → telemetry-tracer-span-exporter.js} +4 -4
  32. package/dist/esm/preset/node/providers/telemetry-tracer-span-exporter.js.map +1 -0
  33. package/dist/esm/preset/node/providers/{tracer.js → telemetry-tracer.js} +2 -2
  34. package/dist/esm/preset/node/providers/telemetry-tracer.js.map +1 -0
  35. package/dist/esm/preset/node/utils/axios-tracing-middleware.js +9 -24
  36. package/dist/esm/preset/node/utils/axios-tracing-middleware.js.map +1 -1
  37. package/dist/esm/preset/node/utils/get-fetch-tracing.js +7 -12
  38. package/dist/esm/preset/node/utils/get-fetch-tracing.js.map +1 -1
  39. package/dist/esm/preset/node/utils/telemetry.js +18 -0
  40. package/dist/esm/preset/node/utils/telemetry.js.map +1 -0
  41. package/dist/esm/tokens.js +2 -3
  42. package/dist/esm/tokens.js.map +1 -1
  43. package/dist/types/preset/node/providers/express-tracing-middleware.d.ts.map +1 -1
  44. package/dist/types/preset/node/providers/telemetry-tracer-provider.d.ts +9 -0
  45. package/dist/types/preset/node/providers/telemetry-tracer-provider.d.ts.map +1 -0
  46. package/dist/types/preset/node/providers/telemetry-tracer-resource.d.ts +9 -0
  47. package/dist/types/preset/node/providers/telemetry-tracer-resource.d.ts.map +1 -0
  48. package/dist/types/preset/node/providers/{span-exporter.d.ts → telemetry-tracer-span-exporter.d.ts} +3 -3
  49. package/dist/types/preset/node/providers/telemetry-tracer-span-exporter.d.ts.map +1 -0
  50. package/dist/types/preset/node/providers/{tracer.d.ts → telemetry-tracer.d.ts} +1 -1
  51. package/dist/types/preset/node/providers/telemetry-tracer.d.ts.map +1 -0
  52. package/dist/types/preset/node/utils/axios-tracing-middleware.d.ts +1 -3
  53. package/dist/types/preset/node/utils/axios-tracing-middleware.d.ts.map +1 -1
  54. package/dist/types/preset/node/utils/emitter-as-target.d.ts +0 -1
  55. package/dist/types/preset/node/utils/emitter-as-target.d.ts.map +1 -1
  56. package/dist/types/preset/node/utils/telemetry.d.ts +8 -0
  57. package/dist/types/preset/node/utils/telemetry.d.ts.map +1 -0
  58. package/dist/types/preset/server/providers/page-helmet.d.ts +1 -0
  59. package/dist/types/preset/server/providers/page-helmet.d.ts.map +1 -1
  60. package/dist/types/preset/server/types.d.ts +1 -0
  61. package/dist/types/preset/server/types.d.ts.map +1 -1
  62. package/dist/types/tokens.d.ts +3 -2
  63. package/dist/types/tokens.d.ts.map +1 -1
  64. package/package.json +8 -29
  65. package/dist/cjs/preset/bun/index.js +0 -80
  66. package/dist/cjs/preset/bun/index.js.map +0 -1
  67. package/dist/cjs/preset/bun/providers/config-source.js +0 -13
  68. package/dist/cjs/preset/bun/providers/config-source.js.map +0 -1
  69. package/dist/cjs/preset/bun/providers/log-handler-sentry.js +0 -26
  70. package/dist/cjs/preset/bun/providers/log-handler-sentry.js.map +0 -1
  71. package/dist/cjs/preset/bun/providers/logger.js +0 -18
  72. package/dist/cjs/preset/bun/providers/logger.js.map +0 -1
  73. package/dist/cjs/preset/bun/providers/serve-metrics.js +0 -25
  74. package/dist/cjs/preset/bun/providers/serve-metrics.js.map +0 -1
  75. package/dist/cjs/preset/bun/providers/serve-middleware.js +0 -29
  76. package/dist/cjs/preset/bun/providers/serve-middleware.js.map +0 -1
  77. package/dist/cjs/preset/bun/providers/service-routes.js +0 -16
  78. package/dist/cjs/preset/bun/providers/service-routes.js.map +0 -1
  79. package/dist/cjs/preset/bun/utils/get-stats-handler.js.map +0 -1
  80. package/dist/cjs/preset/bun-handler/index.js +0 -62
  81. package/dist/cjs/preset/bun-handler/index.js.map +0 -1
  82. package/dist/cjs/preset/bun-handler/providers/accept-type.js +0 -24
  83. package/dist/cjs/preset/bun-handler/providers/accept-type.js.map +0 -1
  84. package/dist/cjs/preset/bun-handler/providers/fetch-middleware.js +0 -30
  85. package/dist/cjs/preset/bun-handler/providers/fetch-middleware.js.map +0 -1
  86. package/dist/cjs/preset/bun-handler/providers/handler-main.js +0 -75
  87. package/dist/cjs/preset/bun-handler/providers/handler-main.js.map +0 -1
  88. package/dist/cjs/preset/bun-handler/providers/specific-params.js +0 -19
  89. package/dist/cjs/preset/bun-handler/providers/specific-params.js.map +0 -1
  90. package/dist/cjs/preset/isomorphic/utils/hide-first-id.js +0 -20
  91. package/dist/cjs/preset/isomorphic/utils/hide-first-id.js.map +0 -1
  92. package/dist/cjs/preset/node/providers/span-exporter.js.map +0 -1
  93. package/dist/cjs/preset/node/providers/tracer-provider-resource.js +0 -26
  94. package/dist/cjs/preset/node/providers/tracer-provider-resource.js.map +0 -1
  95. package/dist/cjs/preset/node/providers/tracer-provider.js.map +0 -1
  96. package/dist/cjs/preset/node/providers/tracer.js.map +0 -1
  97. package/dist/esm/preset/bun/index.js +0 -63
  98. package/dist/esm/preset/bun/index.js.map +0 -1
  99. package/dist/esm/preset/bun/providers/config-source.js +0 -6
  100. package/dist/esm/preset/bun/providers/config-source.js.map +0 -1
  101. package/dist/esm/preset/bun/providers/log-handler-sentry.js +0 -20
  102. package/dist/esm/preset/bun/providers/log-handler-sentry.js.map +0 -1
  103. package/dist/esm/preset/bun/providers/logger.js +0 -12
  104. package/dist/esm/preset/bun/providers/logger.js.map +0 -1
  105. package/dist/esm/preset/bun/providers/serve-metrics.js +0 -18
  106. package/dist/esm/preset/bun/providers/serve-metrics.js.map +0 -1
  107. package/dist/esm/preset/bun/providers/serve-middleware.js +0 -23
  108. package/dist/esm/preset/bun/providers/serve-middleware.js.map +0 -1
  109. package/dist/esm/preset/bun/providers/service-routes.js +0 -10
  110. package/dist/esm/preset/bun/providers/service-routes.js.map +0 -1
  111. package/dist/esm/preset/bun/utils/get-stats-handler.js +0 -22
  112. package/dist/esm/preset/bun/utils/get-stats-handler.js.map +0 -1
  113. package/dist/esm/preset/bun-handler/index.js +0 -57
  114. package/dist/esm/preset/bun-handler/index.js.map +0 -1
  115. package/dist/esm/preset/bun-handler/providers/accept-type.js +0 -18
  116. package/dist/esm/preset/bun-handler/providers/accept-type.js.map +0 -1
  117. package/dist/esm/preset/bun-handler/providers/fetch-middleware.js +0 -24
  118. package/dist/esm/preset/bun-handler/providers/fetch-middleware.js.map +0 -1
  119. package/dist/esm/preset/bun-handler/providers/handler-main.js +0 -66
  120. package/dist/esm/preset/bun-handler/providers/handler-main.js.map +0 -1
  121. package/dist/esm/preset/bun-handler/providers/specific-params.js +0 -13
  122. package/dist/esm/preset/bun-handler/providers/specific-params.js.map +0 -1
  123. package/dist/esm/preset/isomorphic/utils/hide-first-id.js +0 -14
  124. package/dist/esm/preset/isomorphic/utils/hide-first-id.js.map +0 -1
  125. package/dist/esm/preset/node/providers/span-exporter.js.map +0 -1
  126. package/dist/esm/preset/node/providers/tracer-provider-resource.js +0 -20
  127. package/dist/esm/preset/node/providers/tracer-provider-resource.js.map +0 -1
  128. package/dist/esm/preset/node/providers/tracer-provider.js +0 -22
  129. package/dist/esm/preset/node/providers/tracer-provider.js.map +0 -1
  130. package/dist/esm/preset/node/providers/tracer.js.map +0 -1
  131. package/dist/types/preset/bun/index.d.ts +0 -10
  132. package/dist/types/preset/bun/index.d.ts.map +0 -1
  133. package/dist/types/preset/bun/providers/config-source.d.ts +0 -3
  134. package/dist/types/preset/bun/providers/config-source.d.ts.map +0 -1
  135. package/dist/types/preset/bun/providers/log-handler-sentry.d.ts +0 -3
  136. package/dist/types/preset/bun/providers/log-handler-sentry.d.ts.map +0 -1
  137. package/dist/types/preset/bun/providers/logger.d.ts +0 -4
  138. package/dist/types/preset/bun/providers/logger.d.ts.map +0 -1
  139. package/dist/types/preset/bun/providers/serve-metrics.d.ts +0 -3
  140. package/dist/types/preset/bun/providers/serve-metrics.d.ts.map +0 -1
  141. package/dist/types/preset/bun/providers/serve-middleware.d.ts +0 -4
  142. package/dist/types/preset/bun/providers/serve-middleware.d.ts.map +0 -1
  143. package/dist/types/preset/bun/providers/service-routes.d.ts +0 -3
  144. package/dist/types/preset/bun/providers/service-routes.d.ts.map +0 -1
  145. package/dist/types/preset/bun/utils/get-stats-handler.d.ts +0 -7
  146. package/dist/types/preset/bun/utils/get-stats-handler.d.ts.map +0 -1
  147. package/dist/types/preset/bun-handler/index.d.ts +0 -9
  148. package/dist/types/preset/bun-handler/index.d.ts.map +0 -1
  149. package/dist/types/preset/bun-handler/providers/accept-type.d.ts +0 -11
  150. package/dist/types/preset/bun-handler/providers/accept-type.d.ts.map +0 -1
  151. package/dist/types/preset/bun-handler/providers/fetch-middleware.d.ts +0 -4
  152. package/dist/types/preset/bun-handler/providers/fetch-middleware.d.ts.map +0 -1
  153. package/dist/types/preset/bun-handler/providers/handler-main.d.ts +0 -3
  154. package/dist/types/preset/bun-handler/providers/handler-main.d.ts.map +0 -1
  155. package/dist/types/preset/bun-handler/providers/specific-params.d.ts +0 -3
  156. package/dist/types/preset/bun-handler/providers/specific-params.d.ts.map +0 -1
  157. package/dist/types/preset/isomorphic/utils/hide-first-id.d.ts +0 -11
  158. package/dist/types/preset/isomorphic/utils/hide-first-id.d.ts.map +0 -1
  159. package/dist/types/preset/node/providers/span-exporter.d.ts.map +0 -1
  160. package/dist/types/preset/node/providers/tracer-provider-resource.d.ts +0 -9
  161. package/dist/types/preset/node/providers/tracer-provider-resource.d.ts.map +0 -1
  162. package/dist/types/preset/node/providers/tracer-provider.d.ts +0 -9
  163. package/dist/types/preset/node/providers/tracer-provider.d.ts.map +0 -1
  164. package/dist/types/preset/node/providers/tracer.d.ts.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"tokens.js","names":["_di","require","KnownToken","exports","Config","source","createToken","base","cache","logger","Tracing","tracer","spanExporter","tracerProvider","tracerProviderResource","Metrics","expressApp","httpHandler","Http","Api","knownHosts","fetch","Fetch","abortController","middleware","Middleware","Log","handler","serve","Serve","pageRoutes","serviceRoutes","Proxy","config","Handler","main","context","Request","acceptType","specificParams","Response","events","specificExtras","Page","render","assets","helmet","elementToString","formatResponse","Axios","factory","Express","app","endMiddleware","Handlers","healthCheck","request","log","tracing","metrics","error","ExpressHandler","Redux","saga","SsrBridge","clientSide","serverSide"],"sources":["../../src/tokens.ts"],"sourcesContent":["import { createToken } from './di';\n\n// ВАЖНО: чтобы токенами можно было пользоваться независимо от среды исполнения - импортировать надо только типы\nimport type * as express from 'express';\nimport type { ConfigSource, BaseConfig } from './config/types';\nimport type { Logger } from './log/types';\nimport type { Cache } from './cache/types';\nimport type { LogMiddlewareHandlerInit } from './utils/axios/middleware/log';\nimport type { SagaMiddleware } from 'redux-saga';\nimport type { BridgeClientSide, BridgeServerSide } from './utils/ssr';\nimport type { Tracer } from '@opentelemetry/api';\nimport type { BasicTracerProvider, SpanExporter } from '@opentelemetry/sdk-trace-base';\nimport type { Resource } from '@opentelemetry/resources';\nimport type { ElementType, ReactNode, JSX } from 'react';\nimport type { KnownHttpApiKey, PageAssets } from './preset/isomorphic/types';\nimport type { ExpressHandlerContext, ExpressRouteList } from './preset/node/types';\nimport type { SpecificExtras } from './preset/server/utils/specific-extras';\nimport type { CreateAxiosDefaults } from 'axios';\nimport type { AxiosInstanceWrapper, Middleware as AxiosMiddleware } from 'middleware-axios';\nimport type { Handler, LogHandler, LogHandlerFactory, Middleware, ProxyOptions } from './http';\nimport type { HttpApiHostPool } from './preset/isomorphic/utils/http-api-host-pool';\nimport type {\n ServerHandlerContext,\n ServerHandler,\n ServerMiddleware,\n PageResponseFormatter,\n RenderToString,\n RouteList,\n} from './preset/server/types';\n\n/**\n * Токены компонентов.\n * Данные токены используются в DI-пресетах, доступных из пакета.\n */\nexport const KnownToken = {\n /** Токены компонентов конфигурации приложения. */\n Config: {\n /** Токен \"источника конфигурации\". */\n source: createToken<ConfigSource>('config/source'),\n\n /** Токен базовой конфигурации. */\n base: createToken<BaseConfig>('config/base'),\n },\n\n /** Токен компонента кеша. */\n cache: createToken<Cache>('cache'),\n\n /** Токен компонента логгера. */\n logger: createToken<Logger>('logger'),\n\n /** Токены компонентов трассировки и телеметрии. */\n Tracing: {\n tracer: createToken<Tracer>('tracing/tracer'),\n spanExporter: createToken<SpanExporter>('tracing/span-exporter'),\n tracerProvider: createToken<BasicTracerProvider>('tracing/tracer-provider'),\n\n // @todo перенести в KnownToken.Telemetry.Resource?\n tracerProviderResource: createToken<Resource>('tracing/resource'),\n },\n\n /** Токены компонентов сбора метрик. */\n Metrics: {\n expressApp: createToken<express.Application>('metrics/express-app'),\n httpHandler: createToken<Handler>('metrics/http-handler'),\n },\n\n /** Токены компонентов для работы по HTTP. */\n Http: {\n /** Токены компонентов API. */\n Api: {\n /** Токен пула хостов известных HTTP API. */\n knownHosts: createToken<HttpApiHostPool<KnownHttpApiKey>>('http/api/known-hosts'),\n },\n\n /** Токен функции fetch. */\n fetch: createToken<typeof fetch>('fetch'),\n\n /** Токены компонентов формирующих работу функции fetch. */\n Fetch: {\n /** Токен AbortController для функции fetch. */\n abortController: createToken<AbortController>('fetch/abort-controller'),\n\n /** Токен списка промежуточных слоев для функции fetch. */\n middleware: createToken<Middleware[]>('fetch/middleware'),\n\n /** Токены компонентов промежуточных слоев для функции fetch. */\n Middleware: {\n /** Токены компонентов промежуточного слоя логирования. */\n Log: {\n /** Токены обработчика логирования работы функции fetch. */\n handler: createToken<LogHandler | LogHandlerFactory>('fetch/middleware/log/handler'),\n },\n },\n },\n\n /** Токен функции обработки входящего HTTP-запроса. */\n serve: createToken<Handler>('serve'),\n\n /** Токены компонентов функции обработки входящего HTTP-запроса. */\n Serve: {\n /** Токен списка маршрутов. */\n pageRoutes: createToken<RouteList>('serve/page-routes'),\n\n /** Токен списка \"служебных\" маршрутов. К \"служебным\" маршрутам не применяются промежуточные слои. */\n serviceRoutes: createToken<RouteList>('serve/service-routes'),\n\n /** Токен списка промежуточных слоев обработки входящего HTTP-запроса. */\n middleware: createToken<ServerMiddleware[]>('serve/middleware'),\n\n Proxy: {\n config: createToken<null | undefined | ProxyOptions | ProxyOptions[]>('proxy/config'),\n },\n },\n\n /** Токены компонентов обработчиков входящих HTTP-запросов. */\n Handler: {\n /** Токен главной функции (точки входа) обработчика. */\n main: createToken<ServerHandler>('handler/main'),\n\n /** Токен \"контекста\" обработчика. Контекст содержит объект запроса а также реализует EventTarget. */\n context: createToken<ServerHandlerContext & { request: Request }>('handler/context'),\n\n /** Токен компонентов входящего запроса. */\n Request: {\n /** Токен функции которая определяет возможные типы ответа и их приоритет. */\n acceptType: createToken<(types: string[]) => string | string[] | false>('handler/accepts'),\n\n /** Токен \"специфичных\" параметров запроса. В зависимости от реализации определит параметры на основе объекта запроса. */\n specificParams: createToken<Record<string, unknown>>('request/specific-params'),\n },\n\n /** Токены компонентов исходящего ответа. */\n Response: {\n /** Токен объекта для подписки на события и вызова событий ответа. */\n events: createToken<EventTarget>('response/events'),\n\n /** Токен \"специфичных\" дополнительных данных. В зависимости от реализации сформирует дополнительные данные ответа. */\n specificExtras: createToken<SpecificExtras>('response/specific-extras'),\n },\n\n /** Токены компонентов HTML-документа, формируемого в рамках обработчика. */\n Page: {\n /** Токен рендер-функции. */\n render: createToken<() => JSX.Element | Promise<JSX.Element>>('page/render'),\n\n /** Токен ассетов HTML-документа. */\n assets: createToken<PageAssets | (() => PageAssets | Promise<PageAssets>)>('page/assets'),\n\n /** Токен \"шлема\". Шлем - UI-компонент, внутри которого будет выведен результат render-функции. */\n helmet: createToken<ElementType<{ children: ReactNode }>>('page/helmet'),\n\n /** Токен функции, получающей jsx и возвращающей строку. */\n elementToString: createToken<RenderToString>('page/element-to-string'),\n\n /** Токен функции, которая вернёт данные для ответа. */\n formatResponse: createToken<PageResponseFormatter>('page/format-response'),\n },\n },\n },\n\n /** Токены компонентов для работы с библиотекой axios. */\n Axios: {\n /** Токен фабрики экземпляров axios. Фабрика вернет расширенный экземпляр с возможностью применять промежуточные слои. */\n factory: createToken<(config?: CreateAxiosDefaults) => AxiosInstanceWrapper>('axios/factory'),\n\n /** Токен промежуточных слоев. */\n middleware: createToken<AxiosMiddleware<any>[]>('axios/middleware'),\n\n /** Токен компонентов промежуточных слоев. */\n Middleware: {\n /** Токен компонентов слоя логирования. */\n Log: {\n /** Токен обработчика логирования. */\n handler: createToken<LogMiddlewareHandlerInit>('axios/middleware/log/handler'),\n },\n },\n },\n\n /** Токены компонентов для работы с библиотекой express. */\n Express: {\n /** Токен основного express-приложения. */\n app: createToken<express.Application>('express/app'),\n\n /** Токен списка маршрутов страниц. */\n pageRoutes: createToken<ExpressRouteList>('express/page-routes'),\n\n /** Токен списка служебных маршрутов. */\n serviceRoutes: createToken<ExpressRouteList>('express/service-routes'),\n\n /** Токен списка промежуточных слоев для публичных маршрутов. */\n middleware:\n createToken<Array<express.Handler | express.ErrorRequestHandler>>('express/middleware'),\n\n /** Токен списка промежуточных слоев для публичных маршрутов, которые подключаются после обработчика. */\n endMiddleware:\n createToken<Array<express.Handler | express.ErrorRequestHandler>>('express/end-middleware'),\n\n /** Токен фабрики express-приложений. */\n factory: createToken<() => express.Application>('express/factory'),\n\n /** Токен express-обработчиков. */\n Handlers: {\n /** Токен обработчика \"health check\". */\n healthCheck: createToken<express.Handler>('express/handler/health-check'),\n },\n\n /** Токены промежуточных слоев express-приложения. */\n Middleware: {\n request: createToken<express.Handler>('express/middleware/request'),\n log: createToken<express.Handler>('express/middleware/log'),\n tracing: createToken<express.Handler>('express/middleware/tracing'),\n metrics: createToken<express.Handler>('express/middleware/metrics'),\n error: createToken<express.ErrorRequestHandler>('express/middleware/error'),\n },\n },\n\n /** Токены компонентов express-обработчика. */\n ExpressHandler: {\n /** Токен главной функции (точки входа) обработчика. */\n main: createToken<express.Handler>('express-handler/main'),\n\n /** Токен \"контекста\" обработчика. Контекст содержит все аргументы, доступные обработчику (req, res, next). */\n context: createToken<ExpressHandlerContext>('express-handler/context'),\n },\n\n /** Токены компонентов для работы с библиотекой redux. */\n Redux: {\n /** Токены компонентов промежуточных слоев. */\n Middleware: {\n /** Токен промежуточного слоя redux-saga. */\n saga: createToken<SagaMiddleware>('saga-middleware'),\n },\n },\n\n /** Токены компонентов передачи данных страницы между клиентом и сервером. */\n SsrBridge: {\n /** Токены компонента \"клиентской стороны\". */\n clientSide: createToken<BridgeClientSide<unknown>>('ssr-bridge/client-side'),\n\n /** Токены компонента \"серверной стороны\". */\n serverSide: createToken<BridgeServerSide>('ssr-bridge/server-side'),\n },\n} as const;\n"],"mappings":"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"}
1
+ {"version":3,"file":"tokens.js","names":["_di","require","KnownToken","exports","Config","source","createToken","base","cache","logger","Tracing","tracer","spanExporter","provider","resource","Metrics","expressApp","httpHandler","Http","Api","knownHosts","fetch","Fetch","abortController","middleware","Middleware","Log","handler","serve","Serve","pageRoutes","serviceRoutes","Proxy","config","Handler","main","context","Request","acceptType","specificParams","Response","events","specificExtras","Page","render","assets","helmet","elementToString","formatResponse","Axios","factory","Express","app","endMiddleware","Handlers","healthCheck","request","log","tracing","metrics","error","ExpressHandler","Redux","saga","SsrBridge","clientSide","serverSide"],"sources":["../../src/tokens.ts"],"sourcesContent":["import { createToken } from './di';\n\n// ВАЖНО: чтобы токенами можно было пользоваться независимо от среды исполнения - импортировать надо только типы\nimport type * as express from 'express';\nimport type { ConfigSource, BaseConfig } from './config/types';\nimport type { Logger } from './log/types';\nimport type { Cache } from './cache/types';\nimport type { LogMiddlewareHandlerInit } from './utils/axios/middleware/log';\nimport type { SagaMiddleware } from 'redux-saga';\nimport type { BridgeClientSide, BridgeServerSide } from './utils/ssr';\nimport type { Tracer } from '@opentelemetry/api';\nimport type { BasicTracerProvider, SpanExporter } from '@opentelemetry/sdk-trace-base';\nimport type { Resource } from '@opentelemetry/resources';\nimport type { ElementType, ReactNode, JSX } from 'react';\nimport type { KnownHttpApiKey, PageAssets } from './preset/isomorphic/types';\nimport type { ExpressHandlerContext, ExpressRouteList } from './preset/node/types';\nimport type { SpecificExtras } from './preset/server/utils/specific-extras';\nimport type { CreateAxiosDefaults } from 'axios';\nimport type { AxiosInstanceWrapper, Middleware as AxiosMiddleware } from 'middleware-axios';\nimport type { Handler, LogHandler, LogHandlerFactory, Middleware, ProxyOptions } from './http';\nimport type { HttpApiHostPool } from './preset/isomorphic/utils/http-api-host-pool';\nimport type {\n ServerHandlerContext,\n ServerHandler,\n ServerMiddleware,\n PageResponseFormatter,\n RenderToString,\n RouteList,\n} from './preset/server/types';\n\n/**\n * Токены компонентов.\n * Данные токены используются в DI-пресетах, доступных из пакета.\n */\nexport const KnownToken = {\n /** Токены компонентов конфигурации приложения. */\n Config: {\n /** Токен \"источника конфигурации\". */\n source: createToken<ConfigSource>('config/source'),\n\n /** Токен базовой конфигурации. */\n base: createToken<BaseConfig>('config/base'),\n },\n\n /** Токен компонента кеша. */\n cache: createToken<Cache>('cache'),\n\n /** Токен компонента логгера. */\n logger: createToken<Logger>('logger'),\n\n /** Токены компонентов трассировки и телеметрии. */\n Tracing: {\n tracer: createToken<Tracer>('tracing/tracer'),\n spanExporter: createToken<SpanExporter>('tracing/span-exporter'),\n provider: createToken<BasicTracerProvider>('tracing/provider'),\n resource: createToken<Resource>('tracing/resource'),\n },\n\n /** Токены компонентов сбора метрик. */\n Metrics: {\n expressApp: createToken<express.Application>('metrics/express-app'),\n httpHandler: createToken<Handler>('metrics/http-handler'),\n },\n\n /** Токены компонентов для работы по HTTP. */\n Http: {\n /** Токены компонентов API. */\n Api: {\n /** Токен пула хостов известных HTTP API. */\n knownHosts: createToken<HttpApiHostPool<KnownHttpApiKey>>('http/api/known-hosts'),\n },\n\n /** Токен функции fetch. */\n fetch: createToken<typeof fetch>('fetch'),\n\n /** Токены компонентов формирующих работу функции fetch. */\n Fetch: {\n /** Токен AbortController для функции fetch. */\n abortController: createToken<AbortController>('fetch/abort-controller'),\n\n /** Токен списка промежуточных слоев для функции fetch. */\n middleware: createToken<Middleware[]>('fetch/middleware'),\n\n /** Токены компонентов промежуточных слоев для функции fetch. */\n Middleware: {\n /** Токены компонентов промежуточного слоя логирования. */\n Log: {\n /** Токены обработчика логирования работы функции fetch. */\n handler: createToken<LogHandler | LogHandlerFactory>('fetch/middleware/log/handler'),\n },\n },\n },\n\n /** Токен функции обработки входящего HTTP-запроса. */\n serve: createToken<Handler>('serve'),\n\n /** Токены компонентов функции обработки входящего HTTP-запроса. */\n Serve: {\n /** Токен списка маршрутов. */\n pageRoutes: createToken<RouteList>('serve/page-routes'),\n\n /** Токен списка \"служебных\" маршрутов. К \"служебным\" маршрутам не применяются промежуточные слои. */\n serviceRoutes: createToken<RouteList>('serve/service-routes'),\n\n /** Токен списка промежуточных слоев обработки входящего HTTP-запроса. */\n middleware: createToken<ServerMiddleware[]>('serve/middleware'),\n\n Proxy: {\n config: createToken<null | undefined | ProxyOptions | ProxyOptions[]>('proxy/config'),\n },\n },\n\n /** Токены компонентов обработчиков входящих HTTP-запросов. */\n Handler: {\n /** Токен главной функции (точки входа) обработчика. */\n main: createToken<ServerHandler>('handler/main'),\n\n /** Токен \"контекста\" обработчика. Контекст содержит объект запроса а также реализует EventTarget. */\n context: createToken<ServerHandlerContext & { request: Request }>('handler/context'),\n\n /** Токен компонентов входящего запроса. */\n Request: {\n /** Токен функции которая определяет возможные типы ответа и их приоритет. */\n acceptType: createToken<(types: string[]) => string | string[] | false>('handler/accepts'),\n\n /** Токен \"специфичных\" параметров запроса. В зависимости от реализации определит параметры на основе объекта запроса. */\n specificParams: createToken<Record<string, unknown>>('request/specific-params'),\n },\n\n /** Токены компонентов исходящего ответа. */\n Response: {\n /** Токен объекта для подписки на события и вызова событий ответа. */\n events: createToken<EventTarget>('response/events'),\n\n /** Токен \"специфичных\" дополнительных данных. В зависимости от реализации сформирует дополнительные данные ответа. */\n specificExtras: createToken<SpecificExtras>('response/specific-extras'),\n },\n\n /** Токены компонентов HTML-документа, формируемого в рамках обработчика. */\n Page: {\n /** Токен рендер-функции. */\n render: createToken<() => JSX.Element | Promise<JSX.Element>>('page/render'),\n\n /** Токен ассетов HTML-документа. */\n assets: createToken<PageAssets | (() => PageAssets | Promise<PageAssets>)>('page/assets'),\n\n /** Токен \"шлема\". Шлем - UI-компонент, внутри которого будет выведен результат render-функции. */\n helmet: createToken<ElementType<{ children: ReactNode }>>('page/helmet'),\n\n /** Токен функции, получающей jsx и возвращающей строку. */\n elementToString: createToken<RenderToString>('page/element-to-string'),\n\n /** Токен функции, которая вернёт данные для ответа. */\n formatResponse: createToken<PageResponseFormatter>('page/format-response'),\n },\n },\n },\n\n /** Токены компонентов для работы с библиотекой axios. */\n Axios: {\n /** Токен фабрики экземпляров axios. Фабрика вернет расширенный экземпляр с возможностью применять промежуточные слои. */\n factory: createToken<(config?: CreateAxiosDefaults) => AxiosInstanceWrapper>('axios/factory'),\n\n /** Токен промежуточных слоев. */\n middleware: createToken<AxiosMiddleware<any>[]>('axios/middleware'),\n\n /** Токен компонентов промежуточных слоев. */\n Middleware: {\n /** Токен компонентов слоя логирования. */\n Log: {\n /** Токен обработчика логирования. */\n handler: createToken<LogMiddlewareHandlerInit>('axios/middleware/log/handler'),\n },\n },\n },\n\n /** Токены компонентов для работы с библиотекой express. */\n Express: {\n /** Токен основного express-приложения. */\n app: createToken<express.Application>('express/app'),\n\n /** Токен списка маршрутов страниц. */\n pageRoutes: createToken<ExpressRouteList>('express/page-routes'),\n\n /** Токен списка служебных маршрутов. */\n serviceRoutes: createToken<ExpressRouteList>('express/service-routes'),\n\n /** Токен списка промежуточных слоев для публичных маршрутов. */\n middleware:\n createToken<Array<express.Handler | express.ErrorRequestHandler>>('express/middleware'),\n\n /** Токен списка промежуточных слоев для публичных маршрутов, которые подключаются после обработчика. */\n endMiddleware:\n createToken<Array<express.Handler | express.ErrorRequestHandler>>('express/end-middleware'),\n\n /** Токен фабрики express-приложений. */\n factory: createToken<() => express.Application>('express/factory'),\n\n /** Токен express-обработчиков. */\n Handlers: {\n /** Токен обработчика \"health check\". */\n healthCheck: createToken<express.Handler>('express/handler/health-check'),\n },\n\n /** Токены промежуточных слоев express-приложения. */\n Middleware: {\n request: createToken<express.Handler>('express/middleware/request'),\n log: createToken<express.Handler>('express/middleware/log'),\n tracing: createToken<express.Handler>('express/middleware/tracing'),\n metrics: createToken<express.Handler>('express/middleware/metrics'),\n error: createToken<express.ErrorRequestHandler>('express/middleware/error'),\n },\n },\n\n /** Токены компонентов express-обработчика. */\n ExpressHandler: {\n /** Токен главной функции (точки входа) обработчика. */\n main: createToken<express.Handler>('express-handler/main'),\n\n /** Токен \"контекста\" обработчика. Контекст содержит все аргументы, доступные обработчику (req, res, next). */\n context: createToken<ExpressHandlerContext>('express-handler/context'),\n },\n\n /** Токены компонентов для работы с библиотекой redux. */\n Redux: {\n /** Токены компонентов промежуточных слоев. */\n Middleware: {\n /** Токен промежуточного слоя redux-saga. */\n saga: createToken<SagaMiddleware>('saga-middleware'),\n },\n },\n\n /** Токены компонентов передачи данных страницы между клиентом и сервером. */\n SsrBridge: {\n /** Токены компонента \"клиентской стороны\". */\n clientSide: createToken<BridgeClientSide<unknown>>('ssr-bridge/client-side'),\n\n /** Токены компонента \"серверной стороны\". */\n serverSide: createToken<BridgeServerSide>('ssr-bridge/server-side'),\n },\n} as const;\n"],"mappings":"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"}
@@ -1,21 +1,19 @@
1
1
  {
2
2
  "type": "module",
3
3
  "name": "@sima-land/isomorph",
4
- "version": "11.0.0-alpha.53",
4
+ "version": "11.0.0-alpha.54",
5
5
  "dependencies": {
6
6
  "@humanwhocodes/env": "^3.0.5",
7
7
  "@krutoo/fetch-tools": "^0.0.16",
8
8
  "@opentelemetry/api": "^1.9.0",
9
9
  "@opentelemetry/exporter-prometheus": "^0.52.1",
10
- "@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
11
- "@opentelemetry/propagator-jaeger": "^1.25.1",
12
- "@opentelemetry/resources": "^1.25.1",
13
- "@opentelemetry/sdk-metrics": "^1.25.1",
14
- "@opentelemetry/sdk-trace-base": "^1.25.1",
15
- "@opentelemetry/sdk-trace-node": "^1.25.1",
16
- "@opentelemetry/semantic-conventions": "^1.25.1",
10
+ "@opentelemetry/exporter-trace-otlp-grpc": "^0.56.0",
11
+ "@opentelemetry/resources": "^1.30.1",
12
+ "@opentelemetry/sdk-metrics": "^1.30.1",
13
+ "@opentelemetry/sdk-trace-base": "^1.30.1",
14
+ "@opentelemetry/sdk-trace-node": "^1.30.1",
15
+ "@opentelemetry/semantic-conventions": "1.28.0",
17
16
  "@sentry/browser": "^8.33.1",
18
- "@sentry/bun": "^8.33.1",
19
17
  "@sentry/node": "^8.33.1",
20
18
  "accepts": "^1.3.8",
21
19
  "dotenv": "^16.3.1",
@@ -14,11 +14,11 @@ import { provideExpressTracingMiddleware } from "./providers/express-tracing-mid
14
14
  import { provideKnownHttpApiHosts } from "../server/providers/known-http-api-hosts.js";
15
15
  import { provideLogger } from "./providers/logger.js";
16
16
  import { provideMetricsExpressApp } from "./providers/metrics-express-app.js";
17
- import { provideSpanExporter } from "./providers/span-exporter.js";
17
+ import { provideTracer } from "./providers/telemetry-tracer.js";
18
+ import { provideSpanExporter } from "./providers/telemetry-tracer-span-exporter.js";
18
19
  import { provideSsrBridgeServerSide } from "../server/providers/ssr-bridge-server-side.js";
19
- import { provideTracer } from "./providers/tracer.js";
20
- import { provideTracerProvider } from "./providers/tracer-provider.js";
21
- import { provideTracerProviderResource } from "./providers/tracer-provider-resource.js";
20
+ import { provideTracingProvider } from "./providers/telemetry-tracer-provider.js";
21
+ import { provideTracingResource } from "./providers/telemetry-tracer-resource.js";
22
22
  import { provideMainExpressApp } from "./providers/main-express-app.js";
23
23
  /**
24
24
  * Возвращает preset с зависимостями по умолчанию для frontend-микросервисов на Node.js.
@@ -39,8 +39,8 @@ export function PresetNode(customize) {
39
39
  // tracing
40
40
  preset.set(KnownToken.Tracing.tracer, provideTracer);
41
41
  preset.set(KnownToken.Tracing.spanExporter, provideSpanExporter);
42
- preset.set(KnownToken.Tracing.tracerProvider, provideTracerProvider);
43
- preset.set(KnownToken.Tracing.tracerProviderResource, provideTracerProviderResource);
42
+ preset.set(KnownToken.Tracing.provider, provideTracingProvider);
43
+ preset.set(KnownToken.Tracing.resource, provideTracingResource);
44
44
 
45
45
  // metrics
46
46
  preset.set(KnownToken.Metrics.expressApp, provideMetricsExpressApp);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","names":["KnownToken","provideAxiosFactory","provideFetch","provideBaseConfig","createPreset","healthCheck","provideConfigSource","provideExpressErrorMiddleware","provideExpressFactory","provideExpressLogMiddleware","provideExpressMetricsMiddleware","provideExpressRequestMiddleware","provideExpressTracingMiddleware","provideKnownHttpApiHosts","provideLogger","provideMetricsExpressApp","provideSpanExporter","provideSsrBridgeServerSide","provideTracer","provideTracerProvider","provideTracerProviderResource","provideMainExpressApp","PresetNode","customize","preset","set","Config","source","base","logger","Tracing","tracer","spanExporter","tracerProvider","tracerProviderResource","Metrics","expressApp","Http","fetch","Fetch","middleware","Serve","Proxy","config","Axios","factory","Express","app","pageRoutes","serviceRoutes","resolve","Handlers","Middleware","request","log","metrics","tracing","endMiddleware","error","Api","knownHosts","SsrBridge","serverSide","override","bind","getClientIp","getForwardedHeaders","getPageResponseFormat","HandlerProvider"],"sources":["../../../../src/preset/node/index.ts"],"sourcesContent":["import { KnownToken } from '../../tokens';\nimport { provideAxiosFactory } from '../isomorphic/providers/axios-factory';\nimport { provideFetch } from '../isomorphic/providers/fetch';\nimport { provideBaseConfig } from '../isomorphic/providers/base-config';\nimport { Preset, createPreset } from '../../di';\nimport { PresetTuner } from '../isomorphic/types';\nimport { healthCheck } from '../../utils/express/handler/health-check';\nimport { provideConfigSource } from './providers/config-source';\nimport { provideExpressErrorMiddleware } from './providers/express-error-middleware';\nimport { provideExpressFactory } from './providers/express-factory';\nimport { provideExpressLogMiddleware } from './providers/express-log-middleware';\nimport { provideExpressMetricsMiddleware } from './providers/express-metrics-middleware';\nimport { provideExpressRequestMiddleware } from './providers/express-request-middleware';\nimport { provideExpressTracingMiddleware } from './providers/express-tracing-middleware';\nimport { provideKnownHttpApiHosts } from '../server/providers/known-http-api-hosts';\nimport { provideLogger } from './providers/logger';\nimport { provideMetricsExpressApp } from './providers/metrics-express-app';\nimport { provideSpanExporter } from './providers/span-exporter';\nimport { provideSsrBridgeServerSide } from '../server/providers/ssr-bridge-server-side';\nimport { provideTracer } from './providers/tracer';\nimport { provideTracerProvider } from './providers/tracer-provider';\nimport { provideTracerProviderResource } from './providers/tracer-provider-resource';\nimport { provideMainExpressApp } from './providers/main-express-app';\nimport { ExpressRouteList } from './types';\n\n/**\n * Возвращает preset с зависимостями по умолчанию для frontend-микросервисов на Node.js.\n * @param customize Получит функцию с помощью которой можно переопределить предустановленные провайдеры.\n * @return Preset.\n */\nexport function PresetNode(customize?: PresetTuner): Preset {\n // ВАЖНО: используем .set() вместо аргумента defaults функции createPreset из-за скорости\n const preset = createPreset();\n\n // config\n preset.set(KnownToken.Config.source, provideConfigSource);\n preset.set(KnownToken.Config.base, provideBaseConfig);\n\n // log\n preset.set(KnownToken.logger, provideLogger);\n\n // tracing\n preset.set(KnownToken.Tracing.tracer, provideTracer);\n preset.set(KnownToken.Tracing.spanExporter, provideSpanExporter);\n preset.set(KnownToken.Tracing.tracerProvider, provideTracerProvider);\n preset.set(KnownToken.Tracing.tracerProviderResource, provideTracerProviderResource);\n\n // metrics\n preset.set(KnownToken.Metrics.expressApp, provideMetricsExpressApp);\n\n // fetch\n preset.set(KnownToken.Http.fetch, provideFetch);\n preset.set(KnownToken.Http.Fetch.middleware, () => []);\n preset.set(KnownToken.Http.Serve.Proxy.config, () => null);\n\n // axios\n preset.set(KnownToken.Axios.factory, provideAxiosFactory);\n preset.set(KnownToken.Axios.middleware, () => []);\n\n // express\n preset.set(KnownToken.Express.app, provideMainExpressApp);\n preset.set(KnownToken.Express.pageRoutes, () => []);\n preset.set(\n KnownToken.Express.serviceRoutes,\n (resolve): ExpressRouteList => [\n ['/healthcheck', resolve(KnownToken.Express.Handlers.healthCheck)],\n ],\n );\n preset.set(KnownToken.Express.middleware, resolve => [\n resolve(KnownToken.Express.Middleware.request),\n resolve(KnownToken.Express.Middleware.log),\n resolve(KnownToken.Express.Middleware.metrics),\n resolve(KnownToken.Express.Middleware.tracing),\n ]);\n preset.set(KnownToken.Express.endMiddleware, resolve => [\n resolve(KnownToken.Express.Middleware.error),\n ]);\n preset.set(KnownToken.Express.factory, provideExpressFactory);\n preset.set(KnownToken.Express.Handlers.healthCheck, healthCheck);\n preset.set(KnownToken.Express.Middleware.request, provideExpressRequestMiddleware);\n preset.set(KnownToken.Express.Middleware.log, provideExpressLogMiddleware);\n preset.set(KnownToken.Express.Middleware.metrics, provideExpressMetricsMiddleware);\n preset.set(KnownToken.Express.Middleware.tracing, provideExpressTracingMiddleware);\n preset.set(KnownToken.Express.Middleware.error, provideExpressErrorMiddleware);\n\n // http api\n preset.set(KnownToken.Http.Api.knownHosts, provideKnownHttpApiHosts);\n\n // ssr bridge\n preset.set(KnownToken.SsrBridge.serverSide, provideSsrBridgeServerSide);\n\n if (customize) {\n customize({ override: preset.set.bind(preset) });\n }\n\n return preset;\n}\n\nexport type { ExpressHandlerContext, ExpressRouteList } from './types';\n\n// доступные утилиты\nexport { getClientIp } from './utils/get-client-ip';\nexport { getForwardedHeaders } from './utils/get-forwarded-headers';\nexport { getPageResponseFormat } from './utils/get-page-response-format';\nexport { HandlerProvider } from './utils/handler-provider';\n"],"mappings":"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"}
1
+ {"version":3,"file":"index.js","names":["KnownToken","provideAxiosFactory","provideFetch","provideBaseConfig","createPreset","healthCheck","provideConfigSource","provideExpressErrorMiddleware","provideExpressFactory","provideExpressLogMiddleware","provideExpressMetricsMiddleware","provideExpressRequestMiddleware","provideExpressTracingMiddleware","provideKnownHttpApiHosts","provideLogger","provideMetricsExpressApp","provideTracer","provideSpanExporter","provideSsrBridgeServerSide","provideTracingProvider","provideTracingResource","provideMainExpressApp","PresetNode","customize","preset","set","Config","source","base","logger","Tracing","tracer","spanExporter","provider","resource","Metrics","expressApp","Http","fetch","Fetch","middleware","Serve","Proxy","config","Axios","factory","Express","app","pageRoutes","serviceRoutes","resolve","Handlers","Middleware","request","log","metrics","tracing","endMiddleware","error","Api","knownHosts","SsrBridge","serverSide","override","bind","getClientIp","getForwardedHeaders","getPageResponseFormat","HandlerProvider"],"sources":["../../../../src/preset/node/index.ts"],"sourcesContent":["import { KnownToken } from '../../tokens';\nimport { provideAxiosFactory } from '../isomorphic/providers/axios-factory';\nimport { provideFetch } from '../isomorphic/providers/fetch';\nimport { provideBaseConfig } from '../isomorphic/providers/base-config';\nimport { Preset, createPreset } from '../../di';\nimport { PresetTuner } from '../isomorphic/types';\nimport { healthCheck } from '../../utils/express/handler/health-check';\nimport { provideConfigSource } from './providers/config-source';\nimport { provideExpressErrorMiddleware } from './providers/express-error-middleware';\nimport { provideExpressFactory } from './providers/express-factory';\nimport { provideExpressLogMiddleware } from './providers/express-log-middleware';\nimport { provideExpressMetricsMiddleware } from './providers/express-metrics-middleware';\nimport { provideExpressRequestMiddleware } from './providers/express-request-middleware';\nimport { provideExpressTracingMiddleware } from './providers/express-tracing-middleware';\nimport { provideKnownHttpApiHosts } from '../server/providers/known-http-api-hosts';\nimport { provideLogger } from './providers/logger';\nimport { provideMetricsExpressApp } from './providers/metrics-express-app';\nimport { provideTracer } from './providers/telemetry-tracer';\nimport { provideSpanExporter } from './providers/telemetry-tracer-span-exporter';\nimport { provideSsrBridgeServerSide } from '../server/providers/ssr-bridge-server-side';\nimport { provideTracingProvider } from './providers/telemetry-tracer-provider';\nimport { provideTracingResource } from './providers/telemetry-tracer-resource';\nimport { provideMainExpressApp } from './providers/main-express-app';\nimport { ExpressRouteList } from './types';\n\n/**\n * Возвращает preset с зависимостями по умолчанию для frontend-микросервисов на Node.js.\n * @param customize Получит функцию с помощью которой можно переопределить предустановленные провайдеры.\n * @return Preset.\n */\nexport function PresetNode(customize?: PresetTuner): Preset {\n // ВАЖНО: используем .set() вместо аргумента defaults функции createPreset из-за скорости\n const preset = createPreset();\n\n // config\n preset.set(KnownToken.Config.source, provideConfigSource);\n preset.set(KnownToken.Config.base, provideBaseConfig);\n\n // log\n preset.set(KnownToken.logger, provideLogger);\n\n // tracing\n preset.set(KnownToken.Tracing.tracer, provideTracer);\n preset.set(KnownToken.Tracing.spanExporter, provideSpanExporter);\n preset.set(KnownToken.Tracing.provider, provideTracingProvider);\n preset.set(KnownToken.Tracing.resource, provideTracingResource);\n\n // metrics\n preset.set(KnownToken.Metrics.expressApp, provideMetricsExpressApp);\n\n // fetch\n preset.set(KnownToken.Http.fetch, provideFetch);\n preset.set(KnownToken.Http.Fetch.middleware, () => []);\n preset.set(KnownToken.Http.Serve.Proxy.config, () => null);\n\n // axios\n preset.set(KnownToken.Axios.factory, provideAxiosFactory);\n preset.set(KnownToken.Axios.middleware, () => []);\n\n // express\n preset.set(KnownToken.Express.app, provideMainExpressApp);\n preset.set(KnownToken.Express.pageRoutes, () => []);\n preset.set(\n KnownToken.Express.serviceRoutes,\n (resolve): ExpressRouteList => [\n ['/healthcheck', resolve(KnownToken.Express.Handlers.healthCheck)],\n ],\n );\n preset.set(KnownToken.Express.middleware, resolve => [\n resolve(KnownToken.Express.Middleware.request),\n resolve(KnownToken.Express.Middleware.log),\n resolve(KnownToken.Express.Middleware.metrics),\n resolve(KnownToken.Express.Middleware.tracing),\n ]);\n preset.set(KnownToken.Express.endMiddleware, resolve => [\n resolve(KnownToken.Express.Middleware.error),\n ]);\n preset.set(KnownToken.Express.factory, provideExpressFactory);\n preset.set(KnownToken.Express.Handlers.healthCheck, healthCheck);\n preset.set(KnownToken.Express.Middleware.request, provideExpressRequestMiddleware);\n preset.set(KnownToken.Express.Middleware.log, provideExpressLogMiddleware);\n preset.set(KnownToken.Express.Middleware.metrics, provideExpressMetricsMiddleware);\n preset.set(KnownToken.Express.Middleware.tracing, provideExpressTracingMiddleware);\n preset.set(KnownToken.Express.Middleware.error, provideExpressErrorMiddleware);\n\n // http api\n preset.set(KnownToken.Http.Api.knownHosts, provideKnownHttpApiHosts);\n\n // ssr bridge\n preset.set(KnownToken.SsrBridge.serverSide, provideSsrBridgeServerSide);\n\n if (customize) {\n customize({ override: preset.set.bind(preset) });\n }\n\n return preset;\n}\n\nexport type { ExpressHandlerContext, ExpressRouteList } from './types';\n\n// доступные утилиты\nexport { getClientIp } from './utils/get-client-ip';\nexport { getForwardedHeaders } from './utils/get-forwarded-headers';\nexport { getPageResponseFormat } from './utils/get-page-response-format';\nexport { HandlerProvider } from './utils/handler-provider';\n"],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import { KnownToken } from "../../../tokens.js";
2
2
  import { ROOT_CONTEXT, propagation, trace } from '@opentelemetry/api';
3
3
  import { PAGE_HANDLER_EVENT_TYPE } from "./../../server/index.js";
4
+ import { ATTR_ERROR_TYPE, ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_RESPONSE_BODY_SIZE, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_URL_PATH } from '@opentelemetry/semantic-conventions/incubating';
4
5
 
5
6
  /**
6
7
  * Провайдер промежуточного слоя трассировки входящих http-запросов.
@@ -17,18 +18,18 @@ export function provideExpressTracingMiddleware(resolve) {
17
18
  */
18
19
  const getConventionalRequestAttrs = req => {
19
20
  const result = {
20
- 'request.path': req.originalUrl
21
+ [ATTR_URL_PATH]: req.originalUrl
21
22
  };
22
23
  for (const headerName in req.headers) {
23
24
  if (headerName.toLowerCase().startsWith('simaland-')) {
24
- result[headerName] = req.header(headerName);
25
+ result[`${ATTR_HTTP_REQUEST_HEADER(headerName)}`] = req.header(headerName);
25
26
  }
26
27
  }
27
28
  return result;
28
29
  };
29
30
  return (req, res, next) => {
30
31
  const externalContext = propagation.extract(ROOT_CONTEXT, req.headers);
31
- const rootSpan = tracer.startSpan('response', undefined, externalContext);
32
+ const rootSpan = tracer.startSpan(`${req.method} ${req.path}`, undefined, externalContext);
32
33
  rootSpan.setAttributes(getConventionalRequestAttrs(req));
33
34
  const rootContext = trace.setSpan(externalContext, rootSpan);
34
35
  res.locals.tracing = {
@@ -37,12 +38,22 @@ export function provideExpressTracingMiddleware(resolve) {
37
38
  renderSpan: null
38
39
  };
39
40
  res.once(PAGE_HANDLER_EVENT_TYPE.renderStart, () => {
40
- res.locals.tracing.renderSpan = tracer.startSpan('render', undefined, rootContext);
41
+ res.locals.tracing.renderSpan = tracer.startSpan('react:renderToString', undefined, rootContext);
41
42
  res.once(PAGE_HANDLER_EVENT_TYPE.renderFinish, () => {
42
43
  res.locals.tracing.renderSpan.end();
43
44
  });
44
45
  });
45
46
  res.once('finish', () => {
47
+ const contentLength = res.getHeader('content-length');
48
+ rootSpan.setAttributes({
49
+ [ATTR_HTTP_RESPONSE_STATUS_CODE]: String(res.statusCode),
50
+ ...(res.statusCode > 400 && {
51
+ [ATTR_ERROR_TYPE]: String(res.statusCode)
52
+ }),
53
+ ...(contentLength && {
54
+ [ATTR_HTTP_RESPONSE_BODY_SIZE]: contentLength
55
+ })
56
+ });
46
57
  rootSpan.end();
47
58
  });
48
59
  next();
@@ -1 +1 @@
1
- {"version":3,"file":"express-tracing-middleware.js","names":["KnownToken","ROOT_CONTEXT","propagation","trace","PAGE_HANDLER_EVENT_TYPE","provideExpressTracingMiddleware","resolve","tracer","Tracing","getConventionalRequestAttrs","req","result","originalUrl","headerName","headers","toLowerCase","startsWith","header","res","next","externalContext","extract","rootSpan","startSpan","undefined","setAttributes","rootContext","setSpan","locals","tracing","renderSpan","once","renderStart","renderFinish","end"],"sources":["../../../../../src/preset/node/providers/express-tracing-middleware.ts"],"sourcesContent":["import type express from 'express';\nimport type { Resolve } from '../../../di';\nimport { KnownToken } from '../../../tokens';\nimport { ROOT_CONTEXT, propagation, trace } from '@opentelemetry/api';\nimport { PAGE_HANDLER_EVENT_TYPE } from '../../server';\n\n/**\n * Провайдер промежуточного слоя трассировки входящих http-запросов.\n * @param resolve Функция для получения зависимости по токену.\n * @return Промежуточный слой.\n */\nexport function provideExpressTracingMiddleware(resolve: Resolve): express.Handler {\n const tracer = resolve(KnownToken.Tracing.tracer);\n\n /**\n * Возвращает набор стандартных атрибутов для спана.\n * @param req Входящий http-запрос.\n * @return Атрибуты.\n */\n const getConventionalRequestAttrs = (\n req: express.Request,\n ): Record<string, string | undefined> => {\n const result: Record<string, string | undefined> = {\n 'request.path': req.originalUrl,\n };\n\n for (const headerName in req.headers) {\n if (headerName.toLowerCase().startsWith('simaland-')) {\n result[headerName] = req.header(headerName);\n }\n }\n\n return result;\n };\n\n return (req, res, next) => {\n const externalContext = propagation.extract(ROOT_CONTEXT, req.headers);\n const rootSpan = tracer.startSpan('response', undefined, externalContext);\n\n rootSpan.setAttributes(getConventionalRequestAttrs(req));\n\n const rootContext = trace.setSpan(externalContext, rootSpan);\n\n res.locals.tracing = {\n rootSpan,\n rootContext,\n renderSpan: null,\n };\n\n res.once(PAGE_HANDLER_EVENT_TYPE.renderStart, () => {\n res.locals.tracing.renderSpan = tracer.startSpan('render', undefined, rootContext);\n\n res.once(PAGE_HANDLER_EVENT_TYPE.renderFinish, () => {\n res.locals.tracing.renderSpan.end();\n });\n });\n\n res.once('finish', () => {\n rootSpan.end();\n });\n\n next();\n };\n}\n"],"mappings":"AAEA,SAASA,UAAU,QAAQ,oBAAiB;AAC5C,SAASC,YAAY,EAAEC,WAAW,EAAEC,KAAK,QAAQ,oBAAoB;AACrE,SAASC,uBAAuB,QAAQ,yBAAc;;AAEtD;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,+BAA+BA,CAACC,OAAgB,EAAmB;EACjF,MAAMC,MAAM,GAAGD,OAAO,CAACN,UAAU,CAACQ,OAAO,CAACD,MAAM,CAAC;;EAEjD;AACF;AACA;AACA;AACA;EACE,MAAME,2BAA2B,GAC/BC,GAAoB,IACmB;IACvC,MAAMC,MAA0C,GAAG;MACjD,cAAc,EAAED,GAAG,CAACE;IACtB,CAAC;IAED,KAAK,MAAMC,UAAU,IAAIH,GAAG,CAACI,OAAO,EAAE;MACpC,IAAID,UAAU,CAACE,WAAW,CAAC,CAAC,CAACC,UAAU,CAAC,WAAW,CAAC,EAAE;QACpDL,MAAM,CAACE,UAAU,CAAC,GAAGH,GAAG,CAACO,MAAM,CAACJ,UAAU,CAAC;MAC7C;IACF;IAEA,OAAOF,MAAM;EACf,CAAC;EAED,OAAO,CAACD,GAAG,EAAEQ,GAAG,EAAEC,IAAI,KAAK;IACzB,MAAMC,eAAe,GAAGlB,WAAW,CAACmB,OAAO,CAACpB,YAAY,EAAES,GAAG,CAACI,OAAO,CAAC;IACtE,MAAMQ,QAAQ,GAAGf,MAAM,CAACgB,SAAS,CAAC,UAAU,EAAEC,SAAS,EAAEJ,eAAe,CAAC;IAEzEE,QAAQ,CAACG,aAAa,CAAChB,2BAA2B,CAACC,GAAG,CAAC,CAAC;IAExD,MAAMgB,WAAW,GAAGvB,KAAK,CAACwB,OAAO,CAACP,eAAe,EAAEE,QAAQ,CAAC;IAE5DJ,GAAG,CAACU,MAAM,CAACC,OAAO,GAAG;MACnBP,QAAQ;MACRI,WAAW;MACXI,UAAU,EAAE;IACd,CAAC;IAEDZ,GAAG,CAACa,IAAI,CAAC3B,uBAAuB,CAAC4B,WAAW,EAAE,MAAM;MAClDd,GAAG,CAACU,MAAM,CAACC,OAAO,CAACC,UAAU,GAAGvB,MAAM,CAACgB,SAAS,CAAC,QAAQ,EAAEC,SAAS,EAAEE,WAAW,CAAC;MAElFR,GAAG,CAACa,IAAI,CAAC3B,uBAAuB,CAAC6B,YAAY,EAAE,MAAM;QACnDf,GAAG,CAACU,MAAM,CAACC,OAAO,CAACC,UAAU,CAACI,GAAG,CAAC,CAAC;MACrC,CAAC,CAAC;IACJ,CAAC,CAAC;IAEFhB,GAAG,CAACa,IAAI,CAAC,QAAQ,EAAE,MAAM;MACvBT,QAAQ,CAACY,GAAG,CAAC,CAAC;IAChB,CAAC,CAAC;IAEFf,IAAI,CAAC,CAAC;EACR,CAAC;AACH"}
1
+ {"version":3,"file":"express-tracing-middleware.js","names":["KnownToken","ROOT_CONTEXT","propagation","trace","PAGE_HANDLER_EVENT_TYPE","ATTR_ERROR_TYPE","ATTR_HTTP_REQUEST_HEADER","ATTR_HTTP_RESPONSE_BODY_SIZE","ATTR_HTTP_RESPONSE_STATUS_CODE","ATTR_URL_PATH","provideExpressTracingMiddleware","resolve","tracer","Tracing","getConventionalRequestAttrs","req","result","originalUrl","headerName","headers","toLowerCase","startsWith","header","res","next","externalContext","extract","rootSpan","startSpan","method","path","undefined","setAttributes","rootContext","setSpan","locals","tracing","renderSpan","once","renderStart","renderFinish","end","contentLength","getHeader","String","statusCode"],"sources":["../../../../../src/preset/node/providers/express-tracing-middleware.ts"],"sourcesContent":["import type express from 'express';\nimport type { Resolve } from '../../../di';\nimport { KnownToken } from '../../../tokens';\nimport { Attributes, ROOT_CONTEXT, propagation, trace } from '@opentelemetry/api';\nimport { PAGE_HANDLER_EVENT_TYPE } from '../../server';\nimport {\n ATTR_ERROR_TYPE,\n ATTR_HTTP_REQUEST_HEADER,\n ATTR_HTTP_RESPONSE_BODY_SIZE,\n ATTR_HTTP_RESPONSE_STATUS_CODE,\n ATTR_URL_PATH,\n} from '@opentelemetry/semantic-conventions/incubating';\n\n/**\n * Провайдер промежуточного слоя трассировки входящих http-запросов.\n * @param resolve Функция для получения зависимости по токену.\n * @return Промежуточный слой.\n */\nexport function provideExpressTracingMiddleware(resolve: Resolve): express.Handler {\n const tracer = resolve(KnownToken.Tracing.tracer);\n\n /**\n * Возвращает набор стандартных атрибутов для спана.\n * @param req Входящий http-запрос.\n * @return Атрибуты.\n */\n const getConventionalRequestAttrs = (req: express.Request): Attributes => {\n const result: Attributes = {\n [ATTR_URL_PATH]: req.originalUrl,\n };\n\n for (const headerName in req.headers) {\n if (headerName.toLowerCase().startsWith('simaland-')) {\n result[`${ATTR_HTTP_REQUEST_HEADER(headerName)}`] = req.header(headerName);\n }\n }\n\n return result;\n };\n\n return (req, res, next) => {\n const externalContext = propagation.extract(ROOT_CONTEXT, req.headers);\n const rootSpan = tracer.startSpan(`${req.method} ${req.path}`, undefined, externalContext);\n\n rootSpan.setAttributes(getConventionalRequestAttrs(req));\n\n const rootContext = trace.setSpan(externalContext, rootSpan);\n\n res.locals.tracing = {\n rootSpan,\n rootContext,\n renderSpan: null,\n };\n\n res.once(PAGE_HANDLER_EVENT_TYPE.renderStart, () => {\n res.locals.tracing.renderSpan = tracer.startSpan(\n 'react:renderToString',\n undefined,\n rootContext,\n );\n\n res.once(PAGE_HANDLER_EVENT_TYPE.renderFinish, () => {\n res.locals.tracing.renderSpan.end();\n });\n });\n\n res.once('finish', () => {\n const contentLength = res.getHeader('content-length') as string;\n rootSpan.setAttributes({\n [ATTR_HTTP_RESPONSE_STATUS_CODE]: String(res.statusCode),\n ...(res.statusCode > 400 && { [ATTR_ERROR_TYPE]: String(res.statusCode) }),\n ...(contentLength && { [ATTR_HTTP_RESPONSE_BODY_SIZE]: contentLength }),\n });\n rootSpan.end();\n });\n\n next();\n };\n}\n"],"mappings":"AAEA,SAASA,UAAU,QAAQ,oBAAiB;AAC5C,SAAqBC,YAAY,EAAEC,WAAW,EAAEC,KAAK,QAAQ,oBAAoB;AACjF,SAASC,uBAAuB,QAAQ,yBAAc;AACtD,SACEC,eAAe,EACfC,wBAAwB,EACxBC,4BAA4B,EAC5BC,8BAA8B,EAC9BC,aAAa,QACR,gDAAgD;;AAEvD;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,+BAA+BA,CAACC,OAAgB,EAAmB;EACjF,MAAMC,MAAM,GAAGD,OAAO,CAACX,UAAU,CAACa,OAAO,CAACD,MAAM,CAAC;;EAEjD;AACF;AACA;AACA;AACA;EACE,MAAME,2BAA2B,GAAIC,GAAoB,IAAiB;IACxE,MAAMC,MAAkB,GAAG;MACzB,CAACP,aAAa,GAAGM,GAAG,CAACE;IACvB,CAAC;IAED,KAAK,MAAMC,UAAU,IAAIH,GAAG,CAACI,OAAO,EAAE;MACpC,IAAID,UAAU,CAACE,WAAW,CAAC,CAAC,CAACC,UAAU,CAAC,WAAW,CAAC,EAAE;QACpDL,MAAM,CAAE,GAAEV,wBAAwB,CAACY,UAAU,CAAE,EAAC,CAAC,GAAGH,GAAG,CAACO,MAAM,CAACJ,UAAU,CAAC;MAC5E;IACF;IAEA,OAAOF,MAAM;EACf,CAAC;EAED,OAAO,CAACD,GAAG,EAAEQ,GAAG,EAAEC,IAAI,KAAK;IACzB,MAAMC,eAAe,GAAGvB,WAAW,CAACwB,OAAO,CAACzB,YAAY,EAAEc,GAAG,CAACI,OAAO,CAAC;IACtE,MAAMQ,QAAQ,GAAGf,MAAM,CAACgB,SAAS,CAAE,GAAEb,GAAG,CAACc,MAAO,IAAGd,GAAG,CAACe,IAAK,EAAC,EAAEC,SAAS,EAAEN,eAAe,CAAC;IAE1FE,QAAQ,CAACK,aAAa,CAAClB,2BAA2B,CAACC,GAAG,CAAC,CAAC;IAExD,MAAMkB,WAAW,GAAG9B,KAAK,CAAC+B,OAAO,CAACT,eAAe,EAAEE,QAAQ,CAAC;IAE5DJ,GAAG,CAACY,MAAM,CAACC,OAAO,GAAG;MACnBT,QAAQ;MACRM,WAAW;MACXI,UAAU,EAAE;IACd,CAAC;IAEDd,GAAG,CAACe,IAAI,CAAClC,uBAAuB,CAACmC,WAAW,EAAE,MAAM;MAClDhB,GAAG,CAACY,MAAM,CAACC,OAAO,CAACC,UAAU,GAAGzB,MAAM,CAACgB,SAAS,CAC9C,sBAAsB,EACtBG,SAAS,EACTE,WACF,CAAC;MAEDV,GAAG,CAACe,IAAI,CAAClC,uBAAuB,CAACoC,YAAY,EAAE,MAAM;QACnDjB,GAAG,CAACY,MAAM,CAACC,OAAO,CAACC,UAAU,CAACI,GAAG,CAAC,CAAC;MACrC,CAAC,CAAC;IACJ,CAAC,CAAC;IAEFlB,GAAG,CAACe,IAAI,CAAC,QAAQ,EAAE,MAAM;MACvB,MAAMI,aAAa,GAAGnB,GAAG,CAACoB,SAAS,CAAC,gBAAgB,CAAW;MAC/DhB,QAAQ,CAACK,aAAa,CAAC;QACrB,CAACxB,8BAA8B,GAAGoC,MAAM,CAACrB,GAAG,CAACsB,UAAU,CAAC;QACxD,IAAItB,GAAG,CAACsB,UAAU,GAAG,GAAG,IAAI;UAAE,CAACxC,eAAe,GAAGuC,MAAM,CAACrB,GAAG,CAACsB,UAAU;QAAE,CAAC,CAAC;QAC1E,IAAIH,aAAa,IAAI;UAAE,CAACnC,4BAA4B,GAAGmC;QAAc,CAAC;MACxE,CAAC,CAAC;MACFf,QAAQ,CAACc,GAAG,CAAC,CAAC;IAChB,CAAC,CAAC;IAEFjB,IAAI,CAAC,CAAC;EACR,CAAC;AACH"}
@@ -0,0 +1,19 @@
1
+ import { BatchSpanProcessor, NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
2
+ import { KnownToken } from "../../../tokens.js";
3
+
4
+ /**
5
+ * Провайдер объекта BasicTracerProvider.
6
+ * @param resolve Функция для получения зависимости по токену.
7
+ * @return BasicTracerProvider.
8
+ */
9
+ export function provideTracingProvider(resolve) {
10
+ const exporter = resolve(KnownToken.Tracing.spanExporter);
11
+ const resource = resolve(KnownToken.Tracing.resource);
12
+ const provider = new NodeTracerProvider({
13
+ resource,
14
+ spanProcessors: [new BatchSpanProcessor(exporter)]
15
+ });
16
+ provider.register();
17
+ return provider;
18
+ }
19
+ //# sourceMappingURL=telemetry-tracer-provider.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"telemetry-tracer-provider.js","names":["BatchSpanProcessor","NodeTracerProvider","KnownToken","provideTracingProvider","resolve","exporter","Tracing","spanExporter","resource","provider","spanProcessors","register"],"sources":["../../../../../src/preset/node/providers/telemetry-tracer-provider.ts"],"sourcesContent":["import type { Resolve } from \"../../../di\";\nimport type { BasicTracerProvider } from \"@opentelemetry/sdk-trace-base\";\nimport {\n BatchSpanProcessor,\n NodeTracerProvider,\n} from \"@opentelemetry/sdk-trace-node\";\nimport { KnownToken } from \"../../../tokens\";\n\n/**\n * Провайдер объекта BasicTracerProvider.\n * @param resolve Функция для получения зависимости по токену.\n * @return BasicTracerProvider.\n */\nexport function provideTracingProvider(resolve: Resolve): BasicTracerProvider {\n const exporter = resolve(KnownToken.Tracing.spanExporter);\n const resource = resolve(KnownToken.Tracing.resource);\n const provider = new NodeTracerProvider({\n resource,\n spanProcessors: [new BatchSpanProcessor(exporter)],\n });\n\n provider.register();\n\n return provider;\n}\n"],"mappings":"AAEA,SACEA,kBAAkB,EAClBC,kBAAkB,QACb,+BAA+B;AACtC,SAASC,UAAU,QAAQ,oBAAiB;;AAE5C;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,sBAAsBA,CAACC,OAAgB,EAAuB;EAC5E,MAAMC,QAAQ,GAAGD,OAAO,CAACF,UAAU,CAACI,OAAO,CAACC,YAAY,CAAC;EACzD,MAAMC,QAAQ,GAAGJ,OAAO,CAACF,UAAU,CAACI,OAAO,CAACE,QAAQ,CAAC;EACrD,MAAMC,QAAQ,GAAG,IAAIR,kBAAkB,CAAC;IACtCO,QAAQ;IACRE,cAAc,EAAE,CAAC,IAAIV,kBAAkB,CAACK,QAAQ,CAAC;EACnD,CAAC,CAAC;EAEFI,QAAQ,CAACE,QAAQ,CAAC,CAAC;EAEnB,OAAOF,QAAQ;AACjB"}
@@ -0,0 +1,21 @@
1
+ import { detectResourcesSync, envDetector, hostDetector, osDetector, processDetector, Resource } from "@opentelemetry/resources";
2
+ import * as SemanticArgs from "@opentelemetry/semantic-conventions/incubating";
3
+ import { KnownToken } from "../../../tokens.js";
4
+ /**
5
+ * Провайдер объекта Resource.
6
+ * @param resolve Функция для получения зависимости по токену.
7
+ * @return Resource.
8
+ */
9
+ export function provideTracingResource(resolve) {
10
+ const config = resolve(KnownToken.Config.base);
11
+ const resource = new Resource({
12
+ [SemanticArgs.ATTR_SERVICE_NAME]: config.appName,
13
+ [SemanticArgs.ATTR_SERVICE_VERSION]: config.appVersion,
14
+ [SemanticArgs.ATTR_DEPLOYMENT_ENVIRONMENT_NAME]: config.env
15
+ });
16
+ resource.merge(detectResourcesSync({
17
+ detectors: [osDetector, envDetector, hostDetector, processDetector]
18
+ }));
19
+ return resource;
20
+ }
21
+ //# sourceMappingURL=telemetry-tracer-resource.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"telemetry-tracer-resource.js","names":["detectResourcesSync","envDetector","hostDetector","osDetector","processDetector","Resource","SemanticArgs","KnownToken","provideTracingResource","resolve","config","Config","base","resource","ATTR_SERVICE_NAME","appName","ATTR_SERVICE_VERSION","appVersion","ATTR_DEPLOYMENT_ENVIRONMENT_NAME","env","merge","detectors"],"sources":["../../../../../src/preset/node/providers/telemetry-tracer-resource.ts"],"sourcesContent":["import {\n detectResourcesSync,\n envDetector,\n hostDetector,\n osDetector,\n processDetector,\n Resource,\n} from \"@opentelemetry/resources\";\nimport * as SemanticArgs from \"@opentelemetry/semantic-conventions/incubating\";\nimport { KnownToken } from \"../../../tokens\";\n\nimport type { Resolve } from \"../../../di\";\n\n/**\n * Провайдер объекта Resource.\n * @param resolve Функция для получения зависимости по токену.\n * @return Resource.\n */\nexport function provideTracingResource(resolve: Resolve): Resource {\n const config = resolve(KnownToken.Config.base);\n\n const resource = new Resource({\n [SemanticArgs.ATTR_SERVICE_NAME]: config.appName,\n [SemanticArgs.ATTR_SERVICE_VERSION]: config.appVersion,\n [SemanticArgs.ATTR_DEPLOYMENT_ENVIRONMENT_NAME]: config.env,\n });\n\n resource.merge(\n detectResourcesSync({\n detectors: [osDetector, envDetector, hostDetector, processDetector],\n }),\n );\n\n return resource;\n}\n"],"mappings":"AAAA,SACEA,mBAAmB,EACnBC,WAAW,EACXC,YAAY,EACZC,UAAU,EACVC,eAAe,EACfC,QAAQ,QACH,0BAA0B;AACjC,OAAO,KAAKC,YAAY,MAAM,gDAAgD;AAC9E,SAASC,UAAU,QAAQ,oBAAiB;AAI5C;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,sBAAsBA,CAACC,OAAgB,EAAY;EACjE,MAAMC,MAAM,GAAGD,OAAO,CAACF,UAAU,CAACI,MAAM,CAACC,IAAI,CAAC;EAE9C,MAAMC,QAAQ,GAAG,IAAIR,QAAQ,CAAC;IAC5B,CAACC,YAAY,CAACQ,iBAAiB,GAAGJ,MAAM,CAACK,OAAO;IAChD,CAACT,YAAY,CAACU,oBAAoB,GAAGN,MAAM,CAACO,UAAU;IACtD,CAACX,YAAY,CAACY,gCAAgC,GAAGR,MAAM,CAACS;EAC1D,CAAC,CAAC;EAEFN,QAAQ,CAACO,KAAK,CACZpB,mBAAmB,CAAC;IAClBqB,SAAS,EAAE,CAAClB,UAAU,EAAEF,WAAW,EAAEC,YAAY,EAAEE,eAAe;EACpE,CAAC,CACH,CAAC;EAED,OAAOS,QAAQ;AACjB"}
@@ -1,5 +1,6 @@
1
- import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
1
+ import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
2
2
  import { KnownToken } from "../../../tokens.js";
3
+ const envPrefix = 'OTEL_EXPORTER_OTLP_';
3
4
 
4
5
  /**
5
6
  * Провайдер объекта SpanExporter.
@@ -9,8 +10,7 @@ import { KnownToken } from "../../../tokens.js";
9
10
  export function provideSpanExporter(resolve) {
10
11
  const source = resolve(KnownToken.Config.source);
11
12
  return new OTLPTraceExporter({
12
- // @todo сделать компонент ConventionalConfig и в реализации описать все переменные среды там
13
- url: source.require('JAEGER_AGENT_URL')
13
+ url: source.get(`${envPrefix}URL`, '')
14
14
  });
15
15
  }
16
- //# sourceMappingURL=span-exporter.js.map
16
+ //# sourceMappingURL=telemetry-tracer-span-exporter.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"telemetry-tracer-span-exporter.js","names":["OTLPTraceExporter","KnownToken","envPrefix","provideSpanExporter","resolve","source","Config","url","get"],"sources":["../../../../../src/preset/node/providers/telemetry-tracer-span-exporter.ts"],"sourcesContent":["import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';\nimport { KnownToken } from '../../../tokens';\n\nimport type { Resolve } from '../../../di';\n\nconst envPrefix = 'OTEL_EXPORTER_OTLP_';\n\n/**\n * Провайдер объекта SpanExporter.\n * @param resolve Функция для получения зависимости по токену.\n * @return SpanExporter.\n */\nexport function provideSpanExporter(resolve: Resolve): OTLPTraceExporter {\n const source = resolve(KnownToken.Config.source);\n\n return new OTLPTraceExporter({\n url: source.get(`${envPrefix}URL`, ''),\n });\n}\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,yCAAyC;AAC3E,SAASC,UAAU,QAAQ,oBAAiB;AAI5C,MAAMC,SAAS,GAAG,qBAAqB;;AAEvC;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,mBAAmBA,CAACC,OAAgB,EAAqB;EACvE,MAAMC,MAAM,GAAGD,OAAO,CAACH,UAAU,CAACK,MAAM,CAACD,MAAM,CAAC;EAEhD,OAAO,IAAIL,iBAAiB,CAAC;IAC3BO,GAAG,EAAEF,MAAM,CAACG,GAAG,CAAE,GAAEN,SAAU,KAAI,EAAE,EAAE;EACvC,CAAC,CAAC;AACJ"}
@@ -7,7 +7,7 @@ import { KnownToken } from "../../../tokens.js";
7
7
  */
8
8
  export function provideTracer(resolve) {
9
9
  const config = resolve(KnownToken.Config.base);
10
- const provider = resolve(KnownToken.Tracing.tracerProvider);
10
+ const provider = resolve(KnownToken.Tracing.provider);
11
11
  return provider.getTracer(config.appName, config.appVersion);
12
12
  }
13
- //# sourceMappingURL=tracer.js.map
13
+ //# sourceMappingURL=telemetry-tracer.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"telemetry-tracer.js","names":["KnownToken","provideTracer","resolve","config","Config","base","provider","Tracing","getTracer","appName","appVersion"],"sources":["../../../../../src/preset/node/providers/telemetry-tracer.ts"],"sourcesContent":["import { Tracer } from '@opentelemetry/api';\nimport { Resolve } from '../../../di';\nimport { KnownToken } from '../../../tokens';\n\n/**\n * Провайдер объекта Tracer.\n * @param resolve Функция для получения зависимости по токену.\n * @return Tracer.\n */\nexport function provideTracer(resolve: Resolve): Tracer {\n const config = resolve(KnownToken.Config.base);\n const provider = resolve(KnownToken.Tracing.provider);\n\n return provider.getTracer(config.appName, config.appVersion);\n}\n"],"mappings":"AAEA,SAASA,UAAU,QAAQ,oBAAiB;;AAE5C;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,aAAaA,CAACC,OAAgB,EAAU;EACtD,MAAMC,MAAM,GAAGD,OAAO,CAACF,UAAU,CAACI,MAAM,CAACC,IAAI,CAAC;EAC9C,MAAMC,QAAQ,GAAGJ,OAAO,CAACF,UAAU,CAACO,OAAO,CAACD,QAAQ,CAAC;EAErD,OAAOA,QAAQ,CAACE,SAAS,CAACL,MAAM,CAACM,OAAO,EAAEN,MAAM,CAACO,UAAU,CAAC;AAC9D"}
@@ -1,7 +1,7 @@
1
1
  import { SpanStatusCode } from '@opentelemetry/api';
2
- import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
2
+ import { ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from '@opentelemetry/semantic-conventions/incubating';
3
3
  import { displayUrl } from "../../isomorphic/utils/display-url.js";
4
- import { hideFirstId } from "../../isomorphic/utils/hide-first-id.js";
4
+ import { getSemanticHeaders } from "./telemetry.js";
5
5
 
6
6
  /**
7
7
  * Возвращает новый middleware для трассировки исходящих запросов.
@@ -13,28 +13,18 @@ export function axiosTracingMiddleware(tracer, rootContext) {
13
13
  return async function trace(config, next, defaults) {
14
14
  const {
15
15
  method,
16
- url,
17
- foundId
16
+ urlStr
18
17
  } = getRequestInfo(config, defaults);
19
- const span = tracer.startSpan(`HTTP ${method} ${url}`, undefined, rootContext);
18
+ const url = new URL(urlStr);
19
+ const span = tracer.startSpan(`axios ${method} ${url}`, undefined, rootContext);
20
20
  span.setAttributes({
21
- [SemanticAttributes.HTTP_URL]: url,
22
- [SemanticAttributes.HTTP_METHOD]: method,
23
- 'request.params': JSON.stringify({
24
- ...defaults.params,
25
- ...config.params
26
- }),
27
- 'request.headers': JSON.stringify({
21
+ [ATTR_URL_FULL]: url.href,
22
+ [ATTR_HTTP_REQUEST_METHOD]: method,
23
+ ...getSemanticHeaders({
28
24
  // @todo непонятно как доставать заголовки из defaults потому что там на одном уровне заголовки и таблицы заголовков
29
25
  ...defaults.headers.common,
30
26
  ...defaults.headers[method.toLowerCase()],
31
27
  ...config.headers
32
- // @todo возможно стоит убрать cookie/Cookie
33
- }),
34
-
35
- // если нашли id - добавляем в теги
36
- ...(foundId && {
37
- 'request.id': foundId
38
28
  })
39
29
  });
40
30
  try {
@@ -55,7 +45,6 @@ export function axiosTracingMiddleware(tracer, rootContext) {
55
45
 
56
46
  /**
57
47
  * Формирует базовые данные запроса.
58
- * Заменяет первое найденное число в url на "{id}", возвращая его в результате.
59
48
  * @param config Axios-конфиг запроса.
60
49
  * @param defaults Базовый конфиг экземпляра Axios.
61
50
  * @return Базовые данные запроса.
@@ -63,13 +52,9 @@ export function axiosTracingMiddleware(tracer, rootContext) {
63
52
  export function getRequestInfo(config, defaults) {
64
53
  const method = (config.method || 'GET').toUpperCase();
65
54
  const baseURL = config.baseURL || defaults.baseURL || '';
66
-
67
- // ВАЖНО: абстрагируем id только в url игнорируя baseURL
68
- const [url, foundId] = hideFirstId(config.url || defaults.url || '');
69
55
  return {
70
56
  method,
71
- url: displayUrl(baseURL, url),
72
- foundId
57
+ urlStr: displayUrl(baseURL, config.url || defaults.url || '')
73
58
  };
74
59
  }
75
60
  //# sourceMappingURL=axios-tracing-middleware.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"axios-tracing-middleware.js","names":["SpanStatusCode","SemanticAttributes","displayUrl","hideFirstId","axiosTracingMiddleware","tracer","rootContext","trace","config","next","defaults","method","url","foundId","getRequestInfo","span","startSpan","undefined","setAttributes","HTTP_URL","HTTP_METHOD","JSON","stringify","params","headers","common","toLowerCase","error","setStatus","code","ERROR","message","end","toUpperCase","baseURL"],"sources":["../../../../../src/preset/node/utils/axios-tracing-middleware.ts"],"sourcesContent":["import type { AxiosInstance, AxiosRequestConfig, HeadersDefaults } from 'axios';\nimport type { Middleware } from 'middleware-axios';\nimport { Context, Tracer, SpanStatusCode } from '@opentelemetry/api';\nimport { SemanticAttributes } from '@opentelemetry/semantic-conventions';\nimport { displayUrl } from '../../isomorphic/utils/display-url';\nimport { hideFirstId } from '../../isomorphic/utils/hide-first-id';\n\n/**\n * Возвращает новый middleware для трассировки исходящих запросов.\n * @param tracer Трейсер.\n * @param rootContext Контекст.\n * @return Middleware.\n */\nexport function axiosTracingMiddleware(tracer: Tracer, rootContext: Context): Middleware<any> {\n return async function trace(config, next, defaults) {\n const { method, url, foundId } = getRequestInfo(config, defaults);\n const span = tracer.startSpan(`HTTP ${method} ${url}`, undefined, rootContext);\n\n span.setAttributes({\n [SemanticAttributes.HTTP_URL]: url,\n [SemanticAttributes.HTTP_METHOD]: method,\n 'request.params': JSON.stringify({\n ...defaults.params,\n ...config.params,\n }),\n 'request.headers': JSON.stringify({\n // @todo непонятно как доставать заголовки из defaults потому что там на одном уровне заголовки и таблицы заголовков\n ...defaults.headers.common,\n ...defaults.headers[method.toLowerCase() as keyof HeadersDefaults],\n ...config.headers,\n // @todo возможно стоит убрать cookie/Cookie\n }),\n\n // если нашли id - добавляем в теги\n ...(foundId && { 'request.id': foundId }),\n });\n\n try {\n await next(config);\n } catch (error) {\n span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'HTTP Request failed',\n });\n\n span.end();\n\n // не прячем ошибку\n throw error;\n }\n\n span.end();\n };\n}\n\n/**\n * Формирует базовые данные запроса.\n * Заменяет первое найденное число в url на \"{id}\", возвращая его в результате.\n * @param config Axios-конфиг запроса.\n * @param defaults Базовый конфиг экземпляра Axios.\n * @return Базовые данные запроса.\n */\nexport function getRequestInfo(\n config: AxiosRequestConfig,\n defaults: AxiosInstance['defaults'],\n): {\n method: string;\n url: string;\n foundId?: number;\n} {\n const method = (config.method || 'GET').toUpperCase();\n const baseURL = config.baseURL || defaults.baseURL || '';\n\n // ВАЖНО: абстрагируем id только в url игнорируя baseURL\n const [url, foundId] = hideFirstId(config.url || defaults.url || '');\n\n return {\n method,\n url: displayUrl(baseURL, url),\n foundId,\n };\n}\n"],"mappings":"AAEA,SAA0BA,cAAc,QAAQ,oBAAoB;AACpE,SAASC,kBAAkB,QAAQ,qCAAqC;AACxE,SAASC,UAAU,QAAQ,uCAAoC;AAC/D,SAASC,WAAW,QAAQ,yCAAsC;;AAElE;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,sBAAsBA,CAACC,MAAc,EAAEC,WAAoB,EAAmB;EAC5F,OAAO,eAAeC,KAAKA,CAACC,MAAM,EAAEC,IAAI,EAAEC,QAAQ,EAAE;IAClD,MAAM;MAAEC,MAAM;MAAEC,GAAG;MAAEC;IAAQ,CAAC,GAAGC,cAAc,CAACN,MAAM,EAAEE,QAAQ,CAAC;IACjE,MAAMK,IAAI,GAAGV,MAAM,CAACW,SAAS,CAAE,QAAOL,MAAO,IAAGC,GAAI,EAAC,EAAEK,SAAS,EAAEX,WAAW,CAAC;IAE9ES,IAAI,CAACG,aAAa,CAAC;MACjB,CAACjB,kBAAkB,CAACkB,QAAQ,GAAGP,GAAG;MAClC,CAACX,kBAAkB,CAACmB,WAAW,GAAGT,MAAM;MACxC,gBAAgB,EAAEU,IAAI,CAACC,SAAS,CAAC;QAC/B,GAAGZ,QAAQ,CAACa,MAAM;QAClB,GAAGf,MAAM,CAACe;MACZ,CAAC,CAAC;MACF,iBAAiB,EAAEF,IAAI,CAACC,SAAS,CAAC;QAChC;QACA,GAAGZ,QAAQ,CAACc,OAAO,CAACC,MAAM;QAC1B,GAAGf,QAAQ,CAACc,OAAO,CAACb,MAAM,CAACe,WAAW,CAAC,CAAC,CAA0B;QAClE,GAAGlB,MAAM,CAACgB;QACV;MACF,CAAC,CAAC;;MAEF;MACA,IAAIX,OAAO,IAAI;QAAE,YAAY,EAAEA;MAAQ,CAAC;IAC1C,CAAC,CAAC;IAEF,IAAI;MACF,MAAMJ,IAAI,CAACD,MAAM,CAAC;IACpB,CAAC,CAAC,OAAOmB,KAAK,EAAE;MACdZ,IAAI,CAACa,SAAS,CAAC;QACbC,IAAI,EAAE7B,cAAc,CAAC8B,KAAK;QAC1BC,OAAO,EAAE;MACX,CAAC,CAAC;MAEFhB,IAAI,CAACiB,GAAG,CAAC,CAAC;;MAEV;MACA,MAAML,KAAK;IACb;IAEAZ,IAAI,CAACiB,GAAG,CAAC,CAAC;EACZ,CAAC;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASlB,cAAcA,CAC5BN,MAA0B,EAC1BE,QAAmC,EAKnC;EACA,MAAMC,MAAM,GAAG,CAACH,MAAM,CAACG,MAAM,IAAI,KAAK,EAAEsB,WAAW,CAAC,CAAC;EACrD,MAAMC,OAAO,GAAG1B,MAAM,CAAC0B,OAAO,IAAIxB,QAAQ,CAACwB,OAAO,IAAI,EAAE;;EAExD;EACA,MAAM,CAACtB,GAAG,EAAEC,OAAO,CAAC,GAAGV,WAAW,CAACK,MAAM,CAACI,GAAG,IAAIF,QAAQ,CAACE,GAAG,IAAI,EAAE,CAAC;EAEpE,OAAO;IACLD,MAAM;IACNC,GAAG,EAAEV,UAAU,CAACgC,OAAO,EAAEtB,GAAG,CAAC;IAC7BC;EACF,CAAC;AACH"}
1
+ {"version":3,"file":"axios-tracing-middleware.js","names":["SpanStatusCode","ATTR_HTTP_REQUEST_METHOD","ATTR_URL_FULL","displayUrl","getSemanticHeaders","axiosTracingMiddleware","tracer","rootContext","trace","config","next","defaults","method","urlStr","getRequestInfo","url","URL","span","startSpan","undefined","setAttributes","href","headers","common","toLowerCase","error","setStatus","code","ERROR","message","end","toUpperCase","baseURL"],"sources":["../../../../../src/preset/node/utils/axios-tracing-middleware.ts"],"sourcesContent":["import type { AxiosInstance, AxiosRequestConfig, HeadersDefaults } from 'axios';\nimport type { Middleware } from 'middleware-axios';\nimport { Context, Tracer, SpanStatusCode } from '@opentelemetry/api';\nimport {\n ATTR_HTTP_REQUEST_METHOD,\n ATTR_URL_FULL,\n} from '@opentelemetry/semantic-conventions/incubating';\nimport { displayUrl } from '../../isomorphic/utils/display-url';\nimport { getSemanticHeaders } from './telemetry';\n\n/**\n * Возвращает новый middleware для трассировки исходящих запросов.\n * @param tracer Трейсер.\n * @param rootContext Контекст.\n * @return Middleware.\n */\nexport function axiosTracingMiddleware(tracer: Tracer, rootContext: Context): Middleware<any> {\n return async function trace(config, next, defaults) {\n const { method, urlStr } = getRequestInfo(config, defaults);\n const url = new URL(urlStr);\n const span = tracer.startSpan(`axios ${method} ${url}`, undefined, rootContext);\n\n span.setAttributes({\n [ATTR_URL_FULL]: url.href,\n [ATTR_HTTP_REQUEST_METHOD]: method,\n ...getSemanticHeaders({\n // @todo непонятно как доставать заголовки из defaults потому что там на одном уровне заголовки и таблицы заголовков\n ...defaults.headers.common,\n ...defaults.headers[method.toLowerCase() as keyof HeadersDefaults],\n ...config.headers,\n }),\n });\n\n try {\n await next(config);\n } catch (error) {\n span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'HTTP Request failed',\n });\n\n span.end();\n\n // не прячем ошибку\n throw error;\n }\n\n span.end();\n };\n}\n\n/**\n * Формирует базовые данные запроса.\n * @param config Axios-конфиг запроса.\n * @param defaults Базовый конфиг экземпляра Axios.\n * @return Базовые данные запроса.\n */\nexport function getRequestInfo(\n config: AxiosRequestConfig,\n defaults: AxiosInstance['defaults'],\n): {\n method: string;\n urlStr: string;\n} {\n const method = (config.method || 'GET').toUpperCase();\n const baseURL = config.baseURL || defaults.baseURL || '';\n\n return {\n method,\n urlStr: displayUrl(baseURL, config.url || defaults.url || ''),\n };\n}\n"],"mappings":"AAEA,SAA0BA,cAAc,QAAQ,oBAAoB;AACpE,SACEC,wBAAwB,EACxBC,aAAa,QACR,gDAAgD;AACvD,SAASC,UAAU,QAAQ,uCAAoC;AAC/D,SAASC,kBAAkB,QAAQ,gBAAa;;AAEhD;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,sBAAsBA,CAACC,MAAc,EAAEC,WAAoB,EAAmB;EAC5F,OAAO,eAAeC,KAAKA,CAACC,MAAM,EAAEC,IAAI,EAAEC,QAAQ,EAAE;IAClD,MAAM;MAAEC,MAAM;MAAEC;IAAO,CAAC,GAAGC,cAAc,CAACL,MAAM,EAAEE,QAAQ,CAAC;IAC3D,MAAMI,GAAG,GAAG,IAAIC,GAAG,CAACH,MAAM,CAAC;IAC3B,MAAMI,IAAI,GAAGX,MAAM,CAACY,SAAS,CAAE,SAAQN,MAAO,IAAGG,GAAI,EAAC,EAAEI,SAAS,EAAEZ,WAAW,CAAC;IAE/EU,IAAI,CAACG,aAAa,CAAC;MACjB,CAAClB,aAAa,GAAGa,GAAG,CAACM,IAAI;MACzB,CAACpB,wBAAwB,GAAGW,MAAM;MAClC,GAAGR,kBAAkB,CAAC;QACpB;QACA,GAAGO,QAAQ,CAACW,OAAO,CAACC,MAAM;QAC1B,GAAGZ,QAAQ,CAACW,OAAO,CAACV,MAAM,CAACY,WAAW,CAAC,CAAC,CAA0B;QAClE,GAAGf,MAAM,CAACa;MACZ,CAAC;IACH,CAAC,CAAC;IAEF,IAAI;MACF,MAAMZ,IAAI,CAACD,MAAM,CAAC;IACpB,CAAC,CAAC,OAAOgB,KAAK,EAAE;MACdR,IAAI,CAACS,SAAS,CAAC;QACbC,IAAI,EAAE3B,cAAc,CAAC4B,KAAK;QAC1BC,OAAO,EAAE;MACX,CAAC,CAAC;MAEFZ,IAAI,CAACa,GAAG,CAAC,CAAC;;MAEV;MACA,MAAML,KAAK;IACb;IAEAR,IAAI,CAACa,GAAG,CAAC,CAAC;EACZ,CAAC;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAAShB,cAAcA,CAC5BL,MAA0B,EAC1BE,QAAmC,EAInC;EACA,MAAMC,MAAM,GAAG,CAACH,MAAM,CAACG,MAAM,IAAI,KAAK,EAAEmB,WAAW,CAAC,CAAC;EACrD,MAAMC,OAAO,GAAGvB,MAAM,CAACuB,OAAO,IAAIrB,QAAQ,CAACqB,OAAO,IAAI,EAAE;EAExD,OAAO;IACLpB,MAAM;IACNC,MAAM,EAAEV,UAAU,CAAC6B,OAAO,EAAEvB,MAAM,CAACM,GAAG,IAAIJ,QAAQ,CAACI,GAAG,IAAI,EAAE;EAC9D,CAAC;AACH"}
@@ -1,6 +1,6 @@
1
1
  import { SpanStatusCode } from '@opentelemetry/api';
2
- import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
3
- import { hideFirstId } from "../../isomorphic/utils/hide-first-id.js";
2
+ import { ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from '@opentelemetry/semantic-conventions';
3
+ import { getSemanticHeaders } from "./telemetry.js";
4
4
 
5
5
  /**
6
6
  * Вернет новый промежуточный слой трассировки для fetch.
@@ -10,17 +10,12 @@ import { hideFirstId } from "../../isomorphic/utils/hide-first-id.js";
10
10
  */
11
11
  export function getFetchTracing(tracer, rootContext) {
12
12
  return async (request, next) => {
13
- const [url, foundId] = hideFirstId(new URL(request.url).pathname); // @todo тут бы помог URLPattern
14
- const span = tracer.startSpan(`HTTP ${request.method} ${url}`, undefined, rootContext);
13
+ const url = new URL(request.url);
14
+ const span = tracer.startSpan(`fetch ${request.method} ${url.pathname}`, undefined, rootContext);
15
15
  span.setAttributes({
16
- [SemanticAttributes.HTTP_URL]: url,
17
- [SemanticAttributes.HTTP_METHOD]: request.method,
18
- 'request.params': JSON.stringify(new URL(request.url).searchParams),
19
- 'request.headers': JSON.stringify(request.headers),
20
- // если нашли id - добавляем в теги
21
- ...(foundId && {
22
- 'request.id': foundId
23
- })
16
+ [ATTR_URL_FULL]: url.href,
17
+ [ATTR_HTTP_REQUEST_METHOD]: request.method,
18
+ ...getSemanticHeaders(request.headers)
24
19
  });
25
20
  try {
26
21
  const response = await next(request);
@@ -1 +1 @@
1
- {"version":3,"file":"get-fetch-tracing.js","names":["SpanStatusCode","SemanticAttributes","hideFirstId","getFetchTracing","tracer","rootContext","request","next","url","foundId","URL","pathname","span","startSpan","method","undefined","setAttributes","HTTP_URL","HTTP_METHOD","JSON","stringify","searchParams","headers","response","end","error","setStatus","code","ERROR","message"],"sources":["../../../../../src/preset/node/utils/get-fetch-tracing.ts"],"sourcesContent":["import type { Middleware } from '../../../http';\nimport { SpanStatusCode, type Context, type Tracer } from '@opentelemetry/api';\nimport { SemanticAttributes } from '@opentelemetry/semantic-conventions';\nimport { hideFirstId } from '../../isomorphic/utils/hide-first-id';\n\n/**\n * Вернет новый промежуточный слой трассировки для fetch.\n * @param tracer Трассировщик.\n * @param rootContext Контекст.\n * @return Промежуточный слой трассировки.\n */\nexport function getFetchTracing(tracer: Tracer, rootContext: Context): Middleware {\n return async (request, next) => {\n const [url, foundId] = hideFirstId(new URL(request.url).pathname); // @todo тут бы помог URLPattern\n const span = tracer.startSpan(`HTTP ${request.method} ${url}`, undefined, rootContext);\n\n span.setAttributes({\n [SemanticAttributes.HTTP_URL]: url,\n [SemanticAttributes.HTTP_METHOD]: request.method,\n 'request.params': JSON.stringify(new URL(request.url).searchParams),\n 'request.headers': JSON.stringify(request.headers),\n\n // если нашли id - добавляем в теги\n ...(foundId && { 'request.id': foundId }),\n });\n\n try {\n const response = await next(request);\n\n span.end();\n\n return response;\n } catch (error) {\n span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'HTTP Request failed',\n });\n\n span.end();\n\n // ВАЖНО: не прячем ошибку\n throw error;\n }\n };\n}\n"],"mappings":"AACA,SAASA,cAAc,QAAmC,oBAAoB;AAC9E,SAASC,kBAAkB,QAAQ,qCAAqC;AACxE,SAASC,WAAW,QAAQ,yCAAsC;;AAElE;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAACC,MAAc,EAAEC,WAAoB,EAAc;EAChF,OAAO,OAAOC,OAAO,EAAEC,IAAI,KAAK;IAC9B,MAAM,CAACC,GAAG,EAAEC,OAAO,CAAC,GAAGP,WAAW,CAAC,IAAIQ,GAAG,CAACJ,OAAO,CAACE,GAAG,CAAC,CAACG,QAAQ,CAAC,CAAC,CAAC;IACnE,MAAMC,IAAI,GAAGR,MAAM,CAACS,SAAS,CAAE,QAAOP,OAAO,CAACQ,MAAO,IAAGN,GAAI,EAAC,EAAEO,SAAS,EAAEV,WAAW,CAAC;IAEtFO,IAAI,CAACI,aAAa,CAAC;MACjB,CAACf,kBAAkB,CAACgB,QAAQ,GAAGT,GAAG;MAClC,CAACP,kBAAkB,CAACiB,WAAW,GAAGZ,OAAO,CAACQ,MAAM;MAChD,gBAAgB,EAAEK,IAAI,CAACC,SAAS,CAAC,IAAIV,GAAG,CAACJ,OAAO,CAACE,GAAG,CAAC,CAACa,YAAY,CAAC;MACnE,iBAAiB,EAAEF,IAAI,CAACC,SAAS,CAACd,OAAO,CAACgB,OAAO,CAAC;MAElD;MACA,IAAIb,OAAO,IAAI;QAAE,YAAY,EAAEA;MAAQ,CAAC;IAC1C,CAAC,CAAC;IAEF,IAAI;MACF,MAAMc,QAAQ,GAAG,MAAMhB,IAAI,CAACD,OAAO,CAAC;MAEpCM,IAAI,CAACY,GAAG,CAAC,CAAC;MAEV,OAAOD,QAAQ;IACjB,CAAC,CAAC,OAAOE,KAAK,EAAE;MACdb,IAAI,CAACc,SAAS,CAAC;QACbC,IAAI,EAAE3B,cAAc,CAAC4B,KAAK;QAC1BC,OAAO,EAAE;MACX,CAAC,CAAC;MAEFjB,IAAI,CAACY,GAAG,CAAC,CAAC;;MAEV;MACA,MAAMC,KAAK;IACb;EACF,CAAC;AACH"}
1
+ {"version":3,"file":"get-fetch-tracing.js","names":["SpanStatusCode","ATTR_HTTP_REQUEST_METHOD","ATTR_URL_FULL","getSemanticHeaders","getFetchTracing","tracer","rootContext","request","next","url","URL","span","startSpan","method","pathname","undefined","setAttributes","href","headers","response","end","error","setStatus","code","ERROR","message"],"sources":["../../../../../src/preset/node/utils/get-fetch-tracing.ts"],"sourcesContent":["import type { Middleware } from '../../../http';\nimport { SpanStatusCode, type Context, type Tracer } from '@opentelemetry/api';\nimport { ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from '@opentelemetry/semantic-conventions';\nimport { getSemanticHeaders } from './telemetry';\n\n/**\n * Вернет новый промежуточный слой трассировки для fetch.\n * @param tracer Трассировщик.\n * @param rootContext Контекст.\n * @return Промежуточный слой трассировки.\n */\nexport function getFetchTracing(tracer: Tracer, rootContext: Context): Middleware {\n return async (request, next) => {\n const url = new URL(request.url);\n const span = tracer.startSpan(\n `fetch ${request.method} ${url.pathname}`,\n undefined,\n rootContext,\n );\n\n span.setAttributes({\n [ATTR_URL_FULL]: url.href,\n [ATTR_HTTP_REQUEST_METHOD]: request.method,\n ...getSemanticHeaders(request.headers),\n });\n\n try {\n const response = await next(request);\n\n span.end();\n\n return response;\n } catch (error) {\n span.setStatus({\n code: SpanStatusCode.ERROR,\n message: 'HTTP Request failed',\n });\n\n span.end();\n\n // ВАЖНО: не прячем ошибку\n throw error;\n }\n };\n}\n"],"mappings":"AACA,SAASA,cAAc,QAAmC,oBAAoB;AAC9E,SAASC,wBAAwB,EAAEC,aAAa,QAAQ,qCAAqC;AAC7F,SAASC,kBAAkB,QAAQ,gBAAa;;AAEhD;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAACC,MAAc,EAAEC,WAAoB,EAAc;EAChF,OAAO,OAAOC,OAAO,EAAEC,IAAI,KAAK;IAC9B,MAAMC,GAAG,GAAG,IAAIC,GAAG,CAACH,OAAO,CAACE,GAAG,CAAC;IAChC,MAAME,IAAI,GAAGN,MAAM,CAACO,SAAS,CAC1B,SAAQL,OAAO,CAACM,MAAO,IAAGJ,GAAG,CAACK,QAAS,EAAC,EACzCC,SAAS,EACTT,WACF,CAAC;IAEDK,IAAI,CAACK,aAAa,CAAC;MACjB,CAACd,aAAa,GAAGO,GAAG,CAACQ,IAAI;MACzB,CAAChB,wBAAwB,GAAGM,OAAO,CAACM,MAAM;MAC1C,GAAGV,kBAAkB,CAACI,OAAO,CAACW,OAAO;IACvC,CAAC,CAAC;IAEF,IAAI;MACF,MAAMC,QAAQ,GAAG,MAAMX,IAAI,CAACD,OAAO,CAAC;MAEpCI,IAAI,CAACS,GAAG,CAAC,CAAC;MAEV,OAAOD,QAAQ;IACjB,CAAC,CAAC,OAAOE,KAAK,EAAE;MACdV,IAAI,CAACW,SAAS,CAAC;QACbC,IAAI,EAAEvB,cAAc,CAACwB,KAAK;QAC1BC,OAAO,EAAE;MACX,CAAC,CAAC;MAEFd,IAAI,CAACS,GAAG,CAAC,CAAC;;MAEV;MACA,MAAMC,KAAK;IACb;EACF,CAAC;AACH"}
@@ -0,0 +1,18 @@
1
+ import { ATTR_HTTP_REQUEST_HEADER } from '@opentelemetry/semantic-conventions';
2
+
3
+ /**
4
+ * Формирует данные заголовков согласно семантике.
5
+ * @todo Возможно стоит убрать cookie/Cookie.
6
+ * @param headers Объект заголовков запроса.
7
+ * @return Данные заголовков.
8
+ */
9
+ export function getSemanticHeaders(headers) {
10
+ const result = Object.entries(headers).reduce((acc, [key, value]) => {
11
+ if (value || typeof value === 'number') {
12
+ acc[ATTR_HTTP_REQUEST_HEADER(key)] = value;
13
+ }
14
+ return acc;
15
+ }, {});
16
+ return Object.keys(result).length ? result : null;
17
+ }
18
+ //# sourceMappingURL=telemetry.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"telemetry.js","names":["ATTR_HTTP_REQUEST_HEADER","getSemanticHeaders","headers","result","Object","entries","reduce","acc","key","value","keys","length"],"sources":["../../../../../src/preset/node/utils/telemetry.ts"],"sourcesContent":["import { ATTR_HTTP_REQUEST_HEADER } from '@opentelemetry/semantic-conventions';\n\n/**\n * Формирует данные заголовков согласно семантике.\n * @todo Возможно стоит убрать cookie/Cookie.\n * @param headers Объект заголовков запроса.\n * @return Данные заголовков.\n */\nexport function getSemanticHeaders(headers: Record<string, any>): Record<string, string> | null {\n const result = Object.entries(headers).reduce<Record<string, string>>((acc, [key, value]) => {\n if (value || typeof value === 'number') {\n acc[ATTR_HTTP_REQUEST_HEADER(key)] = value;\n }\n return acc;\n }, {});\n\n return Object.keys(result).length ? result : null;\n}\n"],"mappings":"AAAA,SAASA,wBAAwB,QAAQ,qCAAqC;;AAE9E;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,kBAAkBA,CAACC,OAA4B,EAAiC;EAC9F,MAAMC,MAAM,GAAGC,MAAM,CAACC,OAAO,CAACH,OAAO,CAAC,CAACI,MAAM,CAAyB,CAACC,GAAG,EAAE,CAACC,GAAG,EAAEC,KAAK,CAAC,KAAK;IAC3F,IAAIA,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;MACtCF,GAAG,CAACP,wBAAwB,CAACQ,GAAG,CAAC,CAAC,GAAGC,KAAK;IAC5C;IACA,OAAOF,GAAG;EACZ,CAAC,EAAE,CAAC,CAAC,CAAC;EAEN,OAAOH,MAAM,CAACM,IAAI,CAACP,MAAM,CAAC,CAACQ,MAAM,GAAGR,MAAM,GAAG,IAAI;AACnD"}
@@ -22,9 +22,8 @@ export const KnownToken = {
22
22
  Tracing: {
23
23
  tracer: createToken('tracing/tracer'),
24
24
  spanExporter: createToken('tracing/span-exporter'),
25
- tracerProvider: createToken('tracing/tracer-provider'),
26
- // @todo перенести в KnownToken.Telemetry.Resource?
27
- tracerProviderResource: createToken('tracing/resource')
25
+ provider: createToken('tracing/provider'),
26
+ resource: createToken('tracing/resource')
28
27
  },
29
28
  /** Токены компонентов сбора метрик. */
30
29
  Metrics: {