Merge branch 'main' into grpc-js

open-telemetry · Apr 12, 2021 · 46375f3 · 46375f3
2 parents 87ffe6b + 2260dd6
commit 46375f3
Show file tree

Hide file tree

Showing 80 changed files with 2,292 additions and 1,132 deletions.
diff --git a/README.md b/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

diff --git a/backwards-compatability/node10/package.json b/backwards-compatability/node10/package.json
@@ -8,8 +8,8 @@
     "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",

diff --git a/backwards-compatability/node12/package.json b/backwards-compatability/node12/package.json
@@ -8,8 +8,8 @@
     "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",

diff --git a/backwards-compatability/node8/package.json b/backwards-compatability/node8/package.json
@@ -8,8 +8,8 @@
     "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",

diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json
@@ -11,9 +11,9 @@
     "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"

diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json
@@ -61,7 +61,7 @@
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "sinon": "9.2.4",
+    "sinon": "10.0.0",
     "ts-loader": "8.1.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",

diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json
@@ -54,7 +54,7 @@
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "sinon": "9.2.4",
+    "sinon": "10.0.0",
     "ts-loader": "8.1.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
@@ -64,7 +64,7 @@
     "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

diff --git a/packages/opentelemetry-core/package.json b/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",
@@ -69,7 +69,7 @@
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "sinon": "9.2.4",
+    "sinon": "10.0.0",
     "ts-loader": "8.1.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",

diff --git a/packages/opentelemetry-core/src/context/propagation/composite.ts b/packages/opentelemetry-core/src/context/propagation/composite.ts
@@ -41,7 +41,7 @@ export class CompositePropagator implements TextMapPropagator {
         this._propagators
           // older propagators may not have fields function, null check to be sure
           .map(p => (typeof p.fields === 'function' ? p.fields() : []))
-          .reduce((x, y) => x.concat(y))
+          .reduce((x, y) => x.concat(y), [])
       )
     );
   }

diff --git a/packages/opentelemetry-core/src/utils/environment.ts b/packages/opentelemetry-core/src/utils/environment.ts
@@ -43,7 +43,10 @@ function isEnvVarANumber(key: unknown): key is keyof ENVIRONMENT_NUMBERS {
   );
 }
 
