otlp-logger 1.1.13 → 2.0.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/lib/otlp-logger.js +37 -11
- package/package.json +9 -9
- package/types/otlp-logger.d.ts.map +1 -1
package/lib/otlp-logger.js
CHANGED
|
@@ -9,10 +9,28 @@ const {
|
|
|
9
9
|
envDetector,
|
|
10
10
|
hostDetector,
|
|
11
11
|
osDetector,
|
|
12
|
-
processDetector
|
|
12
|
+
processDetector,
|
|
13
|
+
serviceInstanceIdDetector
|
|
13
14
|
} = require('@opentelemetry/resources')
|
|
14
15
|
const { createLogProcessor } = require('./create-log-processor')
|
|
15
16
|
|
|
17
|
+
const defaultDetectors = [
|
|
18
|
+
envDetector,
|
|
19
|
+
hostDetector,
|
|
20
|
+
osDetector,
|
|
21
|
+
processDetector,
|
|
22
|
+
serviceInstanceIdDetector
|
|
23
|
+
]
|
|
24
|
+
|
|
25
|
+
const detectorsMapping = {
|
|
26
|
+
env: envDetector,
|
|
27
|
+
host: hostDetector,
|
|
28
|
+
os: osDetector,
|
|
29
|
+
process: processDetector,
|
|
30
|
+
serviceinstance: serviceInstanceIdDetector,
|
|
31
|
+
all: defaultDetectors
|
|
32
|
+
}
|
|
33
|
+
|
|
16
34
|
/**
|
|
17
35
|
* @typedef {Object} Options
|
|
18
36
|
* @property {string} loggerName
|
|
@@ -23,22 +41,30 @@ const { createLogProcessor } = require('./create-log-processor')
|
|
|
23
41
|
* @param {Options} opts
|
|
24
42
|
*/
|
|
25
43
|
function getOtlpLogger (opts) {
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
44
|
+
const envValue = (process.env.OTEL_NODE_RESOURCE_DETECTORS || '').trim()
|
|
45
|
+
const detectorNames = envValue ? envValue.split(',').map(s => s.trim()) : []
|
|
46
|
+
const detectors = envValue
|
|
47
|
+
? detectorNames.includes('none')
|
|
48
|
+
? []
|
|
49
|
+
: detectorNames.map(s => detectorsMapping[s]).flat().filter(Boolean)
|
|
50
|
+
: defaultDetectors
|
|
51
|
+
|
|
52
|
+
const detectedResource = detectResources({ detectors })
|
|
34
53
|
|
|
35
|
-
const logRecordProcessorOptionsArray = Array.isArray(
|
|
54
|
+
const logRecordProcessorOptionsArray = Array.isArray(
|
|
55
|
+
opts.logRecordProcessorOptions
|
|
56
|
+
)
|
|
57
|
+
? opts.logRecordProcessorOptions
|
|
58
|
+
: [opts.logRecordProcessorOptions]
|
|
36
59
|
|
|
37
60
|
const loggerProvider = new LoggerProvider({
|
|
38
61
|
resource: detectedResource.merge(
|
|
39
62
|
resourceFromAttributes({ ...opts.resourceAttributes })
|
|
40
63
|
),
|
|
41
|
-
processors: logRecordProcessorOptionsArray.map(
|
|
64
|
+
processors: logRecordProcessorOptionsArray.map(
|
|
65
|
+
(logRecordProcessorOptions) =>
|
|
66
|
+
createLogProcessor(logRecordProcessorOptions)
|
|
67
|
+
)
|
|
42
68
|
})
|
|
43
69
|
|
|
44
70
|
logs.setGlobalLoggerProvider(loggerProvider)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "otlp-logger",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.0",
|
|
4
4
|
"description": "Exports logs to OpenTelemetry Collector using OTLP protocol",
|
|
5
5
|
"main": "lib/otlp-logger.js",
|
|
6
6
|
"scripts": {
|
|
@@ -17,21 +17,21 @@
|
|
|
17
17
|
"repository": "github:Vunovati/otlp-logger",
|
|
18
18
|
"license": "MIT",
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opentelemetry/api-logs": "^0.
|
|
21
|
-
"@opentelemetry/exporter-logs-otlp-grpc": "^0.
|
|
22
|
-
"@opentelemetry/exporter-logs-otlp-http": "^0.
|
|
23
|
-
"@opentelemetry/exporter-logs-otlp-proto": "^0.
|
|
20
|
+
"@opentelemetry/api-logs": "^0.212.0",
|
|
21
|
+
"@opentelemetry/exporter-logs-otlp-grpc": "^0.212.0",
|
|
22
|
+
"@opentelemetry/exporter-logs-otlp-http": "^0.212.0",
|
|
23
|
+
"@opentelemetry/exporter-logs-otlp-proto": "^0.212.0",
|
|
24
24
|
"@opentelemetry/resources": "^2.0.0",
|
|
25
|
-
"@opentelemetry/sdk-logs": "^0.
|
|
25
|
+
"@opentelemetry/sdk-logs": "^0.212.0"
|
|
26
26
|
},
|
|
27
27
|
"types": "./types/otlp-logger.d.ts",
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@commitlint/cli": "^20.0.0",
|
|
30
30
|
"@commitlint/config-conventional": "^20.0.0",
|
|
31
31
|
"@opentelemetry/api": "^1.4.1",
|
|
32
|
-
"@opentelemetry/instrumentation-http": "^0.
|
|
33
|
-
"@opentelemetry/sdk-node": "^0.
|
|
34
|
-
"@types/node": "^
|
|
32
|
+
"@opentelemetry/instrumentation-http": "^0.212.0",
|
|
33
|
+
"@opentelemetry/sdk-node": "^0.212.0",
|
|
34
|
+
"@types/node": "^25.3.0",
|
|
35
35
|
"husky": "^9.0.10",
|
|
36
36
|
"require-inject": "^1.4.4",
|
|
37
37
|
"snazzy": "^9.0.0",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otlp-logger.d.ts","sourceRoot":"","sources":["../lib/otlp-logger.js"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"otlp-logger.d.ts","sourceRoot":"","sources":["../lib/otlp-logger.js"],"names":[],"mappings":";gBAmCc,MAAM;oBACN,MAAM;gCACN,OAAO,wBAAwB,EAAE,yBAAyB,GAAG,OAAO,wBAAwB,EAAE,yBAAyB,EAAE;;;AAJvI;;;;;;;;GAQG;AACH,oCAFW,OAAO;IAkCd;;OAEG;cADQ,OAAO,yBAAyB,EAAE,SAAS;;EASzD"}
|