chore: update core to 0.20.0 (open-telemetry#513)

* chore: update core to 0.20.0 * chore: fix test * chore: review comments and lint * chore: get example versions from previous update * chore: lint
dynatrace-oss-contrib · Jun 4, 2021 · 6c2378c · 6c2378c
1 parent 7ca20f8
commit 6c2378c
Show file tree

Hide file tree

Showing 128 changed files with 1,783 additions and 1,629 deletions.
diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json
@@ -56,7 +56,7 @@
  "typescript": "4.2.4"
  },
  "dependencies": {
- "@opentelemetry/api": "1.0.0-rc.3",
- "@opentelemetry/resources": "^0.19.0"
+ "@opentelemetry/api": "0.20.0",
+ "@opentelemetry/resources": "^0.20.0"
  }
 }
diff --git a/examples/dns/client.js b/examples/dns/client.js
@@ -11,7 +11,7 @@ function makeLookup() {
  // the span, which is created to track work that happens outside of the
  // dns lookup query.
  const span = tracer.startSpan('dnsLookup');
- api.context.with(api.setSpan(api.ROOT_CONTEXT, span), async () => {
+ api.context.with(api.trace.setSpan(api.ROOT_CONTEXT, span), async () => {
  try {
  await dns.lookup('montreal.ca');
  } catch (error) {
@@ -20,7 +20,7 @@ function makeLookup() {
  'error.message': error.message,
  });
  } finally {
- console.log(`traceid: ${span.context().traceId}`);
+ console.log(`traceid: ${span.spanContext().traceId}`);
  span.end();
  }
  });

diff --git a/examples/dns/package.json b/examples/dns/package.json
@@ -26,13 +26,13 @@
  "url": "https:/open-telemetry/opentelemetry-js-contrib/issues"
  },
  "dependencies": {
- "@opentelemetry/api": "^1.0.0-rc.0",
- "@opentelemetry/exporter-jaeger": "^0.19.0",
- "@opentelemetry/exporter-zipkin": "^0.19.0",
- "@opentelemetry/instrumentation": "^0.19.0",
+ "@opentelemetry/api": "^0.20.0",
+ "@opentelemetry/exporter-jaeger": "^0.20.0",
+ "@opentelemetry/exporter-zipkin": "^0.20.0",
+ "@opentelemetry/instrumentation": "^0.20.0",
  "@opentelemetry/instrumentation-dns": "^0.15.0",
- "@opentelemetry/node": "^0.19.0",
- "@opentelemetry/tracing": "^0.19.0"
+ "@opentelemetry/node": "^0.20.0",
+ "@opentelemetry/tracing": "^0.20.0"
  },
  "homepage": "https:/open-telemetry/opentelemetry-js-contrib#readme",
  "devDependencies": {

diff --git a/examples/express/client.js b/examples/express/client.js
@@ -10,7 +10,7 @@ function makeRequest() {
  kind: api.SpanKind.CLIENT,
  });
 
- api.context.with(api.setSpan(api.ROOT_CONTEXT, span), async () => {
+ api.context.with(api.trace.setSpan(api.ROOT_CONTEXT, span), async () => {
  try {
  const res = await axios.get('http://localhost:8080/run_test');
  console.log('status:', res.statusText);

diff --git a/examples/express/package.json b/examples/express/package.json
@@ -28,15 +28,15 @@
  "url": "https:/open-telemetry/opentelemetry-js/issues"
  },
  "dependencies": {
- "@opentelemetry/api": "^1.0.0-rc.0",
- "@opentelemetry/exporter-jaeger": "^0.19.0",
- "@opentelemetry/exporter-zipkin": "^0.19.0",
- "@opentelemetry/instrumentation": "^0.19.0",
+ "@opentelemetry/api": "^0.20.0",
+ "@opentelemetry/exporter-jaeger": "^0.20.0",
+ "@opentelemetry/exporter-zipkin": "^0.20.0",
+ "@opentelemetry/instrumentation": "^0.20.0",
  "@opentelemetry/instrumentation-express": "^0.15.0",
- "@opentelemetry/instrumentation-http": "^0.19.0",
- "@opentelemetry/node": "^0.19.0",
- "@opentelemetry/tracing": "^0.19.0",
- "axios": "^0.19.0",
+ "@opentelemetry/instrumentation-http": "^0.20.0",
+ "@opentelemetry/node": "^0.20.0",
+ "@opentelemetry/tracing": "^0.20.0",
+ "axios": "^0.21.1",
  "cross-env": "^7.0.3",
  "express": "^4.17.1"
  },

diff --git a/examples/graphql/package.json b/examples/graphql/package.json
@@ -31,13 +31,13 @@
  "url": "https:/open-telemetry/opentelemetry-js/issues"
  },
  "dependencies": {
- "@opentelemetry/exporter-collector": "^0.19.0",
- "@opentelemetry/instrumentation": "^0.19.0",
+ "@opentelemetry/exporter-collector": "^0.20.0",
+ "@opentelemetry/instrumentation": "^0.20.0",
  "@opentelemetry/instrumentation-graphql": "^0.15.0",
- "@opentelemetry/node": "^0.19.0",
+ "@opentelemetry/node": "^0.20.0",
  "@opentelemetry/instrumentation-express": "^0.15.0",
- "@opentelemetry/instrumentation-http": "^0.19.0",
- "@opentelemetry/tracing": "^0.19.0",
+ "@opentelemetry/instrumentation-http": "^0.20.0",
+ "@opentelemetry/tracing": "^0.20.0",
  "apollo-server": "^2.18.1",
  "express": "^4.17.1",
  "express-graphql": "^0.11.0",

diff --git a/examples/grpc-census-prop/README.md b/examples/grpc-census-prop/README.md
@@ -11,7 +11,7 @@ that is already instrumented using OpenCensus.
 If both sides of gRPC communication are using OpenTelemetry instrumentation then
 the `propagator-grpc-census-binary` propagator isn't required. Context will be
 propagated using the `traceparent` header (thanks to the
-[HttpTraceContext](https:/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-core/src/context/propagation/HttpTraceContext.ts)
+[HttpTraceContextPropagator](https:/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-core/src/trace/HttpTraceContextPropagator.ts)
 propagator from opentelemetry-core). If there is a mix of OpenCensus and OpenTelemetry
 instrumentation then the `propagator-grpc-census-binary` propagator allows OpenTelemetry
 to propagate context through the `grpc-trace-bin` binary header.

diff --git a/examples/grpc-census-prop/capitalize_client.js b/examples/grpc-census-prop/capitalize_client.js
@@ -66,15 +66,15 @@ function capitalizeWithCensusTracing(client, data) {
  */
 function capitalizeWithOTelTracing(client, data) {
  const span = tracer.startSpan('tutorialsClient.capitalize');
- api.context.with(api.setSpan(api.ROOT_CONTEXT, span), () => {
+ api.context.with(api.trace.setSpan(api.ROOT_CONTEXT, span), () => {
  client.capitalize({ data: Buffer.from(data) }, (err, response) => {
  if (err) {
  console.log('could not get grpc response');
  return;
  }
  console.log('< ', response.data.toString('utf8'));
  // display traceid in the terminal
- console.log(`traceid: ${span.context().traceId}`);
+ console.log(`traceid: ${span.spanContext().traceId}`);
  span.end();
  });
  });

diff --git a/examples/grpc-census-prop/capitalize_server.js b/examples/grpc-census-prop/capitalize_server.js
@@ -72,7 +72,7 @@ function capitalizeWithCensusTracing(call) {
 function capitalizeWithOTelTracing(call) {
  const currentSpan = tracer.getCurrentSpan();
  // display traceid in the terminal
- console.log(`traceid: ${currentSpan.context().traceId}`);
+ console.log(`traceid: ${currentSpan.spanContext().traceId}`);
 
  const span = tracer.startSpan('tutorials.FetchImpl.capitalize', {
  kind: SpanKind.SERVER,

diff --git a/examples/grpc-census-prop/package.json b/examples/grpc-census-prop/package.json
@@ -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.0-rc.0",
- "@opentelemetry/core": "^0.19.0",
- "@opentelemetry/instrumentation": "^0.19.0",
- "@opentelemetry/instrumentation-grpc": "^0.19.0",
- "@opentelemetry/node": "^0.19.0",
+ "@opentelemetry/api": "^0.20.0",
+ "@opentelemetry/core": "^0.20.0",
+ "@opentelemetry/instrumentation": "^0.20.0",
+ "@opentelemetry/instrumentation-grpc": "^0.20.0",
+ "@opentelemetry/node": "^0.20.0",
  "@opentelemetry/propagator-grpc-census-binary": "^0.15.0",
- "@opentelemetry/tracing": "^0.19.0",
+ "@opentelemetry/tracing": "^0.20.0",
  "grpc": "^1.24.2"
  },
  "homepage": "https:/open-telemetry/opentelemetry-js#readme",

diff --git a/examples/grpc-census-prop/tracer.js b/examples/grpc-census-prop/tracer.js
@@ -3,7 +3,7 @@
 const opentelemetry = require('@opentelemetry/api');
 const { NodeTracerProvider } = require('@opentelemetry/node');
 const { SimpleSpanProcessor, ConsoleSpanExporter } = require('@opentelemetry/tracing');
-const { HttpTraceContext } = require('@opentelemetry/core');
+const { HttpTraceContextPropagator } = require('@opentelemetry/core');
 const { GrpcCensusPropagator } = require('@opentelemetry/propagator-grpc-census-binary');
 const { registerInstrumentations } = require('@opentelemetry/instrumentation');
 const { GrpcInstrumentation } = require('@opentelemetry/instrumentation-grpc');
@@ -26,7 +26,7 @@ module.exports = (serviceName, binaryPropagator) => {
  });
  } else {
  provider.register({
- propagator: new HttpTraceContext(),
+ propagator: new HttpTraceContextPropagator(),
  });
  }
 

diff --git a/examples/grpc_dynamic_codegen/capitalize_client.js b/examples/grpc_dynamic_codegen/capitalize_client.js
@@ -21,15 +21,15 @@ function main() {
  console.log('> ', data);
 
  const span = tracer.startSpan('tutorialsClient.capitalize');
- api.context.with(api.setSpan(api.ROOT_CONTEXT, span), () => {
+ api.context.with(api.trace.setSpan(api.ROOT_CONTEXT, span), () => {
  client.capitalize({ data: Buffer.from(data) }, (err, response) => {
  if (err) {
  console.log('could not get grpc response');
  return;
  }
  console.log('< ', response.data.toString('utf8'));
  // display traceid in the terminal
- console.log(`traceid: ${span.context().traceId}`);
+ console.log(`traceid: ${span.spanContext().traceId}`);
  span.end();
  });
  });

diff --git a/examples/grpc_dynamic_codegen/capitalize_server.js b/examples/grpc_dynamic_codegen/capitalize_server.js
@@ -18,7 +18,7 @@ const rpcProto = grpc.loadPackageDefinition(definition).rpc;
 function capitalize(call, callback) {
  const currentSpan = tracer.getCurrentSpan();
  // display traceid in the terminal
- console.log(`traceid: ${currentSpan.context().traceId}`);
+ console.log(`traceid: ${currentSpan.spanContext().traceId}`);
 
  const span = tracer.startSpan('tutorials.FetchImpl.capitalize', {
  kind: SpanKind.SERVER,

diff --git a/examples/grpc_dynamic_codegen/package.json b/examples/grpc_dynamic_codegen/package.json
@@ -28,12 +28,12 @@
  },
  "dependencies": {
  "@grpc/proto-loader": "^0.4.0",
- "@opentelemetry/api": "^1.0.0-rc.0",
- "@opentelemetry/exporter-jaeger": "^0.19.0",
- "@opentelemetry/exporter-zipkin": "^0.19.0",
- "@opentelemetry/node": "^0.19.0",
- "@opentelemetry/instrumentation-grpc": "^0.19.0",
- "@opentelemetry/tracing": "^0.19.0",
+ "@opentelemetry/api": "^0.20.0",
+ "@opentelemetry/exporter-jaeger": "^0.20.0",
+ "@opentelemetry/exporter-zipkin": "^0.20.0",
+ "@opentelemetry/node": "^0.20.0",
+ "@opentelemetry/instrumentation-grpc": "^0.20.0",
+ "@opentelemetry/tracing": "^0.20.0",
  "grpc": "^1.24.6"
  },
  "homepage": "https:/open-telemetry/opentelemetry-js#readme",

diff --git a/examples/hapi/client.js b/examples/hapi/client.js
@@ -11,7 +11,7 @@ function makeRequest() {
  kind: api.SpanKind.CLIENT,
  });
 
- api.context.with(api.setSpan(api.ROOT_CONTEXT, span), async () => {
+ api.context.with(api.trace.setSpan(api.ROOT_CONTEXT, span), async () => {
  try {
  const res = await axios.get('http://localhost:8081/run_test');
  span.setStatus({ code: api.StatusCode.OK });

diff --git a/examples/hapi/package.json b/examples/hapi/package.json
@@ -32,15 +32,15 @@
  },
  "dependencies": {
  "@hapi/hapi": "^19.2.0",
- "@opentelemetry/api": "^1.0.0-rc.0",
- "@opentelemetry/exporter-jaeger": "^0.19.0",
- "@opentelemetry/exporter-zipkin": "^0.19.0",
- "@opentelemetry/instrumentation": "^0.19.0",
+ "@opentelemetry/api": "^0.20.0",
+ "@opentelemetry/exporter-jaeger": "^0.20.0",
+ "@opentelemetry/exporter-zipkin": "^0.20.0",
+ "@opentelemetry/instrumentation": "^0.20.0",
  "@opentelemetry/instrumentation-hapi": "^0.15.0",
- "@opentelemetry/instrumentation-http": "^0.19.0",
- "@opentelemetry/node": "^0.19.0",
- "@opentelemetry/tracing": "^0.19.0",
- "axios": "^0.19.0"
+ "@opentelemetry/instrumentation-http": "^0.20.0",
+ "@opentelemetry/node": "^0.20.0",
+ "@opentelemetry/tracing": "^0.20.0",
+ "axios": "^0.21.1"
  },
  "homepage": "https:/open-telemetry/opentelemetry-js-contrib#readme",
  "devDependencies": {

diff --git a/examples/hapi/server.js b/examples/hapi/server.js
@@ -64,7 +64,7 @@ const posts = ['post 0', 'post 1', 'post 2'];
 
 function addPost(_, h) {
  posts.push(`post ${posts.length}`);
- const currentSpan = api.getSpan(api.context.active());
+ const currentSpan = api.trace.getSpan(api.context.active());
  currentSpan.addEvent('Added post');
  currentSpan.setAttribute('Date', new Date());
  console.log(`Added post: ${posts[posts.length - 1]}`);
@@ -82,8 +82,8 @@ async function showNewPost(request) {
 }
 
 function runTest(_, h) {
- const currentSpan = api.getSpan(api.context.active());
- const { traceId } = currentSpan.context();
+ const currentSpan = api.trace.getSpan(api.context.active());
+ const { traceId } = currentSpan.spanContext();
  console.log(`traceid: ${traceId}`);
  console.log(`Jaeger URL: http://localhost:16686/trace/${traceId}`);
  console.log(`Zipkin URL: http://localhost:9411/zipkin/traces/${traceId}`);

diff --git a/examples/host-metrics/package.json b/examples/host-metrics/package.json
@@ -26,13 +26,13 @@
  "url": "https:/open-telemetry/opentelemetry-js/issues"
  },
  "dependencies": {
- "@opentelemetry/api": "^1.0.0-rc.0",
- "@opentelemetry/core": "^0.19.0",
- "@opentelemetry/exporter-collector": "^0.19.0",
- "@opentelemetry/exporter-prometheus": "^0.19.0",
+ "@opentelemetry/api": "^0.20.0",
+ "@opentelemetry/core": "^0.20.0",
+ "@opentelemetry/exporter-collector": "^0.20.0",
+ "@opentelemetry/exporter-prometheus": "^0.20.0",
  "@opentelemetry/host-metrics": "^0.15.0",
- "@opentelemetry/instrumentation": "^0.19.0",
- "@opentelemetry/metrics": "^0.19.0"
+ "@opentelemetry/instrumentation": "^0.20.0",
+ "@opentelemetry/metrics": "^0.20.0"
  },
  "homepage": "https:/open-telemetry/opentelemetry-js#readme"
 }
diff --git a/examples/ioredis/package.json b/examples/ioredis/package.json
@@ -28,12 +28,12 @@
  "url": "https:/open-telemetry/opentelemetry-js-contrib/issues"
  },
  "dependencies": {
- "@opentelemetry/api": "^1.0.0-rc.0",
- "@opentelemetry/exporter-jaeger": "^0.19.0",
- "@opentelemetry/instrumentation": "^0.19.0",
+ "@opentelemetry/api": "^0.20.0",
+ "@opentelemetry/exporter-jaeger": "^0.20.0",
+ "@opentelemetry/instrumentation": "^0.20.0",
  "@opentelemetry/instrumentation-ioredis": "^0.15.0",
- "@opentelemetry/node": "^0.19.0",
- "@opentelemetry/tracing": "^0.19.0",
+ "@opentelemetry/node": "^0.20.0",
+ "@opentelemetry/tracing": "^0.20.0",
  "ioredis": "^4.22.0"
  },
  "homepage": "https:/open-telemetry/opentelemetry-js-contrib#readme"

diff --git a/examples/koa/client.js b/examples/koa/client.js
@@ -10,7 +10,7 @@ function makeRequest() {
  kind: api.SpanKind.CLIENT,
  });
 
- api.context.with(api.setSpan(api.ROOT_CONTEXT, span), async () => {
+ api.context.with(api.trace.setSpan(api.ROOT_CONTEXT, span), async () => {
  try {
  const res = await axios.get('http://localhost:8081/run_test');
  span.setStatus({ code: api.StatusCode.OK });

diff --git a/examples/koa/package.json b/examples/koa/package.json
@@ -32,15 +32,15 @@
  },
  "dependencies": {
  "@koa/router": "^9.3.1",
- "@opentelemetry/api": "^1.0.0-rc.0",
- "@opentelemetry/exporter-jaeger": "^0.19.0",
- "@opentelemetry/exporter-zipkin": "^0.19.0",
- "@opentelemetry/instrumentation": "^0.19.0",
- "@opentelemetry/instrumentation-http": "^0.19.0",
+ "@opentelemetry/api": "^0.20.0",
+ "@opentelemetry/exporter-jaeger": "^0.20.0",
+ "@opentelemetry/exporter-zipkin": "^0.20.0",
+ "@opentelemetry/instrumentation": "^0.20.0",
+ "@opentelemetry/instrumentation-http": "^0.20.0",
  "@opentelemetry/instrumentation-koa": "^0.15.0",
- "@opentelemetry/node": "^0.19.0",
- "@opentelemetry/tracing": "^0.19.0",
- "axios": "^0.19.0",
+ "@opentelemetry/node": "^0.20.0",
+ "@opentelemetry/tracing": "^0.20.0",
+ "axios": "^0.21.1",
  "koa": "^2.13.0"
  },
  "homepage": "https:/open-telemetry/opentelemetry-js-contrib#readme",

diff --git a/examples/koa/server.js b/examples/koa/server.js
@@ -29,7 +29,7 @@ const posts = ['post 0', 'post 1', 'post 2'];
 
 function addPost(ctx) {
  posts.push(`post ${posts.length}`);
- const currentSpan = api.getSpan(api.context.active());
+ const currentSpan = api.trace.getSpan(api.context.active());
  currentSpan.addEvent('Added post');
  currentSpan.setAttribute('Date', new Date());
  ctx.body = `Added post: ${posts[posts.length - 1]}`;
@@ -48,8 +48,8 @@ async function showNewPost(ctx) {
 
 function runTest(ctx) {
  console.log('runTest');
- const currentSpan = api.getSpan(api.context.active());
- const { traceId } = currentSpan.context();
+ const currentSpan = api.trace.getSpan(api.context.active());
+ const { traceId } = currentSpan.spanContext();
  console.log(`traceid: ${traceId}`);
  console.log(`Jaeger URL: http://localhost:16686/trace/${traceId}`);
  console.log(`Zipkin URL: http://localhost:9411/zipkin/traces/${traceId}`);

diff --git a/examples/meta-node/client.js b/examples/meta-node/client.js
@@ -10,7 +10,7 @@ function makeRequest() {
  kind: api.SpanKind.CLIENT,
  });
 
- api.context.with(api.setSpan(api.ROOT_CONTEXT, span), async () => {
+ api.context.with(api.trace.setSpan(api.ROOT_CONTEXT, span), async () => {
  try {
  const res = await axios.get('http://localhost:8080/run_test');
  span.setStatus({ code: api.SpanStatusCode.OK });

diff --git a/examples/meta-node/package.json b/examples/meta-node/package.json
@@ -35,12 +35,12 @@
  "eslint": "^7.4.0"
  },
  "dependencies": {
- "@opentelemetry/api": "^1.0.0-rc.0",
+ "@opentelemetry/api": "^0.20.0",
  "@opentelemetry/auto-instrumentations-node": "^0.15.0",
- "@opentelemetry/exporter-collector": "^0.19.0",
- "@opentelemetry/instrumentation": "^0.19.0",
- "@opentelemetry/node": "^0.19.0",
- "@opentelemetry/tracing": "^0.19.0",
+ "@opentelemetry/exporter-collector": "^0.20.0",
+ "@opentelemetry/instrumentation": "^0.20.0",
+ "@opentelemetry/node": "^0.20.0",
+ "@opentelemetry/tracing": "^0.20.0",
  "axios": "^0.21.1",
  "express": "^4.17.1"
  }