Merge branch 'main' into links

README.md

@@ -220,8 +220,8 @@ These plugins are hosted at <https://github.com/open-telemetry/opentelemetry-js-
 - [@opentelemetry/plugin-ioredis][otel-contrib-plugin-ioredis]
 - [@opentelemetry/plugin-express][otel-contrib-plugin-express]
 - [@opentelemetry/plugin-dns][otel-contrib-plugin-dns]
-- [@opentelemetry/hapi-instrumentation][otel-contrib-hapi-instrumentation]
-- [@opentelemetry/koa-instrumentation][otel-contrib-koa-instrumentation]
+- [@opentelemetry/instrumentation-hapi][otel-contrib-instrumentation-hapi]
+- [@opentelemetry/instrumentation-koa][otel-contrib-instrumentation-koa]
 
 #### Web Plugins
 
@@ -234,8 +234,8 @@ These plugins are hosted at <https://github.com/open-telemetry/opentelemetry-js-
 
 These plugins are hosted at <https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web>
 
-- [@opentelemetry/plugin-document-load][otel-contrib-plugin-document-load]
-- [@opentelemetry/plugin-user-interaction][otel-contrib-plugin-user-interaction]
+- [@opentelemetry/instrumentation-document-load][otel-contrib-instrumentation-document-load]
+- [@opentelemetry/instrumentation-user-interaction][otel-contrib-instrumentation-user-interaction]
 
 To request automatic tracing support for a module not on this list, please [file an issue](https://github.com/open-telemetry/opentelemetry-js/issues). Alternatively, you can [write an instrumentation yourself](https://github.com/open-telemetry/opentelemetry-js/blob/main/doc/instrumentation-guide.md).
 
@@ -436,7 +436,7 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
 [otel-contrib-plugin-pg]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-pg
 [otel-contrib-plugin-redis]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-redis
 [otel-contrib-plugin-express]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-plugin-express
-[otel-contrib-plugin-user-interaction]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-plugin-user-interaction
-[otel-contrib-plugin-document-load]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-plugin-document-load
-[otel-contrib-hapi-instrumentation]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-hapi-instrumentation
-[otel-contrib-koa-instrumentation]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-koa-instrumentation
+[otel-contrib-instrumentation-user-interaction]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-instrumentation-user-interaction
+[otel-contrib-instrumentation-document-load]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/web/opentelemetry-instrumentation-document-load
+[otel-contrib-instrumentation-hapi]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-instrumentation-hapi
+[otel-contrib-instrumentation-koa]: https://github.com/open-telemetry/opentelemetry-js-contrib/tree/master/plugins/node/opentelemetry-instrumentation-koa

examples/tracer-web/README.md

@@ -20,14 +20,6 @@ By default, the application will run on port `8090`.
 
 ## Examples
 
-### Document Load
-
-To see the results, open the browser at <http://localhost:8090/document-load/> and make sure you have the browser console open. The application is using the `ConsoleSpanExporter` and will post the created spans to the browser console.
-
-The screen will look as follows:
-
-![Screenshot of the running example](images/document-load.png)
-
 ### XMLHttpRequest
 
 To see the results, open the browser at <http://localhost:8090/xml-http-request/> and make sure you have the browser console open. The application is using the `ConsoleSpanExporter` and will post the created spans to the browser console.

examples/tracer-web/package.json

@@ -43,8 +43,6 @@
     "@opentelemetry/instrumentation-fetch": "^0.18.0",
     "@opentelemetry/instrumentation-xml-http-request": "^0.18.0",
     "@opentelemetry/metrics": "^0.18.0",
-    "@opentelemetry/plugin-document-load": "^0.12.0",
-    "@opentelemetry/plugin-user-interaction": "^0.12.0",
     "@opentelemetry/propagator-b3": "^0.18.0",
     "@opentelemetry/tracing": "^0.18.0",
     "@opentelemetry/web": "^0.18.0"

examples/tracer-web/webpack.config.js

@@ -7,11 +7,9 @@ const directory = path.resolve(__dirname);
 const common = {
   mode: 'development',
   entry: {
-    'document-load': 'examples/document-load/index.js',
     metrics: 'examples/metrics/index.js',
     fetch: 'examples/fetch/index.js',
     'xml-http-request': 'examples/xml-http-request/index.js',
-    'user-interaction': 'examples/user-interaction/index.js',
     zipkin: 'examples/zipkin/index.js',
   },
   output: {

packages/opentelemetry-resources/README.md

@@ -17,7 +17,18 @@ npm install --save @opentelemetry/resources
 
 ## Usage
 
-> TODO
+```typescript
+import { Resource, SERVICE_RESOURCE } from '@opentelemetry/resources';
+const resource = new Resource({
+    [SERVICE_RESOURCE.NAME]: 'api-service',
+});
+
+const another_resource = new Resource({
+    'service.version': 2.0.0,
+    'service.group': 'instrumentation-group'
+});
+const merged_resource = resource.merge(another_resource);
+```
 
 ## Useful links