Skip to content

Commit 7ca9327

Browse files
authored
[Bugfix] incompatible opentelemetry package version (#138)
* Update dependencies * Fix service name retrieval in `_addOpentelemetryContext` * Update README.md * Update test workflow dependencies * Drop support for `node14` + test `node22` * Update README.md * close loggers in tests * Update README.md * Update package.json
1 parent 21d36b7 commit 7ca9327

File tree

6 files changed

+78
-142
lines changed

6 files changed

+78
-142
lines changed

.github/workflows/test-nodejs.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
node-version: [14.x, 16.x, 18.x, 20.x]
14+
node-version: [ 16.x, 18.x, 20.x, 22.x]
1515
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v4
1818
- name: Use Node.js ${{ matrix.node-version }}
19-
uses: actions/setup-node@v2
19+
uses: actions/setup-node@v4
2020
with:
2121
node-version: ${{ matrix.node-version }}
22-
cache: 'npm'
2322
- run: npm ci
2423
- run: npm install --save request
2524
- run: npm run test

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@ var logger = require('logzio-nodejs').createLogger({
124124
```
125125

126126
## Update log
127+
**2.4.0**
128+
- Update dependencies:
129+
- `@opentelemetry/context-async-hooks` -> `^2.0.0`
130+
- `@opentelemetry/sdk-trace-node` -> `^2.0.0`
131+
- Fix service name retrieval in `_addOpentelemetryContext`
132+
- Drop support for `Node 14`
127133

128134
**2.3.0**
129135
- Add a method to flush the list of logs (@MarceloRGonc)

lib/logzio-nodejs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ class LogzioLogger {
253253
if (span) {
254254
msg.trace_id = span.spanContext().traceId;
255255
msg.span_id = span.spanContext().spanId;
256-
msg.service_name = span.resource._attributes['service.name'];
256+
msg.service_name = span.resource.attributes['service.name'];
257257
}
258258
}
259259
log(msg, obj) {

package-lock.json

Lines changed: 63 additions & 134 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "logzio-nodejs",
33
"description": "A nodejs implementation for sending logs to Logz.IO cloud service Copy of logzio-nodejs",
4-
"version": "2.3.0",
4+
"version": "2.4.0",
55
"author": "Gilly Barr <gilly@logz.io>",
66
"maintainers": [
77
{
@@ -48,8 +48,8 @@
4848
],
4949
"dependencies": {
5050
"@opentelemetry/api": "^1.9.0",
51-
"@opentelemetry/context-async-hooks": "^1.30.0",
52-
"@opentelemetry/sdk-trace-node": "^1.30.0",
51+
"@opentelemetry/context-async-hooks": "^2.0.0",
52+
"@opentelemetry/sdk-trace-node": "^2.0.0",
5353
"axios": "^1.6.4",
5454
"json-stringify-safe": "5.0.1",
5555
"lodash.assign": "4.2.0",

test/logger.test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ describe('logger', () => {
6161
const loggedMessage = logger._createBulk.getCall(0).args[0][0];
6262
assert(loggedMessage.trace_id, 'trace_id should exist');
6363
assert(loggedMessage.span_id, 'span_id should exist');
64+
logger.close();
6465
});
6566

6667
it('should not attach traceId or spanId when no span is active', () => {
@@ -77,6 +78,7 @@ describe('logger', () => {
7778
const loggedMessage = logger._createBulk.getCall(0).args[0][0];
7879
assert.strictEqual(loggedMessage.trace_id, undefined, 'trace_id should not exist');
7980
assert.strictEqual(loggedMessage.span_id, undefined, 'span_id should not exist');
81+
logger.close();
8082
});
8183
});
8284
describe('logs a single line', () => {

0 commit comments

Comments
 (0)