Skip to content

Commit f497313

Browse files
rauno56rauno56
authored
fix: use localhost for services in CI (open-telemetry#816)
1 parent 359fee8 commit f497313

File tree

29 files changed

+199
-193
lines changed

29 files changed

+199
-193
lines changed

‎.github/workflows/test-all-versions.yml

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55

66
jobs:
77
tav:
8+
# skip the workflow for now #816
9+
if: false
810
name: run test-all-version (tav)
911
runs-on: ubuntu-latest
1012
services:

‎.github/workflows/unit-test.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -74,25 +74,24 @@ jobs:
7474
RUN_MYSQL_TESTS: 1
7575
RUN_POSTGRES_TESTS: 1
7676
RUN_REDIS_TESTS: 1
77-
OPENTELEMETRY_MEMCACHED_HOST: memcached
77+
OPENTELEMETRY_MEMCACHED_HOST: localhost
7878
OPENTELEMETRY_MEMCACHED_PORT: 11211
7979
POSTGRES_USER: postgres
8080
POSTGRES_DB: circle_database
81-
POSTGRES_HOST: postgres
81+
POSTGRES_HOST: localhost
8282
POSTGRES_PORT: 5432
83-
OPENTELEMETRY_REDIS_HOST: redis
83+
OPENTELEMETRY_REDIS_HOST: localhost
8484
OPENTELEMETRY_REDIS_PORT: 6379
8585
MONGODB_DB: opentelemetry-tests
86-
MONGODB_HOST: mongo
86+
MONGODB_HOST: localhost
8787
MONGODB_PORT: 27017
8888
MYSQL_USER: otel
8989
MYSQL_PASSWORD: secret
9090
MYSQL_DATABASE: circle_database
91-
MYSQL_HOST: mysql
91+
MYSQL_HOST: localhost
9292
MYSQL_PORT: 3306
9393
NPM_CONFIG_UNSAFE_PERM: true
94-
CASSANDRA_HOST: cassandra
95-
CASSANDRA_PORT: 9042
94+
CASSANDRA_HOST: localhost
9695
steps:
9796
- name: Checkout
9897
uses: actions/checkout@v2

‎plugins/node/opentelemetry-instrumentation-aws-lambda/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
"compile": "npm run version:update && tsc -p ."
2020
},
2121
"keywords": [
22-
"opentelemetry",
2322
"aws-lambda",
23+
"instrumentation",
2424
"nodejs",
25-
"tracing",
25+
"opentelemetry",
2626
"profiling",
27-
"instrumentation"
27+
"tracing"
2828
],
2929
"author": "OpenTelemetry Authors",
3030
"license": "Apache-2.0",
@@ -67,4 +67,4 @@
6767
"@opentelemetry/semantic-conventions": "^1.0.0",
6868
"@types/aws-lambda": "8.10.81"
6969
}
70-
}
70+
}

‎plugins/node/opentelemetry-instrumentation-aws-sdk/package.json

