Merge branch 'main' into zipkin-env-vars

README.md

@@ -245,12 +245,10 @@ To request automatic tracing support for a module not on this list, please [file
 
 ## Upgrade guidelines
 
-### 0.19.0 to 1.0.0-rc.0
+### 0.18.x to 0.19.0
 
 - All plugins have been removed in favor of instrumentations.
-
-### 0.18.0 to 0.19.0
-
+
 - The `@opentelemetry/propagator-b3` package previously exported three propagators: `B3Propagator`,`B3SinglePropagator`, and `B3MultiPropagator`, but now only exports the `B3Propagator`. It extracts b3 context in single and multi-header encodings, and injects context using the single-header encoding by default, but can be configured to inject context using the multi-header endcoding during construction: `new B3Propagator({ injectEncoding: B3InjectEncoding.MULTI_HEADER })`. If you were previously using the `B3SinglePropagator` or `B3MultiPropagator` directly, you should update your code to use the `B3Propagator` with the appropriate configuration. See the [readme](./packages/opentelemetry-propagator-b3/readme.md) for full details and usage.
 
 ### 0.17.0 to 0.18.0

backwards-compatability/node10/package.json

@@ -8,12 +8,12 @@
     "test:backcompat": "tsc --noEmit index.ts"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "^0.18.2",
-    "@opentelemetry/tracing": "^0.18.2"
+    "@opentelemetry/sdk-node": "0.18.2",
+    "@opentelemetry/tracing": "0.18.2"
   },
   "devDependencies": {
     "@types/node": "10.17.56",
-    "typescript": "4.2.3"
+    "typescript": "4.2.4"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0"

backwards-compatability/node12/package.json

@@ -8,12 +8,12 @@
     "test:backcompat": "tsc --noEmit index.ts"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "^0.18.2",
-    "@opentelemetry/tracing": "^0.18.2"
+    "@opentelemetry/sdk-node": "0.18.2",
+    "@opentelemetry/tracing": "0.18.2"
   },
   "devDependencies": {
     "@types/node": "12.20.7",
-    "typescript": "4.2.3"
+    "typescript": "4.2.4"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0"

backwards-compatability/node8/package.json

@@ -8,12 +8,12 @@
     "test:backcompat": "tsc --noEmit index.ts"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "^0.18.2",
-    "@opentelemetry/tracing": "^0.18.2"
+    "@opentelemetry/sdk-node": "0.18.2",
+    "@opentelemetry/tracing": "0.18.2"
   },
   "devDependencies": {
     "@types/node": "8.10.66",
-    "typescript": "4.2.3"
+    "typescript": "4.2.4"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0"

examples/grpc-js/package.json

@@ -28,7 +28,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.0.5",
+    "@grpc/grpc-js": "^1.2.12",
     "@opentelemetry/api": "^1.0.0-rc.0",
     "@opentelemetry/exporter-jaeger": "^0.18.2",
     "@opentelemetry/exporter-zipkin": "^0.18.2",

integration-tests/propagation-validation-server/package.json

@@ -11,16 +11,16 @@
     "compile": "tsc --build"
   },
   "dependencies": {
-    "@opentelemetry/context-async-hooks": "^0.18.2",
-    "@opentelemetry/core": "^0.18.2",
-    "@opentelemetry/tracing": "^0.18.2",
+    "@opentelemetry/context-async-hooks": "0.18.2",
+    "@opentelemetry/core": "0.18.2",
+    "@opentelemetry/tracing": "0.18.2",
     "axios": "0.21.1",
     "body-parser": "1.19.0",
     "express": "4.17.1"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0-rc.0",
-    "typescript": "4.2.3"
+    "typescript": "4.2.4"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0-rc.0"

package.json

@@ -45,13 +45,13 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@commitlint/cli": "12.0.1",
-    "@commitlint/config-conventional": "12.0.1",
-    "@typescript-eslint/eslint-plugin": "4.20.0",
-    "@typescript-eslint/parser": "4.20.0",
+    "@commitlint/cli": "12.1.1",
+    "@commitlint/config-conventional": "12.1.1",
+    "@typescript-eslint/eslint-plugin": "4.22.0",
+    "@typescript-eslint/parser": "4.22.0",
     "beautify-benchmark": "0.2.4",
     "benchmark": "2.1.4",
-    "eslint": "7.23.0",
+    "eslint": "7.24.0",
     "eslint-config-airbnb-base": "14.2.1",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.22.1",
@@ -61,8 +61,8 @@
     "lerna": "3.22.1",
     "lerna-changelog": "1.0.1",
     "markdownlint-cli": "0.27.1",
-    "typescript": "4.2.3",
-    "update-ts-references": "2.0.0"
+    "typescript": "4.2.4",
+    "update-ts-references": "2.3.0"
   },
   "husky": {
     "hooks": {

packages/opentelemetry-api-metrics/package.json

@@ -68,7 +68,7 @@
     "nyc": "15.1.0",
     "ts-loader": "8.1.0",
     "ts-mocha": "8.0.0",
-    "typescript": "4.2.3",
+    "typescript": "4.2.4",
     "webpack": "4.46.0"
   }
 }

