Merge branch 'main' into naming-packages

vmarchaud · web-flow · commit 03bd789446a9 · 2021-07-17T10:46:22.000+02:00
diff --git a/packages/opentelemetry-exporter-collector-proto/src/CollectorMetricExporter.ts b/packages/opentelemetry-exporter-collector-proto/src/CollectorMetricExporter.ts
@@ -24,7 +24,7 @@ import { ServiceClientType } from './types';
 import { CollectorExporterNodeBase } from './CollectorExporterNodeBase';
 import { getEnv, baggageUtils } from '@opentelemetry/core';
 
-const DEFAULT_COLLECTOR_URL = 'http://localhost:4317/v1/metrics';
+const DEFAULT_COLLECTOR_URL = 'http://localhost:55681/v1/metrics';
 
 /**
  * Collector Metric Exporter for Node with protobuf
diff --git a/packages/opentelemetry-exporter-collector-proto/src/CollectorTraceExporter.ts b/packages/opentelemetry-exporter-collector-proto/src/CollectorTraceExporter.ts
@@ -24,7 +24,7 @@ import {
 import { ServiceClientType } from './types';
 import { getEnv, baggageUtils } from '@opentelemetry/core';
 
-const DEFAULT_COLLECTOR_URL = 'http://localhost:4317/v1/traces';
+const DEFAULT_COLLECTOR_URL = 'http://localhost:55681/v1/traces';
 
 /**
  * Collector Trace Exporter for Node with protobuf
diff --git a/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts b/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts
@@ -17,7 +17,7 @@
 import * as types from '../../types';
 import * as path from 'path';
 import * as RequireInTheMiddle from 'require-in-the-middle';
-import * as semver from 'semver';
+import { satisfies } from 'semver';
 import { InstrumentationAbstract } from '../../instrumentation';
 import { InstrumentationModuleDefinition } from './types';
 import { diag } from '@opentelemetry/api';
@@ -50,7 +50,7 @@ export abstract class InstrumentationBase<T = any>
     if (this._modules.length === 0) {
       diag.warn(
         'No modules instrumentation has been defined,' +
-          ' nothing will be patched'
+        ' nothing will be patched'
       );
     }
 
@@ -80,7 +80,7 @@ export abstract class InstrumentationBase<T = any>
       // main module
       if (
         typeof version === 'string' &&
-        isSupported(module.supportedVersions, version)
+        isSupported(module.supportedVersions, version, module.includePrerelease)
       ) {
         if (typeof module.patch === 'function') {
           module.moduleExports = exports;
@@ -93,7 +93,7 @@ export abstract class InstrumentationBase<T = any>
       // internal file
       const files = module.files ?? [];
       const file = files.find(file => file.name === name);
-      if (file && isSupported(file.supportedVersions, version)) {
+      if (file && isSupported(file.supportedVersions, version, module.includePrerelease)) {
         file.moduleExports = exports;
         if (this._enabled) {
           return file.patch(exports, module.moduleVersion);
@@ -167,8 +167,8 @@ export abstract class InstrumentationBase<T = any>
   }
 }
 
-function isSupported(supportedVersions: string[], version: string): boolean {
+function isSupported(supportedVersions: string[], version: string, includePrerelease?: boolean): boolean {
   return supportedVersions.some(supportedVersion => {
-    return semver.satisfies(version, supportedVersion);
+    return satisfies(version, supportedVersion, { includePrerelease });
   });
 }
diff --git a/packages/opentelemetry-instrumentation/src/platform/node/types.ts b/packages/opentelemetry-instrumentation/src/platform/node/types.ts
@@ -47,6 +47,9 @@ export interface InstrumentationModuleDefinition<T> {
   /** Module internal files to be patched  */
   files: InstrumentationModuleFile<any>[];
 
+  /** If set to true, the includePrerelease check will be included when calling semver.satisfies */
+  includePrerelease?: boolean;
+
   /** Method to patch the instrumentation  */
   patch?: (moduleExports: T, moduleVersion?: string) => T;
 
diff --git a/renovate.json b/renovate.json
@@ -11,8 +11,8 @@
       "rangeStrategy": "bump"
     },
     {
-      "matchPaths": ["backwards-compatibility/**"],
-      "ignoreDeps": ["@types/node"],
+      "matchPaths": ["backwards-compatibility"],
+      "matchPackageNames": ["@types/node"],
       "enabled": false
     }
   ],
diff --git a/website_docs/getting_started/browser.md b/website_docs/getting_started/browser.md
@@ -18,7 +18,7 @@ Copy the following file into an empty directory and call it `index.html`.
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>Document Load Plugin Example</title>
+  <title>Document Load Instrumentation Example</title>
   <base href="/">
   <!--
     https://www.w3.org/TR/trace-context/
@@ -33,14 +33,14 @@ Copy the following file into an empty directory and call it `index.html`.
   <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 <body>
-  Example of using Web Tracer with document load plugin with console exporter and collector exporter
+  Example of using Web Tracer with document load instrumentation with console exporter and collector exporter
 </body>
 </html>
 ```
 
 ## Installation
 
-To create traces in the browser, you will need `@opentelemetry/sdk-web-tracing`, and the plugin `@opentelemetry/plugin-document-load`:
+To create traces in the browser, you will need `@opentelemetry/sdk-web-tracing`, and the instrumentation `@opentelemetry/instrumentation-document-load`:
 
 ```shell
 npm init -y
@@ -59,7 +59,7 @@ We will add some code that will trace the document load timings and output those
 
 ## Creating a Tracer Provider
 
-Add the following code to the `document-load.js` to create a tracer provider, which brings the plugin to trace document load:
+Add the following code to the `document-load.js` to create a tracer provider, which brings the instrumentaion to trace document load:
 
 ```javascript
 import { WebTracerProvider } from '@opentelemetry/sdk-web-tracing';
@@ -74,7 +74,7 @@ provider.register({
   contextManager: new ZoneContextManager(),
 });
 
-// Registering instrumentations / plugins
+// Registering instrumentations
 registerInstrumentations({
   instrumentations: [
     new DocumentLoadInstrumentation(),
@@ -113,7 +113,7 @@ provider.register({
   contextManager: new ZoneContextManager(),
 });
 
-// Registering instrumentations / plugins
+// Registering instrumentations
 registerInstrumentations({
   instrumentations: [
     new DocumentLoadInstrumentation(),

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`	`"rangeStrategy": "bump"`
`12`	`12`	`},`
`13`	`13`	`{`
`14`		`- "matchPaths": ["backwards-compatibility/**"],`
`15`		`- "ignoreDeps": ["@types/node"],`
	`14`	`+ "matchPaths": ["backwards-compatibility"],`
	`15`	`+ "matchPackageNames": ["@types/node"],`
`16`	`16`	`"enabled": false`
`17`	`17`	`}`
`18`	`18`	`],`