-const ENVIRONMENT_LISTS_KEYS = ['OTEL_NO_PATCH_MODULES'] as const;
+const ENVIRONMENT_LISTS_KEYS = [
+  'OTEL_NO_PATCH_MODULES',
+  'OTEL_PROPAGATORS',
+] as const;
 
 type ENVIRONMENT_LISTS = {
   [K in typeof ENVIRONMENT_LISTS_KEYS[number]]?: string[];
@@ -83,21 +86,22 @@ export const DEFAULT_ENVIRONMENT: Required<ENVIRONMENT> = {
   HOSTNAME: '',
   KUBERNETES_SERVICE_HOST: '',
   NAMESPACE: '',
+  OTEL_BSP_EXPORT_TIMEOUT: 30000,
+  OTEL_BSP_MAX_EXPORT_BATCH_SIZE: 512,
+  OTEL_BSP_MAX_QUEUE_SIZE: 2048,
+  OTEL_BSP_SCHEDULE_DELAY: 5000,
   OTEL_EXPORTER_JAEGER_AGENT_HOST: '',
   OTEL_EXPORTER_JAEGER_ENDPOINT: '',
   OTEL_EXPORTER_JAEGER_PASSWORD: '',
   OTEL_EXPORTER_JAEGER_USER: '',
   OTEL_LOG_LEVEL: DiagLogLevel.INFO,
   OTEL_NO_PATCH_MODULES: [],
+  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_BSP_EXPORT_TIMEOUT: 30000,
-  OTEL_BSP_MAX_EXPORT_BATCH_SIZE: 512,
-  OTEL_BSP_MAX_QUEUE_SIZE: 2048,
-  OTEL_BSP_SCHEDULE_DELAY: 5000,
+  OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT: 128,
+  OTEL_SPAN_EVENT_COUNT_LIMIT: 128,
+  OTEL_SPAN_LINK_COUNT_LIMIT: 128,
 };
 
 /**

diff --git a/packages/opentelemetry-exporter-collector-grpc/package.json b/packages/opentelemetry-exporter-collector-grpc/package.json
@@ -47,7 +47,7 @@
   "devDependencies": {
     "@babel/core": "7.13.14",
     "@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",
@@ -57,7 +57,7 @@
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "sinon": "9.2.4",
+    "sinon": "10.0.0",
     "ts-loader": "8.1.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
@@ -69,10 +69,10 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.2.12",
     "@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"
+    "@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"
   }
 }
diff --git a/packages/opentelemetry-exporter-collector-proto/package.json b/packages/opentelemetry-exporter-collector-proto/package.json
@@ -47,7 +47,7 @@
   "devDependencies": {
     "@babel/core": "7.13.14",
     "@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",
@@ -57,7 +57,7 @@
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "sinon": "9.2.4",
+    "sinon": "10.0.0",
     "ts-loader": "8.1.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
@@ -68,11 +68,11 @@
   },
   "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",
+    "@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"
   }
 }
diff --git a/packages/opentelemetry-exporter-collector/package.json b/packages/opentelemetry-exporter-collector/package.json
@@ -68,7 +68,7 @@
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "sinon": "9.2.4",
+    "sinon": "10.0.0",
     "ts-loader": "8.1.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
@@ -81,10 +81,10 @@
     "@opentelemetry/api": "^1.0.0-rc.0"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "^0.18.2",
-    "@opentelemetry/core": "^0.18.2",
-    "@opentelemetry/metrics": "^0.18.2",
-    "@opentelemetry/resources": "^0.18.2",
-    "@opentelemetry/tracing": "^0.18.2"
+    "@opentelemetry/api-metrics": "0.18.2",
+    "@opentelemetry/core": "0.18.2",
+    "@opentelemetry/metrics": "0.18.2",
+    "@opentelemetry/resources": "0.18.2",
+    "@opentelemetry/tracing": "0.18.2"
   }
 }
diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0-rc.0",
-    "@opentelemetry/resources": "^0.18.2",
+    "@opentelemetry/resources": "0.18.2",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.37",
     "@types/sinon": "9.0.11",
@@ -51,7 +51,7 @@
     "nock": "12.0.3",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "sinon": "9.2.4",
+    "sinon": "10.0.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
     "typescript": "4.2.3"
@@ -60,8 +60,8 @@
     "@opentelemetry/api": "^1.0.0-rc.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "^0.18.2",
-    "@opentelemetry/tracing": "^0.18.2",
+    "@opentelemetry/core": "0.18.2",
+    "@opentelemetry/tracing": "0.18.2",
     "jaeger-client": "^3.15.0"
   }
 }
diff --git a/packages/opentelemetry-exporter-prometheus/package.json b/packages/opentelemetry-exporter-prometheus/package.json
@@ -48,7 +48,7 @@
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "sinon": "9.2.4",
+    "sinon": "10.0.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
     "typescript": "4.2.3"
@@ -57,8 +57,8 @@
     "@opentelemetry/api": "^1.0.0-rc.0"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "^0.18.2",
-    "@opentelemetry/core": "^0.18.2",
-    "@opentelemetry/metrics": "^0.18.2"
+    "@opentelemetry/api-metrics": "0.18.2",
+    "@opentelemetry/core": "0.18.2",
+    "@opentelemetry/metrics": "0.18.2"
   }
 }
diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json
@@ -66,7 +66,7 @@
     "nock": "12.0.3",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "sinon": "9.2.4",
+    "sinon": "10.0.0",
     "ts-loader": "8.1.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
@@ -79,8 +79,8 @@
     "@opentelemetry/api": "^1.0.0-rc.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "^0.18.2",
-    "@opentelemetry/resources": "^0.18.2",
-    "@opentelemetry/tracing": "^0.18.2"
+    "@opentelemetry/core": "0.18.2",
+    "@opentelemetry/resources": "0.18.2",
+    "@opentelemetry/tracing": "0.18.2"
   }
 }
diff --git a/packages/opentelemetry-instrumentation-fetch/README.md b/packages/opentelemetry-instrumentation-fetch/README.md
@@ -61,6 +61,14 @@ fetch('http://localhost:8090/fetch.js');
 
 See [examples/tracer-web/fetch](https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web) for a short example.
 
+### Fetch Instrumentation options
+
+Fetch instrumentation plugin has few options available to choose from. You can set the following:
+
+| Options                                                                                                                                           | Type                          | Description                           |
+| ------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------- | ------------------------------------- |
+| [`applyCustomAttributesOnSpan`](https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-instrumentation-fetch/src/fetch.ts#L47) | `HttpCustomAttributeFunction` | Function for adding custom attributes |
+
 ## Useful links
 
 - For more information on OpenTelemetry, visit: <https://opentelemetry.io/>

diff --git a/packages/opentelemetry-instrumentation-fetch/package.json b/packages/opentelemetry-instrumentation-fetch/package.json
@@ -44,9 +44,9 @@
   "devDependencies": {
     "@babel/core": "7.13.14",
     "@opentelemetry/api": "^1.0.0-rc.0",
-    "@opentelemetry/context-zone": "^0.18.2",
-    "@opentelemetry/propagator-b3": "^0.18.2",
-    "@opentelemetry/tracing": "^0.18.2",
+    "@opentelemetry/context-zone": "0.18.2",
+    "@opentelemetry/propagator-b3": "0.18.2",
+    "@opentelemetry/tracing": "0.18.2",
     "@types/mocha": "8.2.2",
     "@types/node": "14.14.37",
     "@types/shimmer": "1.0.1",
@@ -65,7 +65,7 @@
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "sinon": "9.2.4",
+    "sinon": "10.0.0",
     "ts-loader": "8.1.0",
     "ts-mocha": "8.0.0",
     "ts-node": "9.1.1",
@@ -78,9 +78,9 @@
     "@opentelemetry/api": "^1.0.0-rc.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "^0.18.2",
-    "@opentelemetry/instrumentation": "^0.18.2",
-    "@opentelemetry/semantic-conventions": "^0.18.2",
-    "@opentelemetry/web": "^0.18.2"
+    "@opentelemetry/core": "0.18.2",
+    "@opentelemetry/instrumentation": "0.18.2",
+    "@opentelemetry/semantic-conventions": "0.18.2",
+    "@opentelemetry/web": "0.18.2"
   }
 }
diff --git a/packages/opentelemetry-instrumentation-fetch/src/enums/AttributeNames.ts b/packages/opentelemetry-instrumentation-fetch/src/enums/AttributeNames.ts
@@ -19,4 +19,6 @@
  */
 export enum AttributeNames {
   COMPONENT = 'component',
+  HTTP_ERROR_NAME = 'http.error_name',
+  HTTP_STATUS_TEXT = 'http.status_text',
 }