Skip to content

Commit 9a8d2ac

Browse files
committed
chore: update script for a batch of pacakges
1 parent 6b88fdb commit 9a8d2ac

File tree

34 files changed

+96
-130
lines changed

34 files changed

+96
-130
lines changed

packages/auto-configuration-propagators/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
},
2121
"scripts": {
2222
"clean": "rimraf build/*",
23-
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/auto-configuration-propagators",
2423
"compile": "tsc -p .",
24+
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/auto-configuration-propagators",
2525
"lint": "eslint . --ext .ts",
2626
"lint:fix": "eslint . --ext .ts --fix",
2727
"prepublishOnly": "npm run compile",

packages/auto-instrumentations-node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
},
2525
"scripts": {
2626
"clean": "rimraf build/*",
27-
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/auto-instrumentations-node",
2827
"compile": "tsc -p .",
28+
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/auto-instrumentations-node",
2929
"lint": "eslint . --ext .ts",
3030
"lint:fix": "eslint . --ext .ts --fix",
3131
"prepublishOnly": "npm run compile",

packages/auto-instrumentations-web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
},
2323
"scripts": {
2424
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
25-
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/auto-instrumentations-web",
2625
"compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
26+
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/auto-instrumentations-web",
2727
"lint": "eslint . --ext .ts",
2828
"lint:fix": "eslint . --ext .ts --fix",
2929
"prepublishOnly": "npm run compile",

packages/baggage-log-record-processor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
},
1212
"scripts": {
1313
"clean": "rimraf build/*",
14-
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/baggage-log-record-processor",
1514
"compile": "tsc -p .",
15+
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/baggage-log-record-processor",
1616
"lint": "eslint . --ext .ts",
1717
"lint:fix": "eslint . --ext .ts --fix",
1818
"prewatch": "npm run precompile",

packages/baggage-span-processor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
},
1212
"scripts": {
1313
"clean": "rimraf build/*",
14-
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/baggage-span-processor",
1514
"compile": "tsc -p .",
15+
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/baggage-span-processor",
1616
"lint": "eslint . --ext .ts",
1717
"lint:fix": "eslint . --ext .ts --fix",
1818
"prepublishOnly": "npm run compile",

packages/contrib-test-utils/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"access": "public"
99
},
1010
"scripts": {
11+
"compile": "tsc -p .",
12+
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/contrib-test-utils",
1113
"lint": "eslint . --ext .ts",
1214
"lint:fix": "eslint . --ext .ts --fix",
13-
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/contrib-test-utils",
14-
"compile": "tsc -p .",
1515
"prepublishOnly": "npm run compile",
1616
"watch": "tsc -w"
1717
},

packages/host-metrics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
},
1212
"scripts": {
1313
"clean": "rimraf build/*",
14-
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/host-metrics",
1514
"compile": "tsc -p .",
15+
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/host-metrics",
1616
"lint": "eslint . --ext .ts",
1717
"lint:fix": "eslint . --ext .ts --fix",
1818
"prepublishOnly": "npm run compile",

packages/id-generator-aws-xray/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
"directory": "packages/id-generator-aws-xray"
2020
},
2121
"scripts": {
22-
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/id-generator-aws-xray",
23-
"compile": "tsc --build tsconfig.json tsconfig.esm.json",
2422
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
23+
"compile": "tsc --build tsconfig.json tsconfig.esm.json",
24+
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/id-generator-aws-xray",
2525
"test": "nyc mocha test/**/*.test.ts",
2626
"test:browser": "nyc karma start --single-run",
2727
"lint": "eslint . --ext .ts",

packages/instrumentation-redis/package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@
1010
"directory": "packages/instrumentation-redis"
1111
},
1212
"scripts": {
13-
"test-v2-v3": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/v2-v3/*.test.ts'",
14-
"test": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/v4/*.test.ts'",
15-
"test:debug": "cross-env RUN_REDIS_TESTS_LOCAL=true mocha --inspect-brk --no-timeouts 'test/**/*.test.ts'",
16-
"test:local": "cross-env RUN_REDIS_TESTS_LOCAL=true npm run test",
17-
"test:docker:run": "docker run --rm -d --name otel-redis -p 63790:6379 redis:alpine",
18-
"test:docker:stop": "docker stop otel-redis",
19-
"test-all-versions": "tav",
20-
"test-all-versions:local": "cross-env RUN_REDIS_TESTS_LOCAL=true npm run test-all-versions",
21-
"tdd": "npm run test -- --watch-extensions ts --watch",
2213
"clean": "rimraf build/*",
14+
"compile": "tsc -p .",
15+
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-redis",
2316
"lint": "eslint . --ext .ts",
2417
"lint:fix": "eslint . --ext .ts --fix",
2518
"lint:readme": "node ../../scripts/lint-readme.js",
26-
"version:update": "node ../../scripts/version-update.js",
27-
"compile:with-dependencies": "nx run-many -t compile -p @opentelemetry/instrumentation-redis",
28-
"compile": "tsc -p .",
29-
"prepublishOnly": "npm run compile"
19+
"prepublishOnly": "npm run compile",
20+
"tdd": "npm run test -- --watch-extensions ts --watch",
21+
"test-v2-v3": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/v2-v3/*.test.ts'",
22+
"test": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/v4/*.test.ts'",
23+
"test:debug": "cross-env RUN_REDIS_TESTS=true mocha --inspect-brk --no-timeouts 'test/**/*.test.ts'",
24+
"test:with-services-env": "cross-env NODE_OPTIONS='-r dotenv/config' DOTENV_CONFIG_PATH=../../test/test-services.env npm test",
25+
"test-all-versions": "tav",
26+
"test-all-versions:with-services-env": "cross-env NODE_OPTIONS='-r dotenv/config' DOTENV_CONFIG_PATH=../../test/test-services.env npm run test-all-versions",
27+
"test-services:start": "cd ../.. && npm run test-services:start redis",
28+
"test-services:stop": "cd ../.. && npm run test-services:stop redis",
29+
"version:update": "node ../../scripts/version-update.js"
3030
},
3131
"keywords": [
3232
"instrumentation",

packages/instrumentation-redis/test/v2-v3/redis.test.ts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ const unsetStatus: SpanStatus = {
6262

6363
describe('redis v2-v3', () => {
6464
let redis: any;
65-
const shouldTestLocal = process.env.RUN_REDIS_TESTS_LOCAL;
66-
const shouldTest = process.env.RUN_REDIS_TESTS || shouldTestLocal;
65+
const shouldTest = process.env.RUN_REDIS_TESTS;
6766
const tracer = trace.getTracer('external');
6867

6968
before(function () {
@@ -75,19 +74,9 @@ describe('redis v2-v3', () => {
7574
this.skip();
7675
}
7776

78-
if (shouldTestLocal) {
79-
testUtils.startDocker('redis');
80-
}
81-
8277
redis = require('redis');
8378
});
8479

85-
after(() => {
86-
if (shouldTestLocal) {
87-
testUtils.cleanUpDocker('redis');
88-
}
89-
});
90-
9180
describe('#createClient()', () => {
9281
it('should propagate the current span to event handlers', done => {
9382
const span = tracer.startSpan('test span');

0 commit comments

Comments
 (0)