packages/opentelemetry-context-async-hooks/package.json

@@ -51,7 +51,7 @@
     "rimraf": "3.0.2",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
-    "typescript": "4.2.3"
+    "typescript": "4.2.4"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0-rc.0"

packages/opentelemetry-context-zone-peer-dep/package.json

@@ -41,7 +41,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.13.14",
+    "@babel/core": "7.13.15",
     "@opentelemetry/api": "^1.0.0-rc.0",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.37",
@@ -65,7 +65,7 @@
     "ts-loader": "8.1.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
-    "typescript": "4.2.3",
+    "typescript": "4.2.4",
     "webpack": "4.46.0",
     "webpack-cli": "4.6.0",
     "zone.js": "0.11.4"

packages/opentelemetry-context-zone/package.json

@@ -38,7 +38,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.13.14",
+    "@babel/core": "7.13.15",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.37",
     "@types/sinon": "9.0.11",
@@ -58,13 +58,13 @@
     "ts-loader": "8.1.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
-    "typescript": "4.2.3",
+    "typescript": "4.2.4",
     "webpack": "4.46.0",
     "webpack-cli": "4.6.0",
     "webpack-merge": "5.7.3"
   },
   "dependencies": {
-    "@opentelemetry/context-zone-peer-dep": "^0.18.2",
+    "@opentelemetry/context-zone-peer-dep": "0.18.2",
     "zone.js": "^0.11.0"
   },
   "sideEffects": true

packages/opentelemetry-core/package.json

@@ -51,7 +51,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0-rc.0",
-    "@opentelemetry/propagator-b3": "^0.18.2",
+    "@opentelemetry/propagator-b3": "0.18.2",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.37",
     "@types/semver": "7.3.4",
@@ -73,7 +73,7 @@
     "ts-loader": "8.1.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
