Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: use localhost for services in CI #816

Merged
merged 4 commits into from
Jan 4, 2022
Merged

fix: use localhost for services in CI #816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17d4a44
fix: use localhost for services in CI
rauno56 Jan 3, 2022
66a70c0
fix: disable TAV for now
rauno56 Jan 3, 2022
4b06650
ci: sort keywords for all package.json files
rauno56 Jan 3, 2022
081e069
fix: respect CASSANDRA_HOST in the tests of cassandra-driver
rauno56 Jan 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/test-all-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:

jobs:
tav:
# skip the workflow for now #816
if: false
name: run test-all-version (tav)
runs-on: ubuntu-latest
services:
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/unit-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,25 +74,24 @@ jobs:
RUN_MYSQL_TESTS: 1
RUN_POSTGRES_TESTS: 1
RUN_REDIS_TESTS: 1
OPENTELEMETRY_MEMCACHED_HOST: memcached
OPENTELEMETRY_MEMCACHED_HOST: localhost
OPENTELEMETRY_MEMCACHED_PORT: 11211
POSTGRES_USER: postgres
POSTGRES_DB: circle_database
POSTGRES_HOST: postgres
POSTGRES_HOST: localhost
POSTGRES_PORT: 5432
OPENTELEMETRY_REDIS_HOST: redis
OPENTELEMETRY_REDIS_HOST: localhost
OPENTELEMETRY_REDIS_PORT: 6379
MONGODB_DB: opentelemetry-tests
MONGODB_HOST: mongo
MONGODB_HOST: localhost
MONGODB_PORT: 27017
MYSQL_USER: otel
MYSQL_PASSWORD: secret
MYSQL_DATABASE: circle_database
MYSQL_HOST: mysql
MYSQL_HOST: localhost
MYSQL_PORT: 3306
NPM_CONFIG_UNSAFE_PERM: true
CASSANDRA_HOST: cassandra
CASSANDRA_PORT: 9042
CASSANDRA_HOST: localhost
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
8 changes: 4 additions & 4 deletions plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
"compile": "npm run version:update && tsc -p ."
},
"keywords": [
"opentelemetry",
"aws-lambda",
"instrumentation",
"nodejs",
"tracing",
"opentelemetry",
"profiling",
"instrumentation"
"tracing"
],
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down Expand Up @@ -67,4 +67,4 @@
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/aws-lambda": "8.10.81"
}
}
}
163 changes: 82 additions & 81 deletions plugins/node/opentelemetry-instrumentation-aws-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,82 +1,83 @@
{
"name": "@opentelemetry/instrumentation-aws-sdk",
"version": "0.4.0",
"description": "OpenTelemetry automatic instrumentation for the `aws-sdk` package",
"keywords": [
"aws",
"opentelemetry",
"aws-sdk"
],
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
"license": "Apache-2.0",
"author": "OpenTelemetry Authors",
"bugs": {
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
"files": [
"build/src/**/*.js",
"build/src/**/*.js.map",
"build/src/**/*.d.ts",
"doc",
"LICENSE",
"README.md"
],
"publishConfig": {
"access": "public"
},
"repository": "open-telemetry/opentelemetry-js-contrib",
"scripts": {
"clean": "rimraf build/*",
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
"compile": "npm run version:update && tsc -p .",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"precompile": "tsc --version && lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
"prewatch": "npm run precompile",
"prepare": "npm run compile",
"tdd": "npm run test -- --watch-extensions ts --watch",
"test": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'",
"test-all-versions": "tav",
"version:update": "node ../../../scripts/version-update.js",
"watch": "tsc -w"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.1"
},
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@opentelemetry/propagation-utils": "^0.26.0"
},
"devDependencies": {
"@aws-sdk/client-dynamodb": "3.37.0",
"@aws-sdk/client-s3": "3.37.0",
"@aws-sdk/client-sqs": "3.37.0",
"@aws-sdk/types": "3.37.0",
"@opentelemetry/api": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@types/mocha": "8.2.3",
"@types/node": "14.18.2",
"@types/sinon": "10.0.6",
"aws-sdk": "2.1008.0",
"eslint": "7.32.0",
"expect": "27.4.2",
"mocha": "7.2.0",
"nock": "13.2.1",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "12.0.1",
"gts": "3.1.0",
"@opentelemetry/contrib-test-utils": "^0.28.0",
"test-all-versions": "5.0.1",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "4.3.4"
},
"engines": {
"node": ">=8.5.0"
}
}
"name": "@opentelemetry/instrumentation-aws-sdk",
"version": "0.4.0",
"description": "OpenTelemetry automatic instrumentation for the `aws-sdk` package",
"keywords": [
"aws",
"aws-sdk",
"nodejs",
"opentelemetry"
],
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
"license": "Apache-2.0",
"author": "OpenTelemetry Authors",
"bugs": {
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
"files": [
"build/src/**/*.js",
"build/src/**/*.js.map",
"build/src/**/*.d.ts",
"doc",
"LICENSE",
"README.md"
],
"publishConfig": {
"access": "public"
},
"repository": "open-telemetry/opentelemetry-js-contrib",
"scripts": {
"clean": "rimraf build/*",
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
"compile": "npm run version:update && tsc -p .",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"precompile": "tsc --version && lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
"prewatch": "npm run precompile",
"prepare": "npm run compile",
"tdd": "npm run test -- --watch-extensions ts --watch",
"test": "nyc ts-mocha -p tsconfig.json --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'",
"test-all-versions": "tav",
"version:update": "node ../../../scripts/version-update.js",
"watch": "tsc -w"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.1"
},
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@opentelemetry/propagation-utils": "^0.26.0"
},
"devDependencies": {
"@aws-sdk/client-dynamodb": "3.37.0",
"@aws-sdk/client-s3": "3.37.0",
"@aws-sdk/client-sqs": "3.37.0",
"@aws-sdk/types": "3.37.0",
"@opentelemetry/api": "1.0.1",
"@opentelemetry/sdk-trace-base": "1.0.1",
"@types/mocha": "8.2.3",
"@types/node": "14.18.2",
"@types/sinon": "10.0.6",
"aws-sdk": "2.1008.0",
"eslint": "7.32.0",
"expect": "27.4.2",
"mocha": "7.2.0",
"nock": "13.2.1",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "12.0.1",
"gts": "3.1.0",
"@opentelemetry/contrib-test-utils": "^0.28.0",
"test-all-versions": "5.0.1",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "4.3.4"
},
"engines": {
"node": ">=8.5.0"
}
}
8 changes: 4 additions & 4 deletions plugins/node/opentelemetry-instrumentation-bunyan/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
"version:update": "node ../../../scripts/version-update.js"
},
"keywords": [
"opentelemetry",
"bunyan",
"instrumentation",
"logging",
"nodejs",
"tracing",
"opentelemetry",
"profiling",
"instrumentation",
"bunyan"
"tracing"
],
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down
10 changes: 5 additions & 5 deletions plugins/node/opentelemetry-instrumentation-cassandra/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
"compile": "npm run version:update && tsc -p ."
},
"keywords": [
"opentelemetry",
"cassandra-driver",
"instrumentation",
"logging",
"nodejs",
"tracing",
"opentelemetry",
"profiling",
"instrumentation",
"cassandra-driver"
"tracing"
],
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down Expand Up @@ -70,4 +70,4 @@
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
}
}
}
5 changes: 4 additions & 1 deletion plugins/node/opentelemetry-instrumentation-cassandra/test/cassandra-driver.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,10 @@ describe('CassandraDriverInstrumentation', () => {
instrumentation.setTracerProvider(provider);

const cassandra = require('cassandra-driver');
const endpoint = testCassandraLocally ? '127.0.0.1' : 'cassandra';
const endpoint =
process.env.CASSANDRA_HOST ?? testCassandraLocally
? '127.0.0.1'
: 'cassandra';
client = new cassandra.Client({
contactPoints: [endpoint],
localDataCenter: 'datacenter1',
Expand Down
8 changes: 4 additions & 4 deletions plugins/node/opentelemetry-instrumentation-connect/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
"watch": "tsc -w"
},
"keywords": [
"opentelemetry",
"connect",
"instrumentation",
"nodejs",
"tracing",
"opentelemetry",
"profiling",
"instrumentation"
"tracing"
],
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down Expand Up @@ -66,4 +66,4 @@
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/connect": "3.4.35"
}
}
}
8 changes: 4 additions & 4 deletions plugins/node/opentelemetry-instrumentation-dns/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
"compile": "npm run version:update && tsc -p ."
},
"keywords": [
"opentelemetry",
"dns",
"instrumentation",
"nodejs",
"tracing",
"opentelemetry",
"profiling",
"instrumentation"
"tracing"
],
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down Expand Up @@ -69,4 +69,4 @@
"@opentelemetry/semantic-conventions": "^1.0.0",
"semver": "^7.3.2"
}
}
}
8 changes: 4 additions & 4 deletions plugins/node/opentelemetry-instrumentation-express/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
"watch": "tsc -w"
},
"keywords": [
"opentelemetry",
"express",
"instrumentation",
"nodejs",
"tracing",
"opentelemetry",
"profiling",
"instrumentation"
"tracing"
],
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down Expand Up @@ -68,4 +68,4 @@
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/express": "4.17.13"
}
}
}
8 changes: 4 additions & 4 deletions plugins/node/opentelemetry-instrumentation-fastify/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
"watch": "tsc -w"
},
"keywords": [
"opentelemetry",
"fastify",
"instrumentation",
"nodejs",
"tracing",
"opentelemetry",
"profiling",
"instrumentation"
"tracing"
],
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down Expand Up @@ -68,4 +68,4 @@
"@opentelemetry/semantic-conventions": "^1.0.0",
"fastify": "^3.19.2"
}
}
}
8 changes: 4 additions & 4 deletions plugins/node/opentelemetry-instrumentation-generic-pool/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
"watch": "tsc -w"
},
"keywords": [
"opentelemetry",
"generic-pool",
"instrumentation",
"nodejs",
"tracing",
"instrumentation"
"opentelemetry",
"tracing"
],
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down Expand Up @@ -68,4 +68,4 @@
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/generic-pool": "^3.1.9"
}
}
}