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

chore: update core dependencies to 0.25 #635

Merged
merged 7 commits into from Aug 27, 2021
Merged

chore: update core dependencies to 0.25 #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0fb906b
chore: update core dependencies to 0.25
dyladan Aug 23, 2021
7263855
Merge branch 'main' into core-25
dyladan Aug 23, 2021
b9b835c
chore: limit concurrency to prevent build failures
dyladan Aug 24, 2021
a31a49d
Merge branch 'core-25' of github.com:dynatrace-oss-contrib/openteleme…
dyladan Aug 24, 2021
32b5f4e
chore: revert to default concurrency
dyladan Aug 24, 2021
84eb615
chore: exclude aws lambda from update
dyladan Aug 25, 2021
a7ba541
Merge branch 'main' into core-25
dyladan Aug 25, 2021
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
4 changes: 2 additions & 2 deletions detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
View file
Open in desktop
Expand Up @@ -62,7 +62,7 @@
"@opentelemetry/api": "^1.0.2"
},
"dependencies": {
"@opentelemetry/resources": "^0.24.0",
"@opentelemetry/semantic-conventions": "^0.24.0"
"@opentelemetry/resources": "^0.25.0",
"@opentelemetry/semantic-conventions": "^0.25.0"
}
}
6 changes: 3 additions & 3 deletions detectors/node/opentelemetry-resource-detector-aws/package.json
View file
Open in desktop
Expand Up @@ -61,8 +61,8 @@
"@opentelemetry/api": "^1.0.2"
},
"dependencies": {
"@opentelemetry/core": "^0.24.0",
"@opentelemetry/resources": "^0.24.0",
"@opentelemetry/semantic-conventions": "^0.24.0"
"@opentelemetry/core": "^0.25.0",
"@opentelemetry/resources": "^0.25.0",
"@opentelemetry/semantic-conventions": "^0.25.0"
}
}
6 changes: 3 additions & 3 deletions detectors/node/opentelemetry-resource-detector-gcp/package.json
View file
Open in desktop
Expand Up @@ -43,7 +43,7 @@
},
"devDependencies": {
"@opentelemetry/api": "1.0.2",
"@opentelemetry/core": "0.24.0",
"@opentelemetry/core": "0.25.0",
"@opentelemetry/test-utils": "0.24.0",
"@types/mocha": "8.2.3",
"@types/node": "14.17.9",
Expand All @@ -61,8 +61,8 @@
"@opentelemetry/api": "^1.0.2"
},
"dependencies": {
"@opentelemetry/resources": "^0.24.0",
"@opentelemetry/semantic-conventions": "^0.24.0",
"@opentelemetry/resources": "^0.25.0",
"@opentelemetry/semantic-conventions": "^0.25.0",
"gcp-metadata": "^4.1.4",
"semver": "7.3.5"
}
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-github/package.json
View file
Open in desktop
Expand Up @@ -60,6 +60,6 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/resources": "^0.24.0"
"@opentelemetry/resources": "^0.25.0"
}
}
20 changes: 10 additions & 10 deletions examples/connect/package.json
View file
Open in desktop
Expand Up @@ -36,17 +36,17 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.24.0",
"@opentelemetry/exporter-zipkin": "^0.24.0",
"@opentelemetry/exporter-collector": "^0.24.0",
"@opentelemetry/instrumentation": "^0.24.0",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/exporter-jaeger": "^0.25.0",
"@opentelemetry/exporter-zipkin": "^0.25.0",
"@opentelemetry/exporter-collector": "^0.25.0",
"@opentelemetry/instrumentation": "^0.25.0",
"@opentelemetry/instrumentation-connect": "^0.24.0",
"@opentelemetry/instrumentation-http": "^0.24.0",
"@opentelemetry/node": "^0.24.0",
"@opentelemetry/resources": "^0.24.0",
"@opentelemetry/semantic-conventions": "^0.24.0",
"@opentelemetry/tracing": "^0.24.0",
"@opentelemetry/instrumentation-http": "^0.25.0",
"@opentelemetry/sdk-trace-node": "^0.25.0",
"@opentelemetry/resources": "^0.25.0",
"@opentelemetry/semantic-conventions": "^0.25.0",
"@opentelemetry/sdk-trace-base": "^0.25.0",
"axios": "^0.21.1",
"cross-env": "^7.0.3",
"connect": "^3.7.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/connect/tracing.js
View file
Open in desktop
Expand Up @@ -8,8 +8,8 @@ diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
const { Resource } = require('@opentelemetry/resources');
const { ResourceAttributes: SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
const { registerInstrumentations } = require('@opentelemetry/instrumentation');
const { NodeTracerProvider } = require('@opentelemetry/node');
const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
const { SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector');

const { ConnectInstrumentation } = require('@opentelemetry/instrumentation-connect');
Expand Down
12 changes: 6 additions & 6 deletions examples/dns/package.json
View file
Open in desktop
Expand Up @@ -26,13 +26,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"dependencies": {
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.24.0",
"@opentelemetry/exporter-zipkin": "^0.24.0",
"@opentelemetry/instrumentation": "^0.24.0",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/exporter-jaeger": "^0.25.0",
"@opentelemetry/exporter-zipkin": "^0.25.0",
"@opentelemetry/instrumentation": "^0.25.0",
"@opentelemetry/instrumentation-dns": "^0.23.0",
"@opentelemetry/node": "^0.24.0",
"@opentelemetry/tracing": "^0.24.0"
"@opentelemetry/sdk-trace-node": "^0.25.0",
"@opentelemetry/sdk-trace-base": "^0.25.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/dns/tracer.js
View file
Open in desktop
@@ -1,8 +1,8 @@
'use strict';

const opentelemetry = require('@opentelemetry/api');
const { NodeTracerProvider } = require('@opentelemetry/node');
const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
const { SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
const { DnsInstrumentation } = require('@opentelemetry/instrumentation-dns');
const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
Expand Down
18 changes: 9 additions & 9 deletions examples/express/package.json
View file
Open in desktop
Expand Up @@ -28,16 +28,16 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.24.0",
"@opentelemetry/exporter-zipkin": "^0.24.0",
"@opentelemetry/instrumentation": "^0.24.0",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/exporter-jaeger": "^0.25.0",
"@opentelemetry/exporter-zipkin": "^0.25.0",
"@opentelemetry/instrumentation": "^0.25.0",
"@opentelemetry/instrumentation-express": "^0.23.0",
"@opentelemetry/instrumentation-http": "^0.24.0",
"@opentelemetry/resources": "^0.24.0",
"@opentelemetry/semantic-conventions": "^0.24.0",
"@opentelemetry/node": "^0.24.0",
"@opentelemetry/tracing": "^0.24.0",
"@opentelemetry/instrumentation-http": "^0.25.0",
"@opentelemetry/resources": "^0.25.0",
"@opentelemetry/semantic-conventions": "^0.25.0",
"@opentelemetry/sdk-trace-node": "^0.25.0",
"@opentelemetry/sdk-trace-base": "^0.25.0",
"axios": "^0.21.1",
"cross-env": "^7.0.3",
"express": "^4.17.1"
Expand Down
4 changes: 2 additions & 2 deletions examples/express/tracer.js
View file
Open in desktop
Expand Up @@ -7,8 +7,8 @@ const { diag, DiagConsoleLogger, DiagLogLevel } = opentelemetry;
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);

const { registerInstrumentations } = require('@opentelemetry/instrumentation');
const { NodeTracerProvider } = require('@opentelemetry/node');
const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
const { SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
const { Resource } = require('@opentelemetry/resources');
Expand Down
12 changes: 6 additions & 6 deletions examples/graphql/package.json
View file
Open in desktop
Expand Up @@ -31,14 +31,14 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-collector": "^0.24.0",
"@opentelemetry/instrumentation": "^0.24.0",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/exporter-collector": "^0.25.0",
"@opentelemetry/instrumentation": "^0.25.0",
"@opentelemetry/instrumentation-express": "^0.23.0",
"@opentelemetry/instrumentation-graphql": "^0.23.0",
"@opentelemetry/instrumentation-http": "^0.24.0",
"@opentelemetry/node": "^0.24.0",
"@opentelemetry/tracing": "^0.24.0",
"@opentelemetry/instrumentation-http": "^0.25.0",
"@opentelemetry/sdk-trace-node": "^0.25.0",
"@opentelemetry/sdk-trace-base": "^0.25.0",
"apollo-server": "^2.18.1",
"express": "^4.17.1",
"express-graphql": "^0.11.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/graphql/tracer.js
View file
Open in desktop
Expand Up @@ -2,8 +2,8 @@

const { registerInstrumentations } = require('@opentelemetry/instrumentation');
const { GraphQLInstrumentation } = require('@opentelemetry/instrumentation-graphql');
const { ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/tracing');
const { NodeTracerProvider } = require('@opentelemetry/node');
const { ConsoleSpanExporter, SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
const { CollectorTraceExporter } = require('@opentelemetry/exporter-collector');
const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express');
Expand Down
12 changes: 6 additions & 6 deletions examples/grpc-census-prop/package.json
View file
Open in desktop
Expand Up @@ -34,13 +34,13 @@
"@opencensus/instrumentation-grpc": "0.0.21",
"@opencensus/nodejs": "0.0.21",
"@opencensus/propagation-binaryformat": "0.0.21",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/core": "^0.24.0",
"@opentelemetry/instrumentation": "^0.24.0",
"@opentelemetry/instrumentation-grpc": "^0.24.0",
"@opentelemetry/node": "^0.24.0",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/core": "^0.25.0",
"@opentelemetry/instrumentation": "^0.25.0",
"@opentelemetry/instrumentation-grpc": "^0.25.0",
"@opentelemetry/sdk-trace-node": "^0.25.0",
"@opentelemetry/propagator-grpc-census-binary": "^0.23.0",
"@opentelemetry/tracing": "^0.24.0",
"@opentelemetry/sdk-trace-base": "^0.25.0",
"grpc": "^1.24.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
4 changes: 2 additions & 2 deletions examples/grpc-census-prop/tracer.js
View file
Open in desktop
@@ -1,8 +1,8 @@
'use strict';

const opentelemetry = require('@opentelemetry/api');
const { NodeTracerProvider } = require('@opentelemetry/node');
const { SimpleSpanProcessor, ConsoleSpanExporter } = require('@opentelemetry/tracing');
const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
const { SimpleSpanProcessor, ConsoleSpanExporter } = require('@opentelemetry/sdk-trace-base');
const { HttpTraceContextPropagator } = require('@opentelemetry/core');
const { GrpcCensusPropagator } = require('@opentelemetry/propagator-grpc-census-binary');
const { registerInstrumentations } = require('@opentelemetry/instrumentation');
Expand Down
12 changes: 6 additions & 6 deletions examples/grpc_dynamic_codegen/package.json
View file
Open in desktop
Expand Up @@ -28,12 +28,12 @@
},
"dependencies": {
"@grpc/proto-loader": "^0.4.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.24.0",
"@opentelemetry/exporter-zipkin": "^0.24.0",
"@opentelemetry/node": "^0.24.0",
"@opentelemetry/instrumentation-grpc": "^0.24.0",
"@opentelemetry/tracing": "^0.24.0",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/exporter-jaeger": "^0.25.0",
"@opentelemetry/exporter-zipkin": "^0.25.0",
"@opentelemetry/sdk-trace-node": "^0.25.0",
"@opentelemetry/instrumentation-grpc": "^0.25.0",
"@opentelemetry/sdk-trace-base": "^0.25.0",
"grpc": "^1.24.6"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
4 changes: 2 additions & 2 deletions examples/grpc_dynamic_codegen/tracer.js
View file
Open in desktop
@@ -1,8 +1,8 @@
'use strict';

const opentelemetry = require('@opentelemetry/api');
const { NodeTracerProvider } = require('@opentelemetry/node');
const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
const { SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
const { registerInstrumentations } = require('@opentelemetry/instrumentation');
Expand Down
14 changes: 7 additions & 7 deletions examples/hapi/package.json
View file
Open in desktop
Expand Up @@ -32,14 +32,14 @@
},
"dependencies": {
"@hapi/hapi": "^19.2.0",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.24.0",
"@opentelemetry/exporter-zipkin": "^0.24.0",
"@opentelemetry/instrumentation": "^0.24.0",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/exporter-jaeger": "^0.25.0",
"@opentelemetry/exporter-zipkin": "^0.25.0",
"@opentelemetry/instrumentation": "^0.25.0",
"@opentelemetry/instrumentation-hapi": "^0.23.0",
"@opentelemetry/instrumentation-http": "^0.24.0",
"@opentelemetry/node": "^0.24.0",
"@opentelemetry/tracing": "^0.24.0",
"@opentelemetry/instrumentation-http": "^0.25.0",
"@opentelemetry/sdk-trace-node": "^0.25.0",
"@opentelemetry/sdk-trace-base": "^0.25.0",
"axios": "^0.21.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
Expand Down
4 changes: 2 additions & 2 deletions examples/hapi/tracer.js
View file
Open in desktop
@@ -1,8 +1,8 @@
'use strict';

const api = require('@opentelemetry/api');
const { NodeTracerProvider } = require('@opentelemetry/node');
const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
const { SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
const { HapiInstrumentation } = require('@opentelemetry/instrumentation-hapi');
Expand Down
2 changes: 1 addition & 1 deletion examples/host-metrics/node.js
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

const { HostMetrics } = require('@opentelemetry/host-metrics');
// const { PrometheusExporter } = require('@opentelemetry/exporter-prometheus');
const { MeterProvider } = require('@opentelemetry/metrics');
const { MeterProvider } = require('@opentelemetry/sdk-metrics-base');
const { CollectorMetricExporter } = require('@opentelemetry/exporter-collector');

const exporter = new CollectorMetricExporter({
Expand Down
12 changes: 6 additions & 6 deletions examples/host-metrics/package.json
View file
Open in desktop
Expand Up @@ -26,13 +26,13 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"dependencies": {
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/core": "^0.24.0",
"@opentelemetry/exporter-collector": "^0.24.0",
"@opentelemetry/exporter-prometheus": "^0.24.0",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/core": "^0.25.0",
"@opentelemetry/exporter-collector": "^0.25.0",
"@opentelemetry/exporter-prometheus": "^0.25.0",
"@opentelemetry/host-metrics": "^0.24.0",
"@opentelemetry/instrumentation": "^0.24.0",
"@opentelemetry/metrics": "^0.24.0"
"@opentelemetry/instrumentation": "^0.25.0",
"@opentelemetry/sdk-metrics-base": "^0.25.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
}
10 changes: 5 additions & 5 deletions examples/ioredis/package.json
View file
Open in desktop
Expand Up @@ -28,12 +28,12 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"dependencies": {
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.24.0",
"@opentelemetry/instrumentation": "^0.24.0",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/exporter-jaeger": "^0.25.0",
"@opentelemetry/instrumentation": "^0.25.0",
"@opentelemetry/instrumentation-ioredis": "^0.23.0",
"@opentelemetry/node": "^0.24.0",
"@opentelemetry/tracing": "^0.24.0",
"@opentelemetry/sdk-trace-node": "^0.25.0",
"@opentelemetry/sdk-trace-base": "^0.25.0",
"ioredis": "^4.22.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme"
Expand Down
4 changes: 2 additions & 2 deletions examples/ioredis/tracer.js
View file
Open in desktop
@@ -1,8 +1,8 @@
'use strict';

const opentelemetry = require('@opentelemetry/api');
const { NodeTracerProvider } = require('@opentelemetry/node');
const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
const { SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
const { IORedisInstrumentation } = require('@opentelemetry/instrumentation-ioredis');
const { registerInstrumentations } = require('@opentelemetry/instrumentation');
Expand Down
14 changes: 7 additions & 7 deletions examples/koa/package.json
View file
Open in desktop
Expand Up @@ -32,14 +32,14 @@
},
"dependencies": {
"@koa/router": "^9.3.1",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/exporter-jaeger": "^0.24.0",
"@opentelemetry/exporter-zipkin": "^0.24.0",
"@opentelemetry/instrumentation": "^0.24.0",
"@opentelemetry/instrumentation-http": "^0.24.0",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/exporter-jaeger": "^0.25.0",
"@opentelemetry/exporter-zipkin": "^0.25.0",
"@opentelemetry/instrumentation": "^0.25.0",
"@opentelemetry/instrumentation-http": "^0.25.0",
"@opentelemetry/instrumentation-koa": "^0.23.0",
"@opentelemetry/node": "^0.24.0",
"@opentelemetry/tracing": "^0.24.0",
"@opentelemetry/sdk-trace-node": "^0.25.0",
"@opentelemetry/sdk-trace-base": "^0.25.0",
"axios": "^0.21.1",
"koa": "^2.13.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/koa/tracer.js
View file
Open in desktop
Expand Up @@ -5,8 +5,8 @@ const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');

const api = require('@opentelemetry/api');
const { registerInstrumentations } = require('@opentelemetry/instrumentation');
const { NodeTracerProvider } = require('@opentelemetry/node');
const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
const { SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');

Expand Down
8 changes: 4 additions & 4 deletions examples/memcached/package.json
View file
Open in desktop
Expand Up @@ -28,11 +28,11 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"dependencies": {
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/instrumentation": "^0.24.0",
"@opentelemetry/api": "^1.0.2",
"@opentelemetry/instrumentation": "^0.25.0",
"@opentelemetry/instrumentation-memcached": "^0.23.0",
"@opentelemetry/node": "^0.24.0",
"@opentelemetry/tracing": "^0.24.0",
"@opentelemetry/sdk-trace-node": "^0.25.0",
"@opentelemetry/sdk-trace-base": "^0.25.0",
"memcached": "^2.2.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme"
Expand Down