Skip to content

updating to core v.0.13.0 #277

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

Merged
merged 14 commits into from
Dec 17, 2020
Merged

updating to core v.0.13.0 #277

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bec8741
chore: updating to core version 0.13.0
obecny Dec 11, 2020
aca3c54
Merge branch 'master' into v012
obecny Dec 11, 2020
37548b2
chore: merge with master
obecny Dec 14, 2020
eeb3446
chore: updating main packages to v013
obecny Dec 14, 2020
eabb071
chore: adding link for todo
obecny Dec 14, 2020
15e2e48
Merge branch 'master' into v012
obecny Dec 14, 2020
80be06e
chore: updating cases for status code
obecny Dec 15, 2020
43d6edb
Merge branch 'v012' of github.com:obecny/opentelemetry-js-contrib int…
obecny Dec 15, 2020
a169ab6
chore: removing not needed function
obecny Dec 15, 2020
79f4f73
chore: fixing status for span
obecny Dec 15, 2020
cee9f1c
chore: fixing status for span
obecny Dec 15, 2020
fc82e25
Merge branch 'v012' of github.com:obecny/opentelemetry-js-contrib int…
obecny Dec 15, 2020
5b2015f
chore: cleanup
obecny Dec 15, 2020
c41416e
chore: fixing tests
obecny Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions detectors/node/opentelemetry-resource-detector-github/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/core": "^0.12.0",
"@opentelemetry/tracing": "^0.12.0",
"@opentelemetry/core": "^0.13.0",
"@opentelemetry/tracing": "^0.13.0",
"@types/mocha": "8.0.1",
"@types/node": "14.0.27",
"@types/sinon": "9.0.4",
Expand All @@ -60,8 +60,8 @@
"typescript": "3.9.7"
},
"dependencies": {
"@opentelemetry/api": "^0.12.0",
"@opentelemetry/core": "^0.12.0",
"@opentelemetry/resources": "^0.12.0"
"@opentelemetry/api": "^0.13.0",
"@opentelemetry/core": "^0.13.0",
"@opentelemetry/resources": "^0.13.0"
}
}
10 changes: 5 additions & 5 deletions examples/dns/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.12.0",
"@opentelemetry/exporter-jaeger": "^0.12.0",
"@opentelemetry/exporter-zipkin": "^0.12.0",
"@opentelemetry/node": "^0.12.0",
"@opentelemetry/api": "^0.13.0",
"@opentelemetry/exporter-jaeger": "^0.13.0",
"@opentelemetry/exporter-zipkin": "^0.13.0",
"@opentelemetry/node": "^0.13.0",
"@opentelemetry/plugin-dns": "^0.11.0",
"@opentelemetry/tracing": "^0.12.0"
"@opentelemetry/tracing": "^0.13.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/express/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ function makeRequest() {
tracer.withSpan(span, async () => {
try {
const res = await axios.get('http://localhost:8080/run_test');
span.setStatus({ code: api.CanonicalCode.OK });
span.setStatus({ code: api.StatusCode.OK });
console.log(res.statusText);
} catch (e) {
span.setStatus({ code: api.CanonicalCode.UNKNOWN, message: e.message });
span.setStatus({ code: api.StatusCode.ERROR, message: e.message });
}
span.end();
console.log('Sleeping 5 seconds before shutdown to ensure all records are flushed.');
Expand Down
12 changes: 6 additions & 6 deletions examples/express/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.12.0",
"@opentelemetry/exporter-jaeger": "^0.12.0",
"@opentelemetry/exporter-zipkin": "^0.12.0",
"@opentelemetry/node": "^0.12.0",
"@opentelemetry/api": "^0.13.0",
"@opentelemetry/exporter-jaeger": "^0.13.0",
"@opentelemetry/exporter-zipkin": "^0.13.0",
"@opentelemetry/node": "^0.13.0",
"@opentelemetry/plugin-express": "^0.11.0",
"@opentelemetry/plugin-http": "^0.12.0",
"@opentelemetry/tracing": "^0.12.0",
"@opentelemetry/plugin-http": "^0.13.0",
"@opentelemetry/tracing": "^0.13.0",
"axios": "^0.19.0",
"express": "^4.17.1"
},
Expand Down
12 changes: 6 additions & 6 deletions examples/graphql/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.12.0",
"@opentelemetry/exporter-collector": "^0.12.0",
"@opentelemetry/node": "^0.12.0",
"@opentelemetry/api": "^0.13.0",
"@opentelemetry/exporter-collector": "^0.13.0",
"@opentelemetry/node": "^0.13.0",
"@opentelemetry/plugin-express": "^0.11.0",
"@opentelemetry/instrumentation-graphql": "^0.11.0",
"@opentelemetry/plugin-http": "^0.12.0",
"@opentelemetry/plugin-https": "^0.12.0",
"@opentelemetry/tracing": "^0.12.0",
"@opentelemetry/plugin-http": "^0.13.0",
"@opentelemetry/plugin-https": "^0.13.0",
"@opentelemetry/tracing": "^0.13.0",
"apollo-server": "^2.18.1",
"express": "^4.17.1",
"express-graphql": "^0.11.0",
Expand Down
10 changes: 5 additions & 5 deletions examples/grpc-census-prop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
"@opencensus/instrumentation-grpc": "0.0.21",
"@opencensus/nodejs": "0.0.21",
"@opencensus/propagation-binaryformat": "0.0.21",
"@opentelemetry/api": "^0.12.0",
"@opentelemetry/core": "^0.12.0",
"@opentelemetry/node": "^0.12.0",
"@opentelemetry/plugin-grpc": "^0.12.0",
"@opentelemetry/api": "^0.13.0",
"@opentelemetry/core": "^0.13.0",
"@opentelemetry/node": "^0.13.0",
"@opentelemetry/plugin-grpc": "^0.13.0",
"@opentelemetry/propagator-grpc-census-binary": "^0.11.0",
"@opentelemetry/tracing": "^0.12.0",
"@opentelemetry/tracing": "^0.13.0",
"grpc": "^1.24.2",
"node-pre-gyp": "0.12.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/hapi/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ function makeRequest() {
tracer.withSpan(span, async () => {
try {
const res = await axios.get('http://localhost:8081/run_test');
span.setStatus({ code: api.CanonicalCode.OK });
span.setStatus({ code: api.StatusCode.OK });
console.log(res.statusText);
} catch (e) {
span.setStatus({ code: api.CanonicalCode.UNKNOWN, message: e.message });
span.setStatus({ code: api.StatusCode.ERROR, message: e.message });
}
span.end();
console.log('Sleeping 5 seconds before shutdown to ensure all records are flushed.');
Expand Down
12 changes: 6 additions & 6 deletions examples/hapi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
},
"dependencies": {
"@hapi/hapi": "^19.2.0",
"@opentelemetry/api": "^0.12.0",
"@opentelemetry/exporter-jaeger": "^0.12.0",
"@opentelemetry/exporter-zipkin": "^0.12.0",
"@opentelemetry/api": "^0.13.0",
"@opentelemetry/exporter-jaeger": "^0.13.0",
"@opentelemetry/exporter-zipkin": "^0.13.0",
"@opentelemetry/hapi-instrumentation": "^0.11.0",
"@opentelemetry/node": "^0.12.0",
"@opentelemetry/plugin-http": "^0.12.0",
"@opentelemetry/tracing": "^0.12.0",
"@opentelemetry/node": "^0.13.0",
"@opentelemetry/plugin-http": "^0.13.0",
"@opentelemetry/tracing": "^0.13.0",
"axios": "^0.19.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
Expand Down
6 changes: 3 additions & 3 deletions examples/host-metrics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
"dependencies": {
"@opentelemetry/api": "^0.13.0",
"@opentelemetry/core": "^0.13.0",
"@opentelemetry/exporter-prometheus": "^0.13.0",
"@opentelemetry/exporter-collector": "^0.13.0",
"@opentelemetry/metrics": "^0.13.0",
"@opentelemetry/host-metrics": "^0.11.0"
"@opentelemetry/exporter-prometheus": "^0.13.0",
"@opentelemetry/host-metrics": "^0.11.0",
"@opentelemetry/metrics": "^0.13.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
8 changes: 4 additions & 4 deletions examples/ioredis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.12.0",
"@opentelemetry/exporter-jaeger": "^0.12.0",
"@opentelemetry/node": "^0.12.0",
"@opentelemetry/api": "^0.13.0",
"@opentelemetry/exporter-jaeger": "^0.13.0",
"@opentelemetry/node": "^0.13.0",
"@opentelemetry/plugin-ioredis": "^0.11.0",
"@opentelemetry/tracing": "^0.12.0",
"@opentelemetry/tracing": "^0.13.0",
"ioredis": "^4.14.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
Expand Down
4 changes: 2 additions & 2 deletions examples/koa/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ function makeRequest() {
tracer.withSpan(span, async () => {
try {
const res = await axios.get('http://localhost:8081/run_test');
span.setStatus({ code: api.CanonicalCode.OK });
span.setStatus({ code: api.StatusCode.OK });
console.log(res.statusText);
} catch (e) {
span.setStatus({ code: api.CanonicalCode.UNKNOWN, message: e.message });
span.setStatus({ code: api.StatusCode.ERROR, message: e.message });
}
span.end();
console.log('Sleeping 5 seconds before shutdown to ensure all records are flushed.');
Expand Down
12 changes: 6 additions & 6 deletions examples/koa/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
},
"dependencies": {
"@koa/router": "^9.3.1",
"@opentelemetry/api": "^0.12.0",
"@opentelemetry/exporter-jaeger": "^0.12.0",
"@opentelemetry/exporter-zipkin": "^0.12.0",
"@opentelemetry/api": "^0.13.0",
"@opentelemetry/exporter-jaeger": "^0.13.0",
"@opentelemetry/exporter-zipkin": "^0.13.0",
"@opentelemetry/koa-instrumentation": "^0.11.0",
"@opentelemetry/node": "^0.12.0",
"@opentelemetry/plugin-http": "^0.12.0",
"@opentelemetry/tracing": "^0.12.0",
"@opentelemetry/node": "^0.13.0",
"@opentelemetry/plugin-http": "^0.13.0",
"@opentelemetry/tracing": "^0.13.0",
"axios": "^0.19.0",
"koa": "^2.13.0"
},
Expand Down
12 changes: 6 additions & 6 deletions examples/mysql/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.12.0",
"@opentelemetry/exporter-jaeger": "^0.12.0",
"@opentelemetry/exporter-zipkin": "^0.12.0",
"@opentelemetry/node": "^0.12.0",
"@opentelemetry/plugin-http": "^0.12.0",
"@opentelemetry/api": "^0.13.0",
"@opentelemetry/exporter-jaeger": "^0.13.0",
"@opentelemetry/exporter-zipkin": "^0.13.0",
"@opentelemetry/node": "^0.13.0",
"@opentelemetry/plugin-http": "^0.13.0",
"@opentelemetry/plugin-mysql": "^0.11.0",
"@opentelemetry/tracing": "^0.12.0",
"@opentelemetry/tracing": "^0.13.0",
"mysql": "*"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
12 changes: 6 additions & 6 deletions examples/postgres/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.12.0",
"@opentelemetry/exporter-jaeger": "^0.12.0",
"@opentelemetry/exporter-zipkin": "^0.12.0",
"@opentelemetry/node": "^0.12.0",
"@opentelemetry/plugin-http": "^0.12.0",
"@opentelemetry/api": "^0.13.0",
"@opentelemetry/exporter-jaeger": "^0.13.0",
"@opentelemetry/exporter-zipkin": "^0.13.0",
"@opentelemetry/node": "^0.13.0",
"@opentelemetry/plugin-http": "^0.13.0",
"@opentelemetry/plugin-pg": "^0.11.0",
"@opentelemetry/plugin-pg-pool": "^0.11.0",
"@opentelemetry/tracing": "^0.12.0",
"@opentelemetry/tracing": "^0.13.0",
"express": "^4.17.1",
"pg": "^7.12.1"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/postgres/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// eslint-disable-next-line import/order
const tracer = require('./tracer')('postgres-server-service');
const { SpanKind, CanonicalCode } = require('@opentelemetry/api');
const { SpanKind, StatusCode } = require('@opentelemetry/api');
const express = require('express');
const setupPg = require('./setupPsql');

Expand Down Expand Up @@ -41,7 +41,7 @@ app.get('/:cmd', (req, res) => {
});
} catch (e) {
res.status(400).send({ message: e.message });
span.setStatus(CanonicalCode.UNKNOWN);
span.setStatus(StatusCode.ERROR);
}
span.end();
});
Expand Down
10 changes: 5 additions & 5 deletions examples/react-load/preact/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
"sirv-cli": "1.0.3"
},
"dependencies": {
"@opentelemetry/context-zone": "^0.10.1",
"@opentelemetry/exporter-collector": "^0.10.1",
"@opentelemetry/plugin-react-load": "^0.8.0",
"@opentelemetry/tracing": "^0.10.1",
"@opentelemetry/web": "^0.10.1",
"@opentelemetry/context-zone": "^0.13.0",
"@opentelemetry/exporter-collector": "^0.13.0",
"@opentelemetry/plugin-react-load": "^0.11.0",
"@opentelemetry/tracing": "^0.13.0",
"@opentelemetry/web": "^0.13.0",
"preact": "^10.3.2",
"preact-render-to-string": "^5.1.4",
"preact-router": "^3.2.1"
Expand Down
12 changes: 6 additions & 6 deletions examples/react-load/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
"ts-loader": "^6.0.4"
},
"dependencies": {
"@opentelemetry/context-zone": "^0.9.0",
"@opentelemetry/core": "^0.9.0",
"@opentelemetry/exporter-collector": "^0.10.1",
"@opentelemetry/plugin-react-load": "^0.8.0",
"@opentelemetry/tracing": "^0.9.0",
"@opentelemetry/web": "^0.9.0",
"@opentelemetry/context-zone": "^0.13.0",
"@opentelemetry/core": "^0.13.0",
"@opentelemetry/exporter-collector": "^0.13.0",
"@opentelemetry/plugin-react-load": "^0.11.0",
"@opentelemetry/tracing": "^0.13.0",
"@opentelemetry/web": "^0.13.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-router-dom": "^5.2.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/redis/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ function makeRequest() {
tracer.withSpan(span, async () => {
try {
const res = await axios.get('http://localhost:8080/run_test');
span.setStatus({ code: api.CanonicalCode.OK });
span.setStatus({ code: api.StatusCode.OK });
console.log(res.statusText);
} catch (e) {
span.setStatus({ code: api.CanonicalCode.UNKNOWN, message: e.message });
span.setStatus({ code: api.StatusCode.ERROR, message: e.message });
}
span.end();
console.log('Sleeping 5 seconds before shutdown to ensure all records are flushed.');
Expand Down
2 changes: 1 addition & 1 deletion examples/redis/express-tracer-handlers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function getErrorTracer(tracer) {
console.error('Caught error', err.message);
const span = tracer.getCurrentSpan();
if (span) {
span.setStatus({ code: api.CanonicalCode.INTERNAL, message: err.message });
span.setStatus({ code: api.StatusCode.ERROR, message: err.message });
}
res.status(500).send(err.message);
};
Expand Down
12 changes: 6 additions & 6 deletions examples/redis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.12.0",
"@opentelemetry/exporter-jaeger": "^0.12.0",
"@opentelemetry/exporter-zipkin": "^0.12.0",
"@opentelemetry/node": "^0.12.0",
"@opentelemetry/plugin-http": "^0.12.0",
"@opentelemetry/api": "^0.13.0",
"@opentelemetry/exporter-jaeger": "^0.13.0",
"@opentelemetry/exporter-zipkin": "^0.13.0",
"@opentelemetry/node": "^0.13.0",
"@opentelemetry/plugin-http": "^0.13.0",
"@opentelemetry/plugin-redis": "^0.11.0",
"@opentelemetry/tracing": "^0.12.0",
"@opentelemetry/tracing": "^0.13.0",
"axios": "^0.19.0",
"express": "^4.17.1",
"redis": "^2.8.0"
Expand Down
2 changes: 1 addition & 1 deletion metapackages/plugins-node-core-and-contrib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"@opentelemetry/plugin-pg": "^0.11.0",
"@opentelemetry/plugin-pg-pool": "^0.11.0",
"@opentelemetry/plugin-redis": "^0.11.0",
"@opentelemetry/plugins-node-core": "0.12.0"
"@opentelemetry/plugins-node-core": "^0.13.0"
}
}
2 changes: 1 addition & 1 deletion packages/opentelemetry-host-metrics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/exporter-prometheus": "0.12.0",
"@opentelemetry/exporter-prometheus": "^0.13.0",
"@types/mocha": "8.0.2",
"@types/node": "14.0.27",
"@types/sinon": "9.0.4",
Expand Down
9 changes: 5 additions & 4 deletions packages/opentelemetry-test-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"lint:fix": "eslint . --ext .ts --fix",
"compile": "tsc -p .",
"precompile": "tsc --version",
"prepare": "npm run compile"
"prepare": "npm run compile",
"watch": "tsc -w"
},
"repository": "open-telemetry/opentelemetry-js",
"keywords": [
Expand All @@ -31,8 +32,8 @@
"typescript": "3.9.6"
},
"dependencies": {
"@opentelemetry/api": "0.12.0",
"@opentelemetry/core": "0.12.0",
"@opentelemetry/tracing": "0.12.0"
"@opentelemetry/api": "^0.13.0",
"@opentelemetry/core": "^0.13.0",
"@opentelemetry/tracing": "^0.13.0"
}
}
Loading