Skip to content

Commit 2052a24

Browse files
markwolffdyladan
andauthored
feat(backcompat): @types/node backcompat tests (#1352)
Co-authored-by: Daniel Dyla <dyladan@users.noreply.github.com>
1 parent 53f0654 commit 2052a24

File tree

10 files changed

+126
-1
lines changed

10 files changed

+126
-1
lines changed

.github/workflows/backcompat.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Backwards Compatability
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
types-node:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- uses: actions/checkout@v2
11+
12+
- name: restore lerna
13+
uses: actions/cache@master # must use unreleased master to cache multiple paths
14+
id: cache
15+
with:
16+
path: |
17+
node_modules
18+
packages/*/node_modules
19+
metapackages/*/node_modules
20+
key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
21+
22+
- name: Bootstrap
23+
if: steps.cache.outputs.cache-hit != 'true'
24+
run: |
25+
npm install --only=dev --ignore-scripts
26+
npx lerna bootstrap --no-ci --ignore-scripts -- --only=dev
27+
28+
- name: Install and Build API Dependencies
29+
run: npx lerna bootstrap --no-ci --scope backcompat-* --include-filtered-dependencies
30+
31+
- name:
32+
run: |
33+
npm run test:backcompat
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import {NodeSDK, api} from '@opentelemetry/sdk-node';
2+
import {ConsoleSpanExporter} from '@opentelemetry/tracing';
3+
4+
const sdk = new NodeSDK({
5+
traceExporter: new ConsoleSpanExporter(),
6+
autoDetectResources: false,
7+
});
8+
sdk.start();
9+
10+
api.trace.getTracer('test');
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "backcompat-node10",
3+
"version": "1.0.0",
4+
"private": true,
5+
"description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
6+
"main": "index.js",
7+
"scripts": {
8+
"test:backcompat": "tsc --noEmit index.ts"
9+
},
10+
"dependencies": {
11+
"@opentelemetry/sdk-node": "^0.10.2",
12+
"@opentelemetry/tracing": "^0.10.2"
13+
},
14+
"devDependencies": {
15+
"@types/node": "^10.0.0",
16+
"typescript": "^3.9.7"
17+
},
18+
"author": "OpenTelemetry Authors",
19+
"license": "Apache-2.0"
20+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import {NodeSDK, api} from '@opentelemetry/sdk-node';
2+
import {ConsoleSpanExporter} from '@opentelemetry/tracing';
3+
4+
const sdk = new NodeSDK({
5+
traceExporter: new ConsoleSpanExporter(),
6+
autoDetectResources: false,
7+
});
8+
sdk.start();
9+
10+
api.trace.getTracer('test');
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "backcompat-node12",
3+
"version": "1.0.0",
4+
"private": true,
5+
"description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
6+
"main": "index.js",
7+
"scripts": {
8+
"test:backcompat": "tsc --noEmit index.ts"
9+
},
10+
"dependencies": {
11+
"@opentelemetry/sdk-node": "^0.10.2",
12+
"@opentelemetry/tracing": "^0.10.2"
13+
},
14+
"devDependencies": {
15+
"@types/node": "^12.0.0",
16+
"typescript": "^3.9.7"
17+
},
18+
"author": "OpenTelemetry Authors",
19+
"license": "Apache-2.0"
20+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import {NodeSDK, api} from '@opentelemetry/sdk-node';
2+
import {ConsoleSpanExporter} from '@opentelemetry/tracing';
3+
4+
const sdk = new NodeSDK({
5+
traceExporter: new ConsoleSpanExporter(),
6+
autoDetectResources: false,
7+
});
8+
sdk.start();
9+
10+
api.trace.getTracer('test');
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "backcompat-node8",
3+
"version": "1.0.0",
4+
"private": true,
5+
"description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK",
6+
"main": "index.js",
7+
"scripts": {
8+
"test:backcompat": "tsc --noEmit index.ts"
9+
},
10+
"dependencies": {
11+
"@opentelemetry/sdk-node": "^0.10.2",
12+
"@opentelemetry/tracing": "^0.10.2"
13+
},
14+
"devDependencies": {
15+
"@types/node": "^8.0.0",
16+
"typescript": "^3.9.7"
17+
},
18+
"author": "OpenTelemetry Authors",
19+
"license": "Apache-2.0"
20+
}

lerna.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"npmClient": "npm",
44
"packages": [
55
"benchmark/*",
6+
"backwards-compatability/*",
67
"metapackages/*",
78
"packages/*",
89
"integration-tests/*"

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"compile": "lerna run compile",
1414
"test": "lerna run test",
1515
"test:browser": "lerna run test:browser",
16+
"test:backcompat": "lerna run test:backcompat",
1617
"bootstrap": "lerna bootstrap",
1718
"bump": "lerna publish",
1819
"codecov": "lerna run codecov",

packages/opentelemetry-core/src/platform/node/timer-util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
export function unrefTimer(timer: NodeJS.Timeout): void {
16+
export function unrefTimer(timer: NodeJS.Timer): void {
1717
timer.unref();
1818
}

0 commit comments

Comments
 (0)