+82-81
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,83 @@
11
{
2-
"name": "@opentelemetry/instrumentation-aws-sdk",
3-
"version": "0.4.0",
4-
"description": "OpenTelemetry automatic instrumentation for the `aws-sdk` package",
5-
"keywords": [
6-
"aws",
7-
"opentelemetry",
8-
"aws-sdk"
9-
],
10-
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
11-
"license": "Apache-2.0",
12-
"author": "OpenTelemetry Authors",
13-
"bugs": {
14-
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
15-
},
16-
"main": "build/src/index.js",
17-
"types": "build/src/index.d.ts",
18-
"files": [
19-
"build/src/**/*.js",
20-
"build/src/**/*.js.map",
21-
"build/src/**/*.d.ts",
22-
"doc",
23-
"LICENSE",
24-
"README.md"
25-
],
26-
"publishConfig": {
27-
"access": "public"
28-
},
29-
"repository": "open-telemetry/opentelemetry-js-contrib",
30-
"scripts": {
31-
"clean": "rimraf build/*",
32-
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
33-
"compile": "npm run version:update && tsc -p .",
34-
"lint": "eslint . --ext .ts",
35-
"lint:fix": "eslint . --ext .ts --fix",
36-
"precompile": "tsc --version && lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
37-
"prewatch": "npm run precompile",
38-
"prepare": "npm run compile",
39-
"tdd": "npm run test -- --watch-extensions ts --watch",
40-
"test": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'",
41-
"test-all-versions": "tav",
42-
"version:update": "node ../../../scripts/version-update.js",
43-
"watch": "tsc -w"
44-
},
45-
"peerDependencies": {
46-
"@opentelemetry/api": "^1.0.1"
47-
},
48-
"dependencies": {
49-
"@opentelemetry/core": "^1.0.0",
50-
"@opentelemetry/instrumentation": "^0.27.0",
51-
"@opentelemetry/semantic-conventions": "^1.0.0",
52-
"@opentelemetry/propagation-utils": "^0.26.0"
53-
},
54-
"devDependencies": {
55-
"@aws-sdk/client-dynamodb": "3.37.0",
56-
"@aws-sdk/client-s3": "3.37.0",
57-
"@aws-sdk/client-sqs": "3.37.0",
58-
"@aws-sdk/types": "3.37.0",
59-
"@opentelemetry/api": "1.0.1",
60-
"@opentelemetry/sdk-trace-base": "1.0.1",
61-
"@types/mocha": "8.2.3",
62-
"@types/node": "14.18.2",
63-
"@types/sinon": "10.0.6",
64-
"aws-sdk": "2.1008.0",
65-
"eslint": "7.32.0",
66-
"expect": "27.4.2",
67-
"mocha": "7.2.0",
68-
"nock": "13.2.1",
69-
"nyc": "15.1.0",
70-
"rimraf": "3.0.2",
71-
"sinon": "12.0.1",
72-
"gts": "3.1.0",
73-
"@opentelemetry/contrib-test-utils": "^0.28.0",
74-
"test-all-versions": "5.0.1",
75-
"ts-mocha": "8.0.0",
76-
"ts-node": "9.1.1",
77-
"typescript": "4.3.4"
78-
},
79-
"engines": {
80-
"node": ">=8.5.0"
81-
}
82-
}
2+
"name": "@opentelemetry/instrumentation-aws-sdk",
3+
"version": "0.4.0",
4+
"description": "OpenTelemetry automatic instrumentation for the `aws-sdk` package",
5+
"keywords": [
6+
"aws",
7+
"aws-sdk",
8+
"nodejs",
9+
"opentelemetry"
10+
],
11+
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
12+
"license": "Apache-2.0",
13+
"author": "OpenTelemetry Authors",
14+
"bugs": {
15+
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
16+
},
17+
"main": "build/src/index.js",
18+
"types": "build/src/index.d.ts",
19+
"files": [
20+
"build/src/**/*.js",
21+
"build/src/**/*.js.map",
22+
"build/src/**/*.d.ts",
23+
"doc",
24+
"LICENSE",
25+
"README.md"
26+
],
27+
"publishConfig": {
28+
"access": "public"
29+
},
30+
"repository": "open-telemetry/opentelemetry-js-contrib",
31+
"scripts": {
32+
"clean": "rimraf build/*",
33+
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
34+
"compile": "npm run version:update && tsc -p .",
35+
"lint": "eslint . --ext .ts",
36+
"lint:fix": "eslint . --ext .ts --fix",
37+
"precompile": "tsc --version && lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
38+
"prewatch": "npm run precompile",
39+
"prepare": "npm run compile",
40+
"tdd": "npm run test -- --watch-extensions ts --watch",
41+
"test": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'",
42+
"test-all-versions": "tav",
43+
"version:update": "node ../../../scripts/version-update.js",
44+
"watch": "tsc -w"
45+
},
46+
"peerDependencies": {
47+
"@opentelemetry/api": "^1.0.1"
48+
},
49+
"dependencies": {
50+
"@opentelemetry/core": "^1.0.0",
51+
"@opentelemetry/instrumentation": "^0.27.0",
52+
"@opentelemetry/semantic-conventions": "^1.0.0",
53+
"@opentelemetry/propagation-utils": "^0.26.0"
54+
},
55+
"devDependencies": {
56+
"@aws-sdk/client-dynamodb": "3.37.0",
57+
"@aws-sdk/client-s3": "3.37.0",
58+
"@aws-sdk/client-sqs": "3.37.0",
59+
"@aws-sdk/types": "3.37.0",
60+
"@opentelemetry/api": "1.0.1",
61+
"@opentelemetry/sdk-trace-base": "1.0.1",
62+
"@types/mocha": "8.2.3",
63+
"@types/node": "14.18.2",
64+
"@types/sinon": "10.0.6",
65+
"aws-sdk": "2.1008.0",
66+
"eslint": "7.32.0",
67+
"expect": "27.4.2",
68+
"mocha": "7.2.0",
69+
"nock": "13.2.1",
70+
"nyc": "15.1.0",
71+
"rimraf": "3.0.2",
72+
"sinon": "12.0.1",
73+
"gts": "3.1.0",
74+
"@opentelemetry/contrib-test-utils": "^0.28.0",
75+
"test-all-versions": "5.0.1",
76+
"ts-mocha": "8.0.0",
77+
"ts-node": "9.1.1",
78+
"typescript": "4.3.4"
79+
},
80+
"engines": {
81+
"node": ">=8.5.0"
82+
}
83+
}

‎plugins/node/opentelemetry-instrumentation-bunyan/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
"version:update": "node ../../../scripts/version-update.js"
2121
},
2222
"keywords": [
23-
"opentelemetry",
23+
"bunyan",
24+
"instrumentation",
2425
"logging",
2526
"nodejs",
26-
"tracing",
27+
"opentelemetry",
2728
"profiling",
28-
"instrumentation",
29-
"bunyan"
29+
"tracing"
3030
],
3131
"author": "OpenTelemetry Authors",
3232
"license": "Apache-2.0",