-    "typescript": "4.2.3",
+    "typescript": "4.2.4",
     "webpack": "4.46.0"
   },
   "peerDependencies": {

packages/opentelemetry-core/src/utils/environment.ts

@@ -101,9 +101,9 @@ export const DEFAULT_ENVIRONMENT: Required<ENVIRONMENT> = {
   OTEL_PROPAGATORS: ['tracecontext', 'baggage'],
   OTEL_RESOURCE_ATTRIBUTES: '',
   OTEL_SAMPLING_PROBABILITY: 1,
-  OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT: 1000,
-  OTEL_SPAN_EVENT_COUNT_LIMIT: 1000,
-  OTEL_SPAN_LINK_COUNT_LIMIT: 1000,
+  OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT: 128,
+  OTEL_SPAN_EVENT_COUNT_LIMIT: 128,
+  OTEL_SPAN_LINK_COUNT_LIMIT: 128,
 };
 
 /**

packages/opentelemetry-exporter-collector-grpc/package.json

@@ -45,9 +45,9 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.13.14",
+    "@babel/core": "7.13.15",
     "@opentelemetry/api": "^1.0.0-rc.0",
-    "@opentelemetry/api-metrics": "^0.18.2",
+    "@opentelemetry/api-metrics": "0.18.2",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.37",
     "@types/sinon": "9.0.11",
@@ -61,18 +61,18 @@
     "ts-loader": "8.1.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
-    "typescript": "4.2.3"
+    "typescript": "4.2.4"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0-rc.0"
   },
   "dependencies": {
-    "@grpc/proto-loader": "^0.5.4",
-    "@opentelemetry/core": "^0.18.2",
-    "@opentelemetry/exporter-collector": "^0.18.2",
-    "@opentelemetry/metrics": "^0.18.2",
-    "@opentelemetry/resources": "^0.18.2",
-    "@opentelemetry/tracing": "^0.18.2",
-    "grpc": "^1.24.2"
+    "@grpc/grpc-js": "^1.2.12",
+    "@grpc/proto-loader": "^0.6.0",
+    "@opentelemetry/core": "0.18.2",
+    "@opentelemetry/exporter-collector": "0.18.2",
+    "@opentelemetry/metrics": "0.18.2",
+    "@opentelemetry/resources": "0.18.2",
+    "@opentelemetry/tracing": "0.18.2"
   }
 }

packages/opentelemetry-exporter-collector-grpc/src/CollectorExporterNodeBase.ts

@@ -19,7 +19,7 @@ import {
   CollectorExporterBase,
   collectorTypes,
 } from '@opentelemetry/exporter-collector';
-import type { Metadata } from 'grpc';
+import type { Metadata } from '@grpc/grpc-js';
 import {
   CollectorExporterConfigNode,
   GRPCQueueItem,

packages/opentelemetry-exporter-collector-grpc/src/types.ts

@@ -15,7 +15,7 @@
  */
 
 import { collectorTypes } from '@opentelemetry/exporter-collector';
-import * as grpc from 'grpc';
+import * as grpc from '@grpc/grpc-js';
 
 /**
  * Queue item to be used to save temporary spans/metrics in case the GRPC service

packages/opentelemetry-exporter-collector-grpc/src/util.ts

@@ -17,7 +17,7 @@
 import { diag } from '@opentelemetry/api';
 import * as protoLoader from '@grpc/proto-loader';
 import { collectorTypes } from '@opentelemetry/exporter-collector';
-import * as grpc from 'grpc';
+import * as grpc from '@grpc/grpc-js';
 import * as path from 'path';
 
 import {
@@ -82,7 +82,7 @@ export function send<ExportItem, ServiceRequest>(
 
     collector.serviceClient.export(
       serviceRequest,
-      collector.metadata,
+      collector.metadata || new grpc.Metadata(),
       (err: collectorTypes.ExportServiceError) => {
         if (err) {
           diag.error('Service request', serviceRequest);

packages/opentelemetry-exporter-collector-grpc/test/CollectorMetricExporter.test.ts

@@ -25,7 +25,7 @@ import { collectorTypes } from '@opentelemetry/exporter-collector';
 import * as metrics from '@opentelemetry/metrics';
 import * as assert from 'assert';
 import * as fs from 'fs';
-import * as grpc from 'grpc';
+import * as grpc from '@grpc/grpc-js';
 import * as path from 'path';
 import * as sinon from 'sinon';
 import { CollectorMetricExporter } from '../src';
@@ -109,9 +109,10 @@ const testCollectorMetricExporter = (params: TestParams) =>
                 ]
               )
             : grpc.ServerCredentials.createInsecure();
-          server.bind(address, credentials);
-          server.start();
-          done();
+          server.bindAsync(address, credentials, () => {
+            server.start();
+            done();
+          });
         });
     });
 

packages/opentelemetry-exporter-collector-grpc/test/CollectorTraceExporter.test.ts

@@ -24,7 +24,7 @@ import {
 
 import * as assert from 'assert';
 import * as fs from 'fs';
-import * as grpc from 'grpc';
+import * as grpc from '@grpc/grpc-js';
 import * as path from 'path';
 import * as sinon from 'sinon';
 import { CollectorTraceExporter } from '../src';
@@ -104,9 +104,10 @@ const testCollectorExporter = (params: TestParams) =>
                 ]
               )
             : grpc.ServerCredentials.createInsecure();
-          server.bind(address, credentials);
-          server.start();
-          done();
+          server.bindAsync(address, credentials, () => {
+            server.start();
+            done();
+          });
         });
     });
 

packages/opentelemetry-exporter-collector-grpc/test/helper.ts

@@ -27,7 +27,7 @@ import * as metrics from '@opentelemetry/metrics';
 import { Resource } from '@opentelemetry/resources';
 import { ReadableSpan } from '@opentelemetry/tracing';
 import * as assert from 'assert';
-import * as grpc from 'grpc';
+import * as grpc from '@grpc/grpc-js';
 
 const meterProvider = new metrics.MeterProvider({
   interval: 30000,

packages/opentelemetry-exporter-collector-proto/package.json

@@ -45,9 +45,9 @@
     "access": "public"
   },
   "devDependencies": {
-    "@babel/core": "7.13.14",
+    "@babel/core": "7.13.15",
     "@opentelemetry/api": "^1.0.0-rc.0",
-    "@opentelemetry/api-metrics": "^0.18.2",
+    "@opentelemetry/api-metrics": "0.18.2",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.37",
     "@types/sinon": "9.0.11",
@@ -61,18 +61,18 @@
     "ts-loader": "8.1.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
-    "typescript": "4.2.3"
+    "typescript": "4.2.4"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.0-rc.0"
   },
   "dependencies": {
-    "@grpc/proto-loader": "^0.5.4",
-    "@opentelemetry/core": "^0.18.2",
-    "@opentelemetry/exporter-collector": "^0.18.2",
-    "@opentelemetry/metrics": "^0.18.2",
-    "@opentelemetry/resources": "^0.18.2",
-    "@opentelemetry/tracing": "^0.18.2",
+    "@grpc/proto-loader": "^0.6.0",
+    "@opentelemetry/core": "0.18.2",
+    "@opentelemetry/exporter-collector": "0.18.2",
+    "@opentelemetry/metrics": "0.18.2",
+    "@opentelemetry/resources": "0.18.2",
+    "@opentelemetry/tracing": "0.18.2",
     "protobufjs": "^6.9.0"
   }
 }