@toa.io/extensions.telemetry 1.0.0-alpha.283 → 1.0.0-alpha.289

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.
@@ -9,8 +9,10 @@ import {
9
9
  READY_ENV,
10
10
  type ReadyAnnotation
11
11
  } from './Ready.js'
12
+ import { environment } from '@toa.io/generic'
12
13
  import type { LogsOptions } from './Logs.js'
13
- import type { Connector, Locator, extensions } from '@toa.io/core'
14
+ import type { Connector, Locator } from '@toa.io/core'
15
+ import type { extensions } from '@toa.io/core/types'
14
16
  import type { Dependency, Probe, Variables } from '@toa.io/operations'
15
17
  import type { ExportersConfig, LevelName, TracesOptions } from 'openspan'
16
18
 
@@ -18,32 +20,38 @@ export class Factory implements extensions.Factory {
18
20
  private readonly logsOptions: LogsOptions
19
21
  private readonly ready: Ready | null
20
22
 
21
- public constructor () {
22
- const globEnv = process.env[LOGS_PREFIX]
23
- const level = process.env.TOA_DEV === '1' ? 'trace' : 'info'
23
+ public constructor() {
24
+ const globEnv = environment.get(LOGS_PREFIX)
25
+ const level = environment.get('TOA_DEV') === '1' ? 'trace' : 'info'
24
26
 
25
27
  this.logsOptions = globEnv === undefined ? { level } : JSON.parse(globEnv)
26
28
  this.logsOptions.level ??= level
27
29
 
28
30
  console.configure({ level: this.logsOptions.level })
29
31
 
30
- const tracesEnv = process.env[TRACES_ENV]
32
+ const tracesEnv = environment.get(TRACES_ENV)
33
+ const options =
34
+ tracesEnv === undefined ? development() : (JSON.parse(tracesEnv) as TracesOptions)
31
35
 
32
- traces(tracesEnv === undefined ? development() : JSON.parse(tracesEnv) as TracesOptions)
36
+ // `openspan` is not Toa's and reads the environment, which no longer holds the context by
37
+ // the time the exporter is made — so the service is named here
38
+ if (options.exporters?.otlp !== undefined)
39
+ options.exporters.otlp.service ??= environment.get('TOA_CONTEXT')
40
+
41
+ traces(options)
33
42
 
34
43
  this.ready = Ready.create()
35
44
  }
36
45
 
37
- public aspect (locator: Locator): extensions.Aspect[] {
46
+ public aspect(locator: Locator): extensions.Aspect[] {
38
47
  const logs = this.createLogs(locator)
39
48
  const span = new Span(locator)
40
49
 
41
50
  return [logs, span]
42
51
  }
43
52
 
44
- public manage (composition: Connector): Connector {
45
- if (this.ready === null)
46
- return composition
53
+ public manage(composition: Connector): Connector {
54
+ if (this.ready === null) return composition
47
55
 
48
56
  const ready = this.ready
49
57
 
@@ -61,8 +69,8 @@ export class Factory implements extensions.Factory {
61
69
  return composition
62
70
  }
63
71
 
64
- private createLogs (locator: Locator): extensions.Aspect {
65
- const overEnv = process.env[`${LOGS_PREFIX}_${locator.uppercase}`]
72
+ private createLogs(locator: Locator): extensions.Aspect {
73
+ const overEnv = environment.get(`${LOGS_PREFIX}_${locator.uppercase}`)
66
74
  const override = overEnv !== undefined ? JSON.parse(overEnv) : undefined
67
75
 
68
76
  const { level } = Object.assign({}, this.logsOptions, override)
@@ -80,20 +88,19 @@ export class Factory implements extensions.Factory {
80
88
  * `extensions/exposition/source/Factory.ts` says the same thing for the gateway process,
81
89
  * which boots without this extension.
82
90
  */
83
- function development (): TracesOptions {
84
- const local = process.env.TOA_DEV === '1' || process.env.TOA_BOOT_TRACE === '1'
91
+ function development(): TracesOptions {
92
+ const local =
93
+ environment.get('TOA_DEV') === '1' || environment.get('TOA_BOOT_TRACE') === '1'
85
94
 
86
95
  return local ? { exporters: { console: {} } } : {}
87
96
  }
88
97
 
89
- export function deployment (_: unknown, annotation?: Annotation): Dependency {
98
+ export function deployment(_: unknown, annotation?: Annotation): Dependency {
90
99
  const variables: Variables = { global: [] }
91
100
 
92
- if (annotation?.logs !== undefined)
93
- addLogsVariables(annotation.logs, variables)
101
+ if (annotation?.logs !== undefined) addLogsVariables(annotation.logs, variables)
94
102
 
95
- if (annotation?.traces !== undefined)
96
- addTracesVariables(annotation.traces, variables)
103
+ if (annotation?.traces !== undefined) addTracesVariables(annotation.traces, variables)
97
104
 
98
105
  const ready = normalizeAnnotation(annotation?.ready)
99
106
 
@@ -113,7 +120,7 @@ export function deployment (_: unknown, annotation?: Annotation): Dependency {
113
120
  return { variables, probe }
114
121
  }
115
122
 
116
- function addLogsVariables (annotation: LogsAnnotation, variables: Variables): void {
123
+ function addLogsVariables(annotation: LogsAnnotation, variables: Variables): void {
117
124
  const { level, ...components } = annotation
118
125
  const global = { level }
119
126
 
@@ -131,22 +138,31 @@ function addLogsVariables (annotation: LogsAnnotation, variables: Variables): vo
131
138
  }
132
139
  }
133
140
 
134
- function addTracesVariables (annotation: TracesAnnotation, variables: Variables): void {
141
+ function addTracesVariables(annotation: TracesAnnotation, variables: Variables): void {
135
142
  const { sample, rate, exporters } = annotation
136
143
 
137
144
  if (sample !== undefined)
138
- assert.ok(typeof sample === 'number' && sample >= 0 && sample <= 1,
139
- 'telemetry.traces.sample must be a number within [0, 1]')
145
+ assert.ok(
146
+ typeof sample === 'number' && sample >= 0 && sample <= 1,
147
+ 'telemetry.traces.sample must be a number within [0, 1]'
148
+ )
140
149
 
141
150
  if (rate !== undefined)
142
- assert.ok(typeof rate === 'number' && rate > 0,
143
- 'telemetry.traces.rate must be a positive number')
151
+ assert.ok(
152
+ typeof rate === 'number' && rate > 0,
153
+ 'telemetry.traces.rate must be a positive number'
154
+ )
144
155
 
145
156
  if (exporters?.otlp !== undefined)
146
- assert.ok(typeof exporters.otlp.endpoint === 'string',
147
- 'telemetry.traces.exporters.otlp.endpoint is required')
148
-
149
- variables.global.push({ name: TRACES_ENV, value: JSON.stringify({ sample, rate, exporters }) })
157
+ assert.ok(
158
+ typeof exporters.otlp.endpoint === 'string',
159
+ 'telemetry.traces.exporters.otlp.endpoint is required'
160
+ )
161
+
162
+ variables.global.push({
163
+ name: TRACES_ENV,
164
+ value: JSON.stringify({ sample, rate, exporters })
165
+ })
150
166
  }
151
167
 
152
168
  interface Annotation {
@@ -1,6 +1,7 @@
1
1
  import { Connector } from '@toa.io/core';
2
2
  import type { Console, ConsoleOptions } from 'openspan';
3
- import type { Locator, extensions } from '@toa.io/core';
3
+ import type { Locator } from '@toa.io/core';
4
+ import type { extensions } from '@toa.io/core/types';
4
5
  export declare class Logs extends Connector implements extensions.Aspect {
5
6
  readonly name = "logs";
6
7
  private readonly locator;
@@ -1 +1 @@
1
- {"version":3,"file":"Logs.js","sourceRoot":"","sources":["../source/Logs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAIlC,MAAM,OAAO,IAAK,SAAQ,SAAS;IACjB,IAAI,GAAG,MAAM,CAAA;IACZ,OAAO,CAAS;IAChB,OAAO,CAAS;IAChB,QAAQ,GAA4B,EAAE,CAAA;IAEvD,YAAoB,OAAgB,EAAE,OAAoB;QACxD,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAA;QAC7B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IACjC,CAAC;IAGD,sCAAsC;IAC/B,MAAM,CAAE,SAAiB,EAAE,QAA0B,EAAE,OAAwB,EAAE,UAAmB;QACzG,IAAI,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC;YAC/B,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC3C,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;gBACjC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBAC5B,SAAS;aACV,CAAC,CAAA;QAEJ,IAAI,QAAQ,KAAK,MAAM;YACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,OAAkC,CAAC,CAAA;;YAExE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAiB,EAAE,UAAqC,CAAC,CAAA;IAChG,CAAC;CACF"}
1
+ {"version":3,"file":"Logs.js","sourceRoot":"","sources":["../source/Logs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAKlC,MAAM,OAAO,IAAK,SAAQ,SAAS;IACjB,IAAI,GAAG,MAAM,CAAA;IACZ,OAAO,CAAS;IAChB,OAAO,CAAS;IAChB,QAAQ,GAA4B,EAAE,CAAA;IAEvD,YAAmB,OAAgB,EAAE,OAAoB;QACvD,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAA;QAC7B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IACjC,CAAC;IAGD,sCAAsC;IAC/B,MAAM,CACX,SAAiB,EACjB,QAA0B,EAC1B,OAAwB,EACxB,UAAmB;QAEnB,IAAI,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC;YAC/B,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC3C,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;gBACjC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBAC5B,SAAS;aACV,CAAC,CAAA;QAEJ,IAAI,QAAQ,KAAK,MAAM;YACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,OAAkC,CAAC,CAAA;;YAExE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAChC,OAAiB,EACjB,UAAqC,CACtC,CAAA;IACL,CAAC;CACF"}
@@ -1,6 +1,7 @@
1
1
  import * as http from 'node:http';
2
2
  import { console } from 'openspan';
3
3
  import { Connector } from '@toa.io/core';
4
+ import { environment } from '@toa.io/generic';
4
5
  export class Ready extends Connector {
5
6
  name = 'ready';
6
7
  server = http.createServer();
@@ -43,7 +44,9 @@ export class Ready extends Connector {
43
44
  // Local multi-process (pm2 + features) shares a host; k8s pods do not.
44
45
  if (error?.code === 'EADDRINUSE') {
45
46
  this.skipped = true;
46
- console.warn('Ready probe port already in use, skipping', { port: this.options.port });
47
+ console.warn('Ready probe port already in use, skipping', {
48
+ port: this.options.port
49
+ });
47
50
  return;
48
51
  }
49
52
  throw error;
@@ -86,7 +89,7 @@ export class Ready extends Connector {
86
89
  }
87
90
  }
88
91
  export function resolveOptions() {
89
- const env = process.env[READY_ENV];
92
+ const env = environment.get(READY_ENV);
90
93
  if (env === undefined)
91
94
  return { ...DEFAULTS };
92
95
  const decoded = JSON.parse(env);
@@ -1 +1 @@
1
- {"version":3,"file":"Ready.js","sourceRoot":"","sources":["../source/Ready.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Ready.js","sourceRoot":"","sources":["../source/Ready.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE7C,MAAM,OAAO,KAAM,SAAQ,SAAS;IAClB,IAAI,GAAG,OAAO,CAAA;IAEb,MAAM,GAAgB,IAAI,CAAC,YAAY,EAAE,CAAA;IACzC,OAAO,CAAc;IAC9B,KAAK,GAAG,KAAK,CAAA;IACb,SAAS,GAAG,CAAC,CAAA;IACb,SAAS,GAAG,KAAK,CAAA;IACjB,OAAO,GAAG,KAAK,CAAA;IAEvB,YAAmB,OAAqB;QACtC,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;IACnE,CAAC;IAEM,MAAM,CAAC,MAAM;QAClB,MAAM,OAAO,GAAG,cAAc,EAAE,CAAA;QAEhC,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO,IAAI,CAAA;QAEjC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO;YAAE,OAAM;QAE1C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAE3B,IAAI,CAAC;YACH,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC1C,MAAM,OAAO,GAAG,CAAC,KAAY,EAAQ,EAAE;oBACrC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;oBACzC,MAAM,CAAC,KAAK,CAAC,CAAA;gBACf,CAAC,CAAA;gBAED,MAAM,WAAW,GAAG,GAAS,EAAE;oBAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;oBACjC,OAAO,EAAE,CAAA;gBACX,CAAC,CAAA;gBAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;gBAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;gBAC1C,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YACvC,CAAC,CAAC,CAAA;QACJ,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,uEAAuE;YACvE,IAAI,KAAK,EAAE,IAAI,KAAK,YAAY,EAAE,CAAC;gBACjC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;gBACnB,OAAO,CAAC,IAAI,CAAC,2CAA2C,EAAE;oBACxD,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;iBACxB,CAAC,CAAA;gBAEF,OAAM;YACR,CAAC;YAED,MAAM,KAAK,CAAA;QACb,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QAErB,iGAAiG;QACjG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;IACrB,CAAC;IAEM,KAAK,CAAC,QAAQ;QACnB,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;QAEnB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QAEjB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAErB,kFAAkF;QAClF,oFAAoF;QACpF,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAA;IACzB,CAAC;IAEkB,KAAK,CAAC,IAAI;QAC3B,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;IACrB,CAAC;IAEkB,KAAK,CAAC,KAAK;QAC5B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAElB,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,OAAM;QAE3B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAA;QAEtB,mFAAmF;QACnF,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAA;QAEjC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;IAC1E,CAAC;IAED,SAAS,CAAC,OAA6B,EAAE,QAA6B;QACpE,IAAI,OAAO,CAAC,GAAG,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACtC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;YAE7B,OAAM;QACR,CAAC;QAED,IAAI,IAAI,CAAC,KAAK;YAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,eAAe,EAAE,UAAU,EAAE,CAAC,CAAC,GAAG,EAAE,CAAA;aACzE,CAAC;YACJ,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAA;YAE5E,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAC,GAAG,EAAE,CAAA;QAC7D,CAAC;IACH,CAAC;CACF;AAED,MAAM,UAAU,cAAc;IAC5B,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAEtC,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,CAAA;IAE7C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAgB,CAAA;IAE9C,IAAI,OAAO,KAAK,KAAK,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK;QAAE,OAAO,IAAI,CAAA;IAE/D,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI;QACnC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI;KACpC,CAAA;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,KAAkC;IAElC,IAAI,KAAK,KAAK,KAAK;QAAE,OAAO,KAAK,CAAA;IAEjC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,kBAAkB,EAAE,CAAA;IAExE,OAAO;QACL,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,kBAAkB,CAAC,IAAI;QAC3C,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,kBAAkB,CAAC,IAAI;KAC5C,CAAA;AACH,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,qBAAqB,CAAA;AAC9C,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,IAAI;CACF,CAAA;AAEV,MAAM,QAAQ,GAAiB,EAAE,GAAG,kBAAkB,EAAE,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"Ready.test.js","sourceRoot":"","sources":["../source/Ready.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAE3D,OAAO,MAAM,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAE7C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAElC,IAAI,IAAe,CAAA;AACnB,IAAI,QAA6B,CAAA;AAEjC,UAAU,CAAC,GAAG,EAAE;IACd,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAA;IACvB,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;IAChB,OAAO,CAAC,IAAI,GAAG,IAAsC,CAAA;AACvD,CAAC,CAAC,CAAA;AAEF,SAAS,CAAC,GAAG,EAAE;IACb,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAA;AACzB,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;IACvC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAG,CAAA;IAE7B,MAAM,KAAK,CAAC,OAAO,EAAE,CAAA;IACrB,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAA;IAEtB,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;IAE5H,MAAM,KAAK,CAAC,UAAU,EAAE,CAAA;AAC1B,CAAC,CAAC,CAAA;AAEF,+EAA+E;AAC/E,oDAAoD;AACpD,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;IACpE,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAG,CAAA;IAC7B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,EAAG,CAAA;IAE9B,MAAM,KAAK,CAAC,OAAO,EAAE,CAAA;IACrB,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;IAEtB,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAA;IAEvB,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;IAE5H,MAAM,KAAK,CAAC,UAAU,EAAE,CAAA;IACxB,MAAM,MAAM,CAAC,UAAU,EAAE,CAAA;AAC3B,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"Ready.test.js","sourceRoot":"","sources":["../source/Ready.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAE3D,OAAO,MAAM,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAE7C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAElC,IAAI,IAAe,CAAA;AACnB,IAAI,QAA6B,CAAA;AAEjC,UAAU,CAAC,GAAG,EAAE;IACd,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAA;IACvB,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;IAChB,OAAO,CAAC,IAAI,GAAG,IAAsC,CAAA;AACvD,CAAC,CAAC,CAAA;AAEF,SAAS,CAAC,GAAG,EAAE;IACb,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAA;AACzB,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;IACvC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAG,CAAA;IAE7B,MAAM,KAAK,CAAC,OAAO,EAAE,CAAA;IACrB,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAA;IAEtB,MAAM,CAAC,EAAE,CACP,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAClB,CAAC,IAAS,EAAE,EAAE,CACZ,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAC/E,CACF,CAAA;IAED,MAAM,KAAK,CAAC,UAAU,EAAE,CAAA;AAC1B,CAAC,CAAC,CAAA;AAEF,+EAA+E;AAC/E,oDAAoD;AACpD,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;IACpE,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAG,CAAA;IAC7B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,EAAG,CAAA;IAE9B,MAAM,KAAK,CAAC,OAAO,EAAE,CAAA;IACrB,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;IAEtB,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAA;IAEvB,MAAM,CAAC,EAAE,CACP,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAClB,CAAC,IAAS,EAAE,EAAE,CACZ,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAC/E,CACF,CAAA;IAED,MAAM,KAAK,CAAC,UAAU,EAAE,CAAA;IACxB,MAAM,MAAM,CAAC,UAAU,EAAE,CAAA;AAC3B,CAAC,CAAC,CAAA"}
@@ -1,6 +1,7 @@
1
1
  import { Connector } from '@toa.io/core';
2
2
  import type { Task } from 'openspan';
3
- import type { Locator, extensions } from '@toa.io/core';
3
+ import type { Locator } from '@toa.io/core';
4
+ import type { extensions } from '@toa.io/core/types';
4
5
  export declare class Span extends Connector implements extensions.Aspect {
5
6
  readonly name = "span";
6
7
  private readonly locator;
@@ -1 +1 @@
1
- {"version":3,"file":"Span.js","sourceRoot":"","sources":["../source/Span.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAIlC,MAAM,OAAO,IAAK,SAAQ,SAAS;IACjB,IAAI,GAAG,MAAM,CAAA;IACZ,OAAO,CAAS;IAChB,QAAQ,GAA4B,EAAE,CAAA;IAEvD,YAAoB,OAAgB;QAClC,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAED,sCAAsC;IAC/B,KAAK,CAAC,MAAM,CAAE,SAAiB,EAAE,IAAY,EAAE,UAAkC,EAAE,IAAoB;QAC5G,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;YACxC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;YACjC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YAC5B,SAAS;SACV,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QAEvC,IAAI,OAAO,UAAU,KAAK,UAAU;YAClC,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,UAA2B,CAAC,CAAA;;YAE3D,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,IAAK,CAAC,CAAA;IACrD,CAAC;CACF"}
1
+ {"version":3,"file":"Span.js","sourceRoot":"","sources":["../source/Span.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAKlC,MAAM,OAAO,IAAK,SAAQ,SAAS;IACjB,IAAI,GAAG,MAAM,CAAA;IACZ,OAAO,CAAS;IAChB,QAAQ,GAA4B,EAAE,CAAA;IAEvD,YAAmB,OAAgB;QACjC,KAAK,EAAE,CAAA;QAEP,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAED,sCAAsC;IAC/B,KAAK,CAAC,MAAM,CACjB,SAAiB,EACjB,IAAY,EACZ,UAAkC,EAClC,IAAoB;QAEpB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;YACxC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;YACjC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YAC5B,SAAS;SACV,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QAEvC,IAAI,OAAO,UAAU,KAAK,UAAU;YAClC,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,UAA2B,CAAC,CAAA;;YACxD,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,IAAK,CAAC,CAAA;IACxD,CAAC;CACF"}
@@ -1,3 +1,3 @@
1
- import type { Contribution } from '@toa.io/core';
1
+ import type { Contribution } from '@toa.io/core/types';
2
2
  /** What this extension puts on the context of every component, being declared for all. */
3
3
  export declare function context(): Contribution[];
@@ -1,5 +1,6 @@
1
1
  import { type ReadyAnnotation } from './Ready.js';
2
- import type { Connector, Locator, extensions } from '@toa.io/core';
2
+ import type { Connector, Locator } from '@toa.io/core';
3
+ import type { extensions } from '@toa.io/core/types';
3
4
  import type { Dependency } from '@toa.io/operations';
4
5
  import type { ExportersConfig, LevelName } from 'openspan';
5
6
  export declare class Factory implements extensions.Factory {
@@ -3,17 +3,23 @@ import { console, traces } from 'openspan';
3
3
  import { Logs } from './Logs.js';
4
4
  import { Span } from './Span.js';
5
5
  import { DEFAULT_ANNOTATION, normalizeAnnotation, Ready, READY_ENV } from './Ready.js';
6
+ import { environment } from '@toa.io/generic';
6
7
  export class Factory {
7
8
  logsOptions;
8
9
  ready;
9
10
  constructor() {
10
- const globEnv = process.env[LOGS_PREFIX];
11
- const level = process.env.TOA_DEV === '1' ? 'trace' : 'info';
11
+ const globEnv = environment.get(LOGS_PREFIX);
12
+ const level = environment.get('TOA_DEV') === '1' ? 'trace' : 'info';
12
13
  this.logsOptions = globEnv === undefined ? { level } : JSON.parse(globEnv);
13
14
  this.logsOptions.level ??= level;
14
15
  console.configure({ level: this.logsOptions.level });
15
- const tracesEnv = process.env[TRACES_ENV];
16
- traces(tracesEnv === undefined ? development() : JSON.parse(tracesEnv));
16
+ const tracesEnv = environment.get(TRACES_ENV);
17
+ const options = tracesEnv === undefined ? development() : JSON.parse(tracesEnv);
18
+ // `openspan` is not Toa's and reads the environment, which no longer holds the context by
19
+ // the time the exporter is made — so the service is named here
20
+ if (options.exporters?.otlp !== undefined)
21
+ options.exporters.otlp.service ??= environment.get('TOA_CONTEXT');
22
+ traces(options);
17
23
  this.ready = Ready.create();
18
24
  }
19
25
  aspect(locator) {
@@ -36,7 +42,7 @@ export class Factory {
36
42
  return composition;
37
43
  }
38
44
  createLogs(locator) {
39
- const overEnv = process.env[`${LOGS_PREFIX}_${locator.uppercase}`];
45
+ const overEnv = environment.get(`${LOGS_PREFIX}_${locator.uppercase}`);
40
46
  const override = overEnv !== undefined ? JSON.parse(overEnv) : undefined;
41
47
  const { level } = Object.assign({}, this.logsOptions, override);
42
48
  return new Logs(locator, { level });
@@ -52,7 +58,7 @@ export class Factory {
52
58
  * which boots without this extension.
53
59
  */
54
60
  function development() {
55
- const local = process.env.TOA_DEV === '1' || process.env.TOA_BOOT_TRACE === '1';
61
+ const local = environment.get('TOA_DEV') === '1' || environment.get('TOA_BOOT_TRACE') === '1';
56
62
  return local ? { exporters: { console: {} } } : {};
57
63
  }
58
64
  export function deployment(_, annotation) {
@@ -95,7 +101,10 @@ function addTracesVariables(annotation, variables) {
95
101
  assert.ok(typeof rate === 'number' && rate > 0, 'telemetry.traces.rate must be a positive number');
96
102
  if (exporters?.otlp !== undefined)
97
103
  assert.ok(typeof exporters.otlp.endpoint === 'string', 'telemetry.traces.exporters.otlp.endpoint is required');
98
- variables.global.push({ name: TRACES_ENV, value: JSON.stringify({ sample, rate, exporters }) });
104
+ variables.global.push({
105
+ name: TRACES_ENV,
106
+ value: JSON.stringify({ sample, rate, exporters })
107
+ });
99
108
  }
100
109
  const ENV_PREFIX = 'TOA_TELEMETRY';
101
110
  const LOGS_PREFIX = ENV_PREFIX + '_LOGS';
@@ -1 +1 @@
1
- {"version":3,"file":"extension.js","sourceRoot":"","sources":["../source/extension.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"extension.js","sourceRoot":"","sources":["../source/extension.ts"],"names":[],"mappings":"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"}