Skip to content

Commit aff24b8

Browse files
politicianrauno56mentos1386vmarchaud
authored
feat(instrumentation-pino): bump supported pino version to v7.x (open-telemetry#724)
Co-authored-by: Rauno Viskus <[email protected]> Co-authored-by: Tine Jozelj <[email protected]> Co-authored-by: Valentin Marchaud <[email protected]>
1 parent 28e2113 commit aff24b8

File tree

7 files changed

+19
-8
lines changed

7 files changed

+19
-8
lines changed

.github/workflows/unit-test.yml

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ jobs:
1414
- container: "node:8"
1515
lerna-extra-args: >-
1616
--ignore @opentelemetry/instrumentation-aws-sdk
17+
--ignore @opentelemetry/instrumentation-pino
18+
- container: "node:10"
19+
lerna-extra-args: >-
20+
--ignore @opentelemetry/instrumentation-pino
1721
runs-on: ubuntu-latest
1822
container:
1923
image: ${{ matrix.container }}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pino:
2+
versions: ">=5.14.0 < 8"
3+
commands: npm run test
4+
5+
# Fix missing `contrib-test-utils` package
6+
pretest: npm run --prefix ../../../ lerna:link

plugins/node/opentelemetry-instrumentation-pino/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ When no span context is active or the span context is invalid, injection is skip
5555

5656
### Supported versions
5757

58-
`>5.14.0` and `6.x`
58+
`>=5.14.0 <8`
5959

6060
## Useful links
6161

plugins/node/opentelemetry-instrumentation-pino/package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"repository": "open-telemetry/opentelemetry-js-contrib",
88
"scripts": {
99
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
10+
"test-all-versions": "tav",
1011
"tdd": "npm run test -- --watch-extensions ts --watch",
1112
"clean": "rimraf build/*",
1213
"lint": "eslint . --ext .ts",
@@ -59,15 +60,15 @@
5960
"gts": "3.1.0",
6061
"mocha": "7.2.0",
6162
"nyc": "15.1.0",
62-
"pino": "6.13.0",
6363
"rimraf": "3.0.2",
6464
"sinon": "11.1.2",
65+
"test-all-versions": "5.0.1",
6566
"ts-mocha": "8.0.0",
6667
"typescript": "4.3.5"
6768
},
6869
"dependencies": {
6970
"@opentelemetry/instrumentation": "^0.26.0",
70-
"@types/pino": "6.3.11",
71+
"pino": "7.2.0",
7172
"semver": "^7.3.5"
7273
}
73-
}
74+
}

plugins/node/opentelemetry-instrumentation-pino/src/instrumentation.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import {
2828
} from '@opentelemetry/instrumentation';
2929
import { Pino, PinoInstrumentationConfig } from './types';
3030
import { VERSION } from './version';
31-
import type * as pino from 'pino';
31+
import type { pino } from 'pino';
3232

33-
const pinoVersions = ['>=5.14.0 <7'];
33+
const pinoVersions = ['>=5.14.0 <8'];
3434

3535
export class PinoInstrumentation extends InstrumentationBase {
3636
constructor(config: PinoInstrumentationConfig = {}) {

plugins/node/opentelemetry-instrumentation-pino/src/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import { Span } from '@opentelemetry/api';
1818
import { InstrumentationConfig } from '@opentelemetry/instrumentation';
19-
import type * as pino from 'pino';
19+
import type { pino } from 'pino';
2020

2121
// eslint-disable-next-line @typescript-eslint/no-explicit-any
2222
export type LogHookFunction = (span: Span, record: Record<string, any>) => void;

plugins/node/opentelemetry-instrumentation-pino/test/pino.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
2424
import { Writable } from 'stream';
2525
import * as assert from 'assert';
2626
import * as sinon from 'sinon';
27-
import type * as Pino from 'pino';
27+
import type { pino as Pino } from 'pino';
2828

2929
import { PinoInstrumentation } from '../src';
3030

0 commit comments

Comments
 (0)