@diia-inhouse/diia-app 18.1.0 → 18.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/interfaces/tracing.js +2 -0
- package/dist/interfaces/tracing.js.map +1 -1
- package/dist/tracing/index.js +4 -0
- package/dist/tracing/index.js.map +1 -1
- package/dist/types/interfaces/tracing.d.ts +1 -0
- package/package.json +17 -17
- package/src/interfaces/tracing.ts +2 -0
- package/src/tracing/index.ts +5 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/interfaces/tracing.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/interfaces/tracing.ts"],"names":[],"mappings":";;;AAUa,QAAA,sCAAsC,GAAG,+BAA+B,CAAA"}
|
package/dist/tracing/index.js
CHANGED
|
@@ -10,6 +10,7 @@ const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
|
|
|
10
10
|
const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
|
|
11
11
|
const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
|
|
12
12
|
const lodash_1 = require("lodash");
|
|
13
|
+
const tracing_1 = require("../interfaces/tracing");
|
|
13
14
|
function getIgnoreIncomingRequestHook(paths = []) {
|
|
14
15
|
const ignoreIncomingPaths = new Set(['/metrics', '/ready', '/start', '/live'].concat(paths));
|
|
15
16
|
return ({ url }) => {
|
|
@@ -45,6 +46,9 @@ const defaultConfig = {
|
|
|
45
46
|
}
|
|
46
47
|
},
|
|
47
48
|
consumeHook: (span, consumeInfo) => {
|
|
49
|
+
for (const [key, value] of Object.entries(consumeInfo.msg.properties)) {
|
|
50
|
+
span.setAttribute(`${tracing_1.SEMATTRS_MESSAGING_RABBITMQ_ATTRIBUTES}.${key}`, value);
|
|
51
|
+
}
|
|
48
52
|
if (consumeInfo.msg.fields.exchange.includes('reply-to') || consumeInfo.msg.fields.routingKey.includes('reply-to')) {
|
|
49
53
|
span.updateName('amq.rabbitmq.reply-to');
|
|
50
54
|
span.setAttributes({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tracing/index.ts"],"names":[],"mappings":";;;AAAA,4CAAgF;AAChF,0FAAuF;AACvF,sFAA2E;AAC3E,oEAAyE;AAGzE,wDAAmD;AACnD,kEAA4G;AAC5G,kEAAkE;AAClE,8EAA8E;AAC9E,mCAA8B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tracing/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@diia-inhouse/diia-app",
|
|
3
|
-
"version": "18.
|
|
3
|
+
"version": "18.2.0",
|
|
4
4
|
"description": "Application package with IoC container",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/types/index.d.ts",
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"src"
|
|
13
13
|
],
|
|
14
14
|
"engines": {
|
|
15
|
-
"node": ">=
|
|
15
|
+
"node": ">=20"
|
|
16
16
|
},
|
|
17
17
|
"scripts": {
|
|
18
18
|
"prebuild": "rimraf dist",
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"awilix": "10.0.2",
|
|
51
51
|
"cookie-parser": "1.4.6",
|
|
52
52
|
"dotenv-flow": "3.3.0",
|
|
53
|
-
"glob": "
|
|
53
|
+
"glob": "11.0.0",
|
|
54
54
|
"lodash": "4.17.21",
|
|
55
55
|
"moleculer": "0.14.33",
|
|
56
56
|
"moleculer-web": "0.10.7",
|
|
@@ -100,35 +100,35 @@
|
|
|
100
100
|
}
|
|
101
101
|
},
|
|
102
102
|
"devDependencies": {
|
|
103
|
-
"@diia-inhouse/configs": "
|
|
104
|
-
"@diia-inhouse/crypto": "1.11.
|
|
105
|
-
"@diia-inhouse/db": "4.
|
|
106
|
-
"@diia-inhouse/diia-logger": "3.
|
|
103
|
+
"@diia-inhouse/configs": "2.2.0",
|
|
104
|
+
"@diia-inhouse/crypto": "1.11.1",
|
|
105
|
+
"@diia-inhouse/db": "4.13.1",
|
|
106
|
+
"@diia-inhouse/diia-logger": "3.3.0",
|
|
107
107
|
"@diia-inhouse/diia-metrics": "3.12.0",
|
|
108
|
-
"@diia-inhouse/diia-queue": "
|
|
108
|
+
"@diia-inhouse/diia-queue": "8.0.0",
|
|
109
109
|
"@diia-inhouse/env": "1.16.0",
|
|
110
110
|
"@diia-inhouse/errors": "1.10.0",
|
|
111
111
|
"@diia-inhouse/eslint-config": "5.1.0",
|
|
112
112
|
"@diia-inhouse/eslint-plugin": "1.6.0",
|
|
113
|
-
"@diia-inhouse/features": "2.1
|
|
114
|
-
"@diia-inhouse/genproto": "
|
|
113
|
+
"@diia-inhouse/features": "2.3.1",
|
|
114
|
+
"@diia-inhouse/genproto": "2.0.1",
|
|
115
115
|
"@diia-inhouse/healthcheck": "1.12.0",
|
|
116
|
-
"@diia-inhouse/redis": "2.
|
|
117
|
-
"@diia-inhouse/test": "6.
|
|
118
|
-
"@diia-inhouse/types": "6.
|
|
119
|
-
"@diia-inhouse/utils": "
|
|
116
|
+
"@diia-inhouse/redis": "2.13.1",
|
|
117
|
+
"@diia-inhouse/test": "6.4.0",
|
|
118
|
+
"@diia-inhouse/types": "6.51.0",
|
|
119
|
+
"@diia-inhouse/utils": "4.0.0",
|
|
120
120
|
"@diia-inhouse/validators": "1.17.0",
|
|
121
121
|
"@opentelemetry/instrumentation-amqplib": "0.38.0",
|
|
122
122
|
"@opentelemetry/instrumentation-http": "0.52.0",
|
|
123
123
|
"@opentelemetry/otlp-grpc-exporter-base": "0.52.0",
|
|
124
124
|
"@types/cookie-parser": "1.4.7",
|
|
125
|
-
"@types/lodash": "4.17.
|
|
126
|
-
"@types/node": "
|
|
125
|
+
"@types/lodash": "4.17.7",
|
|
126
|
+
"@types/node": "22.0.3",
|
|
127
127
|
"@types/pluralize": "0.0.33",
|
|
128
128
|
"eslint": "8.57.0",
|
|
129
129
|
"lockfile-lint": "4.14.0",
|
|
130
130
|
"madge": "7.0.0",
|
|
131
|
-
"prettier": "3.3.
|
|
131
|
+
"prettier": "3.3.3",
|
|
132
132
|
"type-fest": "4.8.2",
|
|
133
133
|
"typescript": "5.4.5"
|
|
134
134
|
},
|
package/src/tracing/index.ts
CHANGED
|
@@ -10,7 +10,7 @@ import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'
|
|
|
10
10
|
import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions'
|
|
11
11
|
import { merge } from 'lodash'
|
|
12
12
|
|
|
13
|
-
import { OpentelemetryTracingConfig } from '../interfaces/tracing'
|
|
13
|
+
import { OpentelemetryTracingConfig, SEMATTRS_MESSAGING_RABBITMQ_ATTRIBUTES } from '../interfaces/tracing'
|
|
14
14
|
|
|
15
15
|
export function getIgnoreIncomingRequestHook(paths: string[] = []): IgnoreIncomingRequestFunction {
|
|
16
16
|
const ignoreIncomingPaths = new Set(['/metrics', '/ready', '/start', '/live'].concat(paths))
|
|
@@ -49,6 +49,10 @@ const defaultConfig: OpentelemetryTracingConfig = {
|
|
|
49
49
|
}
|
|
50
50
|
},
|
|
51
51
|
consumeHook: (span: Span, consumeInfo: ConsumeInfo) => {
|
|
52
|
+
for (const [key, value] of Object.entries(consumeInfo.msg.properties)) {
|
|
53
|
+
span.setAttribute(`${SEMATTRS_MESSAGING_RABBITMQ_ATTRIBUTES}.${key}`, value)
|
|
54
|
+
}
|
|
55
|
+
|
|
52
56
|
if (consumeInfo.msg.fields.exchange.includes('reply-to') || consumeInfo.msg.fields.routingKey.includes('reply-to')) {
|
|
53
57
|
span.updateName('amq.rabbitmq.reply-to')
|
|
54
58
|
span.setAttributes({
|