‎plugins/node/opentelemetry-instrumentation-cassandra/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
"compile": "npm run version:update && tsc -p ."
2020
},
2121
"keywords": [
22-
"opentelemetry",
22+
"cassandra-driver",
23+
"instrumentation",
2324
"logging",
2425
"nodejs",
25-
"tracing",
26+
"opentelemetry",
2627
"profiling",
27-
"instrumentation",
28-
"cassandra-driver"
28+
"tracing"
2929
],
3030
"author": "OpenTelemetry Authors",
3131
"license": "Apache-2.0",
@@ -70,4 +70,4 @@
7070
"@opentelemetry/instrumentation": "^0.27.0",
7171
"@opentelemetry/semantic-conventions": "^1.0.0"
7272
}
73-
}
73+
}

‎plugins/node/opentelemetry-instrumentation-cassandra/test/cassandra-driver.test.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,10 @@ describe('CassandraDriverInstrumentation', () => {
134134
instrumentation.setTracerProvider(provider);
135135

136136
const cassandra = require('cassandra-driver');
137-
const endpoint = testCassandraLocally ? '127.0.0.1' : 'cassandra';
137+
const endpoint =
138+
process.env.CASSANDRA_HOST ?? testCassandraLocally
139+
? '127.0.0.1'
140+
: 'cassandra';
138141
client = new cassandra.Client({
139142
contactPoints: [endpoint],
140143
localDataCenter: 'datacenter1',

‎plugins/node/opentelemetry-instrumentation-connect/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
"watch": "tsc -w"
2020
},
2121
"keywords": [
22-
"opentelemetry",
2322
"connect",
23+
"instrumentation",
2424
"nodejs",
25-
"tracing",
25+
"opentelemetry",
2626
"profiling",
27-
"instrumentation"
27+
"tracing"
2828
],
2929
"author": "OpenTelemetry Authors",
3030
"license": "Apache-2.0",
@@ -66,4 +66,4 @@
6666
"@opentelemetry/semantic-conventions": "^1.0.0",
6767
"@types/connect": "3.4.35"
6868
}
69-
}
69+
}

‎plugins/node/opentelemetry-instrumentation-dns/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
"compile": "npm run version:update && tsc -p ."
2020
},
2121
"keywords": [
22-
"opentelemetry",
2322
"dns",
23+
"instrumentation",
2424
"nodejs",
25-
"tracing",
25+
"opentelemetry",
2626
"profiling",
27-
"instrumentation"
27+
"tracing"
2828
],
2929
"author": "OpenTelemetry Authors",
3030
"license": "Apache-2.0",
@@ -69,4 +69,4 @@
6969
"@opentelemetry/semantic-conventions": "^1.0.0",
7070
"semver": "^7.3.2"
7171
}
72-
}
72+
}

‎plugins/node/opentelemetry-instrumentation-express/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
"watch": "tsc -w"
2121
},
2222
"keywords": [
23-
"opentelemetry",
2423
"express",
24+
"instrumentation",
2525
"nodejs",
26-
"tracing",
26+
"opentelemetry",
2727
"profiling",
28-
"instrumentation"
28+
"tracing"
2929
],
3030
"author": "OpenTelemetry Authors",
3131
"license": "Apache-2.0",
@@ -68,4 +68,4 @@
6868
"@opentelemetry/semantic-conventions": "^1.0.0",
6969
"@types/express": "4.17.13"
7070
}
71-
}
71+
}

‎plugins/node/opentelemetry-instrumentation-fastify/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
"watch": "tsc -w"
1919
},
2020
"keywords": [
21-
"opentelemetry",
2221
"fastify",
22+
"instrumentation",
2323
"nodejs",
24-
"tracing",
24+
"opentelemetry",
2525
"profiling",
26-
"instrumentation"
26+
"tracing"
2727
],
2828
"author": "OpenTelemetry Authors",
2929
"license": "Apache-2.0",
@@ -68,4 +68,4 @@
6868
"@opentelemetry/semantic-conventions": "^1.0.0",
6969
"fastify": "^3.19.2"
7070
}
71-
}
71+
}

‎plugins/node/opentelemetry-instrumentation-generic-pool/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
"watch": "tsc -w"
2121
},
2222
"keywords": [
23-
"opentelemetry",
2423
"generic-pool",
24+
"instrumentation",
2525
"nodejs",
26-
"tracing",
27-
"instrumentation"
26+
"opentelemetry",
27+
"tracing"
2828
],
2929
"author": "OpenTelemetry Authors",
3030
"license": "Apache-2.0",
@@ -68,4 +68,4 @@
6868
"@opentelemetry/semantic-conventions": "^1.0.0",
6969
"@types/generic-pool": "^3.1.9"
7070
}
71-
}
71+
}

0 commit comments

Comments
 (0)