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

Support OpenTelemetry SDK 0.8.x #30

Merged
merged 10 commits into from
May 29, 2020
Merged

Support OpenTelemetry SDK 0.8.x #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2875e42
chore: bump otel dependencies to 0.8.0
dyladan May 13, 2020
bd9bda9
chore: bump otel in examples
dyladan May 13, 2020
cb05312
Merge remote-tracking branch 'origin/master' into bump-8
dyladan May 13, 2020
ad389bf
Merge remote-tracking branch 'origin/master' into bump-8
dyladan May 28, 2020
b1e67bc
chore: bump webpack env
dyladan May 28, 2020
54ba08b
chore: skip lib check for incompatible types
dyladan May 28, 2020
1c19276
chore: use basic tracer provider in pg tests
dyladan May 29, 2020
6d0c454
chore: bump dependency to be explicitly 8.3
dyladan May 29, 2020
c04ed24
chore: ensure context is disabled after each pg test
dyladan May 29, 2020
48327d7
chore: disable context after all tests
dyladan May 29, 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
6 changes: 3 additions & 3 deletions examples/basic-tracer-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^0.6.1",
"@opentelemetry/exporter-jaeger": "^0.6.1",
"@opentelemetry/tracing": "^0.6.1"
"@opentelemetry/api": "^0.8.3",
"@opentelemetry/exporter-jaeger": "^0.8.3",
"@opentelemetry/tracing": "^0.8.3"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
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.6.1",
"@opentelemetry/exporter-jaeger": "^0.6.1",
"@opentelemetry/exporter-zipkin": "^0.6.1",
"@opentelemetry/node": "^0.6.1",
"@opentelemetry/api": "^0.8.3",
"@opentelemetry/exporter-jaeger": "^0.8.3",
"@opentelemetry/exporter-zipkin": "^0.8.3",
"@opentelemetry/node": "^0.8.3",
"@opentelemetry/plugin-dns": "^0.7.0",
"@opentelemetry/tracing": "^0.6.1"
"@opentelemetry/tracing": "^0.8.3"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
"devDependencies": {
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.6.1",
"@opentelemetry/exporter-jaeger": "^0.6.1",
"@opentelemetry/exporter-zipkin": "^0.6.1",
"@opentelemetry/node": "^0.6.1",
"@opentelemetry/api": "^0.8.3",
"@opentelemetry/exporter-jaeger": "^0.8.3",
"@opentelemetry/exporter-zipkin": "^0.8.3",
"@opentelemetry/node": "^0.8.3",
"@opentelemetry/plugin-express": "^0.7.0",
"@opentelemetry/plugin-http": "^0.6.1",
"@opentelemetry/tracing": "^0.6.1",
"@opentelemetry/plugin-http": "^0.8.3",
"@opentelemetry/tracing": "^0.8.3",
"axios": "^0.19.0",
"express": "^4.17.1"
},
Expand Down
12 changes: 6 additions & 6 deletions examples/grpc_dynamic_codegen/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
},
"dependencies": {
"@grpc/proto-loader": "^0.4.0",
"@opentelemetry/api": "^0.6.1",
"@opentelemetry/exporter-jaeger": "^0.6.1",
"@opentelemetry/exporter-zipkin": "^0.6.1",
"@opentelemetry/node": "^0.6.1",
"@opentelemetry/plugin-grpc": "^0.6.1",
"@opentelemetry/tracing": "^0.6.1",
"@opentelemetry/api": "^0.8.3",
"@opentelemetry/exporter-jaeger": "^0.8.3",
"@opentelemetry/exporter-zipkin": "^0.8.3",
"@opentelemetry/node": "^0.8.3",
"@opentelemetry/plugin-grpc": "^0.8.3",
"@opentelemetry/tracing": "^0.8.3",
"grpc": "^1.23.3",
"node-pre-gyp": "0.12.0"
},
Expand Down
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.6.1",
"@opentelemetry/exporter-jaeger": "^0.6.1",
"@opentelemetry/node": "^0.6.1",
"@opentelemetry/api": "^0.8.3",
"@opentelemetry/exporter-jaeger": "^0.8.3",
"@opentelemetry/node": "^0.8.3",
"@opentelemetry/plugin-ioredis": "^0.7.0",
"@opentelemetry/tracing": "^0.6.1",
"@opentelemetry/tracing": "^0.8.3",
"ioredis": "^4.14.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
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.6.1",
"@opentelemetry/exporter-jaeger": "^0.6.1",
"@opentelemetry/exporter-zipkin": "^0.6.1",
"@opentelemetry/node": "^0.6.1",
"@opentelemetry/plugin-http": "^0.6.1",
"@opentelemetry/api": "^0.8.3",
"@opentelemetry/exporter-jaeger": "^0.8.3",
"@opentelemetry/exporter-zipkin": "^0.8.3",
"@opentelemetry/node": "^0.8.3",
"@opentelemetry/plugin-http": "^0.8.3",
"@opentelemetry/plugin-mysql": "^0.7.0",
"@opentelemetry/tracing": "^0.6.1",
"@opentelemetry/tracing": "^0.8.3",
"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.6.1",
"@opentelemetry/exporter-jaeger": "^0.6.1",
"@opentelemetry/exporter-zipkin": "^0.6.1",
"@opentelemetry/node": "^0.6.1",
"@opentelemetry/plugin-http": "^0.6.1",
"@opentelemetry/api": "^0.8.3",
"@opentelemetry/exporter-jaeger": "^0.8.3",
"@opentelemetry/exporter-zipkin": "^0.8.3",
"@opentelemetry/node": "^0.8.3",
"@opentelemetry/plugin-http": "^0.8.3",
"@opentelemetry/plugin-pg": "^0.7.0",
"@opentelemetry/plugin-pg-pool": "^0.7.0",
"@opentelemetry/tracing": "^0.6.1",
"@opentelemetry/tracing": "^0.8.3",
"express": "^4.17.1",
"pg": "^7.12.1"
},
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.6.1",
"@opentelemetry/exporter-jaeger": "^0.6.1",
"@opentelemetry/exporter-zipkin": "^0.6.1",
"@opentelemetry/node": "^0.6.1",
"@opentelemetry/plugin-http": "^0.6.1",
"@opentelemetry/api": "^0.8.3",
"@opentelemetry/exporter-jaeger": "^0.8.3",
"@opentelemetry/exporter-zipkin": "^0.8.3",
"@opentelemetry/node": "^0.8.3",
"@opentelemetry/plugin-http": "^0.8.3",
"@opentelemetry/plugin-redis": "^0.7.0",
"@opentelemetry/tracing": "^0.6.1",
"@opentelemetry/tracing": "^0.8.3",
"axios": "^0.19.0",
"express": "^4.17.1",
"redis": "^2.8.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/opentelemetry-test-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
"devDependencies": {
"@opentelemetry/api": "^0.6.1",
"@opentelemetry/core": "^0.6.1",
"@opentelemetry/tracing": "^0.6.1",
"@opentelemetry/api": "^0.8.3",
"@opentelemetry/core": "^0.8.3",
"@opentelemetry/tracing": "^0.8.3",
"gts": "^1.1.2",
"ts-node": "^8.6.2",
"tslint-consistent-codestyle": "^1.16.0",
Expand Down
8 changes: 4 additions & 4 deletions plugins/node/opentelemetry-plugin-dns/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/node": "^0.6.1",
"@opentelemetry/tracing": "^0.6.1",
"@opentelemetry/node": "^0.8.3",
"@opentelemetry/tracing": "^0.8.3",
"@types/mocha": "^7.0.0",
"@types/node": "^12.7.12",
"@types/semver": "^6.2.0",
Expand All @@ -61,8 +61,8 @@
"typescript": "3.7.2"
},
"dependencies": {
"@opentelemetry/api": "^0.6.1",
"@opentelemetry/core": "^0.6.1",
"@opentelemetry/api": "^0.8.3",
"@opentelemetry/core": "^0.8.3",
"semver": "^7.1.3",
"shimmer": "^1.2.1"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-plugin-dns/test/functionals/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ describe('Utility', () => {
SpanKind.INTERNAL
);
utils.setError(new Error(errorMessage), span, process.versions.node);
const attributes = span.toReadableSpan().attributes;
const attributes = span.attributes;
assert.strictEqual(
attributes[AttributeNames.DNS_ERROR_MESSAGE],
errorMessage
Expand Down
10 changes: 5 additions & 5 deletions plugins/node/opentelemetry-plugin-express/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/context-async-hooks": "^0.6.1",
"@opentelemetry/node": "^0.6.1",
"@opentelemetry/tracing": "^0.6.1",
"@opentelemetry/context-async-hooks": "^0.8.3",
"@opentelemetry/node": "^0.8.3",
"@opentelemetry/tracing": "^0.8.3",
"@types/express": "^4.17.2",
"@types/mocha": "^7.0.0",
"@types/node": "^12.12.38",
Expand All @@ -61,8 +61,8 @@
"typescript": "3.7.2"
},
"dependencies": {
"@opentelemetry/api": "^0.6.1",
"@opentelemetry/core": "^0.6.1",
"@opentelemetry/api": "^0.8.3",
"@opentelemetry/core": "^0.8.3",
"shimmer": "^1.2.1"
}
}
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-plugin-express/test/express.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ describe('Express Plugin', () => {

afterEach(() => {
memoryExporter.reset();
contextManager.disable();
context.disable();
});

describe('Instrumenting normal get operations', () => {
Expand Down
10 changes: 5 additions & 5 deletions plugins/node/opentelemetry-plugin-ioredis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/context-async-hooks": "^0.6.1",
"@opentelemetry/node": "^0.6.1",
"@opentelemetry/context-async-hooks": "^0.8.3",
"@opentelemetry/node": "^0.8.3",
"@opentelemetry/test-utils": "^0.7.0",
"@opentelemetry/tracing": "^0.6.1",
"@opentelemetry/tracing": "^0.8.3",
"@types/ioredis": "^4.14.3",
"@types/mocha": "^7.0.0",
"@types/node": "^13.1.0",
Expand All @@ -66,8 +66,8 @@
"typescript": "3.7.4"
},
"dependencies": {
"@opentelemetry/api": "^0.6.1",
"@opentelemetry/core": "^0.6.1",
"@opentelemetry/api": "^0.8.3",
"@opentelemetry/core": "^0.8.3",
"shimmer": "^1.2.1"
}
}
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-plugin-ioredis/test/ioredis.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ describe('ioredis', () => {
});

afterEach(() => {
contextManager.disable();
context.disable();
});

before(function() {
Expand Down
10 changes: 5 additions & 5 deletions plugins/node/opentelemetry-plugin-mongodb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/context-async-hooks": "^0.6.1",
"@opentelemetry/node": "^0.6.1",
"@opentelemetry/tracing": "^0.6.1",
"@opentelemetry/context-async-hooks": "^0.8.3",
"@opentelemetry/node": "^0.8.3",
"@opentelemetry/tracing": "^0.8.3",
"@types/mocha": "^7.0.0",
"@types/mongodb": "^3.2.3",
"@types/node": "^12.7.2",
Expand All @@ -61,8 +61,8 @@
"typescript": "3.7.2"
},
"dependencies": {
"@opentelemetry/api": "^0.6.1",
"@opentelemetry/core": "^0.6.1",
"@opentelemetry/api": "^0.8.3",
"@opentelemetry/core": "^0.8.3",
"shimmer": "^1.2.1"
}
}
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-plugin-mongodb/test/mongodb.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ describe('MongoDBPlugin', () => {

afterEach(done => {
collection.deleteOne({}, done);
contextManager.disable();
context.disable();
});

after(() => {
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-plugin-mongodb/test/multiple_versions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ describe('Multiple enable on the plugin', () => {

afterEach(done => {
collection.deleteOne({}, done);
contextManager.disable();
context.disable();
});

after(() => {
Expand Down
10 changes: 5 additions & 5 deletions plugins/node/opentelemetry-plugin-mysql/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/context-async-hooks": "^0.6.1",
"@opentelemetry/node": "^0.6.1",
"@opentelemetry/context-async-hooks": "^0.8.3",
"@opentelemetry/node": "^0.8.3",
"@opentelemetry/test-utils": "^0.7.0",
"@opentelemetry/tracing": "^0.6.1",
"@opentelemetry/tracing": "^0.8.3",
"@types/mocha": "^7.0.0",
"@types/mysql": "^2.15.4",
"@types/node": "^12.6.9",
Expand All @@ -62,8 +62,8 @@
"typescript": "3.7.2"
},
"dependencies": {
"@opentelemetry/api": "^0.6.1",
"@opentelemetry/core": "^0.6.1",
"@opentelemetry/api": "^0.8.3",
"@opentelemetry/core": "^0.8.3",
"shimmer": "^1.2.1"
}
}
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-plugin-mysql/test/mysql.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ describe('[email protected]', () => {
});

afterEach(done => {
contextManager.disable();
context.disable();
memoryExporter.reset();
plugin.disable();
connection.end(() => {
Expand Down
10 changes: 5 additions & 5 deletions plugins/node/opentelemetry-plugin-pg-pool/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/context-async-hooks": "^0.6.1",
"@opentelemetry/context-async-hooks": "^0.8.3",
"@opentelemetry/plugin-pg": "^0.7.0",
"@opentelemetry/test-utils": "^0.7.0",
"@types/mocha": "^7.0.0",
Expand All @@ -69,10 +69,10 @@
"typescript": "3.7.2"
},
"dependencies": {
"@opentelemetry/api": "^0.6.1",
"@opentelemetry/core": "^0.6.1",
"@opentelemetry/node": "^0.6.1",
"@opentelemetry/tracing": "^0.6.1",
"@opentelemetry/api": "^0.8.3",
"@opentelemetry/core": "^0.8.3",
"@opentelemetry/node": "^0.8.3",
"@opentelemetry/tracing": "^0.8.3",
"shimmer": "^1.2.1"
}
}
6 changes: 3 additions & 3 deletions plugins/node/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
TimedEvent,
} from '@opentelemetry/api';
import { NoopLogger } from '@opentelemetry/core';
import { NodeTracerProvider } from '@opentelemetry/node';
import { BasicTracerProvider } from '@opentelemetry/tracing';
import { plugin as pgPlugin, PostgresPlugin } from '@opentelemetry/plugin-pg';
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
import * as testUtils from '@opentelemetry/test-utils';
Expand Down Expand Up @@ -95,7 +95,7 @@ const runCallbackTest = (
describe('[email protected]', () => {
let pool: pgPool<pg.Client>;
let contextManager: AsyncHooksContextManager;
const provider = new NodeTracerProvider();
const provider = new BasicTracerProvider();
const logger = new NoopLogger();
const testPostgres = process.env.RUN_POSTGRES_TESTS; // For CI: assumes local postgres db is already available
const testPostgresLocally = process.env.RUN_POSTGRES_TESTS_LOCAL; // For local: spins up local postgres db via docker
Expand Down Expand Up @@ -136,7 +136,7 @@ describe('[email protected]', () => {
memoryExporter.reset();
plugin.disable();
pgPlugin.disable();
contextManager.disable();
context.disable();
});

it('should return a plugin', () => {
Expand Down
Loading