Merge a7ba541 into c25bc38

open-telemetry · Aug 25, 2021 · 8c0d32f · 8c0d32f
2 parents c25bc38 + a7ba541
commit 8c0d32f
Show file tree

Hide file tree

Showing 177 changed files with 521 additions and 520 deletions.
diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
@@ -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"
   }
 }
diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json
@@ -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"
   }
 }
diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json
@@ -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",
@@ -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"
   }

diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json
@@ -60,6 +60,6 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/resources": "^0.24.0"
+    "@opentelemetry/resources": "^0.25.0"
   }
 }
diff --git a/examples/connect/package.json b/examples/connect/package.json
@@ -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"

diff --git a/examples/connect/tracing.js b/examples/connect/tracing.js
@@ -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');

diff --git a/examples/dns/package.json b/examples/dns/package.json
@@ -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": {

diff --git a/examples/dns/tracer.js b/examples/dns/tracer.js
@@ -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');

diff --git a/examples/express/package.json b/examples/express/package.json
@@ -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"

diff --git a/examples/express/tracer.js b/examples/express/tracer.js
@@ -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');

diff --git a/examples/graphql/package.json b/examples/graphql/package.json
@@ -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",

diff --git a/examples/graphql/tracer.js b/examples/graphql/tracer.js
@@ -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');

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.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",

diff --git a/examples/grpc-census-prop/tracer.js b/examples/grpc-census-prop/tracer.js
@@ -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');

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.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",

diff --git a/examples/grpc_dynamic_codegen/tracer.js b/examples/grpc_dynamic_codegen/tracer.js
@@ -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');

diff --git a/examples/hapi/package.json b/examples/hapi/package.json
@@ -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",

diff --git a/examples/hapi/tracer.js b/examples/hapi/tracer.js
@@ -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');

diff --git a/examples/host-metrics/node.js b/examples/host-metrics/node.js
@@ -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({

diff --git a/examples/host-metrics/package.json b/examples/host-metrics/package.json
@@ -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"
 }
diff --git a/examples/ioredis/package.json b/examples/ioredis/package.json
@@ -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"

diff --git a/examples/ioredis/tracer.js b/examples/ioredis/tracer.js
@@ -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');

diff --git a/examples/koa/package.json b/examples/koa/package.json
@@ -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"
   },

diff --git a/examples/koa/tracer.js b/examples/koa/tracer.js
@@ -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');
 

diff --git a/examples/memcached/package.json b/examples/memcached/package.json
@@ -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"