chore: remove the non-publishing packages from the npm workspace (open-telemetry#1938)

* chore: remove the non-publishing packages from the npm workspace

Because they cause difficulties with updating `@opentelemetry/*` dependencies.
This is "Option 3" from open-telemetry#1917

Refs: open-telemetry#1917

* undo open-telemetry#1917 option 1 work (adding non-publishing packages to release-please config) from open-telemetry#1928

* move express example (haven't adjusted build / docs yet)

* express example updates to get it working

* remove non-publishing packages from release-please manifest

* move koa example

* fix up the koa-example-related files

* move the mongodb/examples files to the top-level

* fixup the mongodb-example files

* move mysql-example files

* fixup the mysql-example files

* move redis-example files to top level examples/ dir

* fixup redis-example files

* update examples README to no longer suggest moving to instruemtnation package dirs

* regenerate package-lock.json to rm the '.../examples' dir entries

'npm install --package-lock-only' did not accomplish this.
This regen was necessary because those vestigial entries caused
surprising breakage in some 'npm install --no-save ...' commands
such as TAV is doing. It broke TAV tests with [email protected].

* compile:examples is no longer a thing

* fix for 'npm ci' failures imported from PR open-telemetry#1955

* regenerate package-lock.json

'undici-types', required by the version of @types/node used
by the new instrumentation-perf-hooks, was lost in the merge
from main.

* add some more test output information to try to help debug flaky test

* fix tweaks to the test

* undo the instr-perf-hooks test assert tweaks, leaving that to a separate PR

Author: trentm

.github/workflows/unit-test.yml

@@ -136,8 +136,6 @@ jobs:
       - name: Unit tests (Delta)
         if: ${{ !matrix.code-coverage }}
         run: npm run test:ci:changed
-      - name: Build examples
-        run: npm run compile:examples
       - name: Report Coverage
         if: ${{ matrix.code-coverage && !cancelled()}}
         uses: codecov/codecov-action@v3

.release-please-manifest.json

@@ -1 +1 @@
-{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.6","detectors/node/opentelemetry-resource-detector-aws":"1.3.6","detectors/node/opentelemetry-resource-detector-azure":"0.2.4","detectors/node/opentelemetry-resource-detector-container":"0.3.6","detectors/node/opentelemetry-resource-detector-gcp":"0.29.6","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.6.0","metapackages/auto-instrumentations-node":"0.41.1","metapackages/auto-instrumentations-web":"0.36.0","packages/opentelemetry-host-metrics":"0.35.0","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.6","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sampler-aws-xray":"0.34.0","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.36.0","plugins/node/instrumentation-amqplib":"0.34.0","plugins/node/instrumentation-cucumber":"0.3.0","plugins/node/instrumentation-dataloader":"0.6.0","plugins/node/instrumentation-fs":"0.9.0","plugins/node/instrumentation-lru-memoizer":"0.34.0","plugins/node/instrumentation-mongoose":"0.35.0","plugins/node/instrumentation-perf-hooks": "0.1.0","plugins/node/instrumentation-socket.io":"0.36.0","plugins/node/instrumentation-tedious":"0.7.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.38.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.38.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.35.0","plugins/node/opentelemetry-instrumentation-bunyan/examples":"0.1.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.35.0","plugins/node/opentelemetry-instrumentation-connect":"0.33.0","plugins/node/opentelemetry-instrumentation-dns":"0.33.0","plugins/node/opentelemetry-instrumentation-express":"0.35.0","plugins/node/opentelemetry-instrumentation-express/examples":"0.1.0","plugins/node/opentelemetry-instrumentation-fastify":"0.33.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.33.0","plugins/node/opentelemetry-instrumentation-graphql":"0.37.0","plugins/node/opentelemetry-instrumentation-hapi":"0.34.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.37.0","plugins/node/opentelemetry-instrumentation-knex":"0.33.0","plugins/node/opentelemetry-instrumentation-koa":"0.37.0","plugins/node/opentelemetry-instrumentation-koa/examples":"0.1.0","plugins/node/opentelemetry-instrumentation-memcached":"0.33.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.39.0","plugins/node/opentelemetry-instrumentation-mongodb/examples":"0.1.0","plugins/node/opentelemetry-instrumentation-mysql":"0.35.0","plugins/node/opentelemetry-instrumentation-mysql/examples":"0.1.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.35.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.34.0","plugins/node/opentelemetry-instrumentation-net":"0.33.0","plugins/node/opentelemetry-instrumentation-pg":"0.38.0","plugins/node/opentelemetry-instrumentation-pino":"0.35.0","plugins/node/opentelemetry-instrumentation-redis":"0.36.0","plugins/node/opentelemetry-instrumentation-redis/examples":"0.1.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.36.0","plugins/node/opentelemetry-instrumentation-restify":"0.35.0","plugins/node/opentelemetry-instrumentation-router":"0.34.0","plugins/node/opentelemetry-instrumentation-winston":"0.34.0","plugins/web/opentelemetry-instrumentation-document-load":"0.35.0","plugins/web/opentelemetry-instrumentation-long-task":"0.35.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.35.0","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"}
+{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.6","detectors/node/opentelemetry-resource-detector-aws":"1.3.6","detectors/node/opentelemetry-resource-detector-azure":"0.2.4","detectors/node/opentelemetry-resource-detector-container":"0.3.6","detectors/node/opentelemetry-resource-detector-gcp":"0.29.6","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.6.0","metapackages/auto-instrumentations-node":"0.41.1","metapackages/auto-instrumentations-web":"0.36.0","packages/opentelemetry-host-metrics":"0.35.0","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.6","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.36.0","plugins/node/instrumentation-amqplib":"0.34.0","plugins/node/instrumentation-cucumber":"0.3.0","plugins/node/instrumentation-dataloader":"0.6.0","plugins/node/instrumentation-fs":"0.9.0","plugins/node/instrumentation-lru-memoizer":"0.34.0","plugins/node/instrumentation-mongoose":"0.35.0","plugins/node/instrumentation-perf-hooks": "0.1.0","plugins/node/instrumentation-socket.io":"0.36.0","plugins/node/instrumentation-tedious":"0.7.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.38.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.38.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.35.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.35.0","plugins/node/opentelemetry-instrumentation-connect":"0.33.0","plugins/node/opentelemetry-instrumentation-dns":"0.33.0","plugins/node/opentelemetry-instrumentation-express":"0.35.0","plugins/node/opentelemetry-instrumentation-fastify":"0.33.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.33.0","plugins/node/opentelemetry-instrumentation-graphql":"0.37.0","plugins/node/opentelemetry-instrumentation-hapi":"0.34.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.37.0","plugins/node/opentelemetry-instrumentation-knex":"0.33.0","plugins/node/opentelemetry-instrumentation-koa":"0.37.0","plugins/node/opentelemetry-instrumentation-memcached":"0.33.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.39.0","plugins/node/opentelemetry-instrumentation-mysql":"0.35.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.35.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.34.0","plugins/node/opentelemetry-instrumentation-net":"0.33.0","plugins/node/opentelemetry-instrumentation-pg":"0.38.0","plugins/node/opentelemetry-instrumentation-pino":"0.35.0","plugins/node/opentelemetry-instrumentation-redis":"0.36.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.36.0","plugins/node/opentelemetry-instrumentation-restify":"0.35.0","plugins/node/opentelemetry-instrumentation-router":"0.34.0","plugins/node/opentelemetry-instrumentation-winston":"0.34.0","plugins/web/opentelemetry-instrumentation-document-load":"0.35.0","plugins/web/opentelemetry-instrumentation-long-task":"0.35.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.35.0","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"}

examples/README.md

@@ -0,0 +1 @@
+package-lock=false

examples/bunyan/.npmrc

@@ -0,0 +1 @@
+package-lock=false

plugins/node/opentelemetry-instrumentation-bunyan/examples/README.md examples/bunyan/README.md

@@ -8,13 +8,12 @@
     "zipkin:client": "cross-env EXPORTER=zipkin ts-node src/client.ts",
     "jaeger:server": "cross-env EXPORTER=jaeger ts-node src/server.ts",
     "jaeger:client": "cross-env EXPORTER=jaeger ts-node src/client.ts",
-    "compile": "tsc -p .",
-    "setup": "cd ../../../../ && npm ci && cd plugins/node/opentelemetry-instrumentation-express && npm run compile && cd examples && npm run compile"
+    "compile": "tsc -p ."
   },
   "repository": {
     "type": "git",
     "url": "git+ssh://[email protected]/open-telemetry/opentelemetry-js-contrib.git",
-    "directory": "plugins/node/opentelemetry-instrumentation-express"
+    "directory": "examples/express"
   },
   "keywords": [
     "opentelemetry",
@@ -29,7 +28,7 @@
   "bugs": {
     "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
   },
-  "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-express/examples#readme",
+  "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/examples/express#readme",
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/exporter-jaeger": "^1.18.1",

plugins/node/opentelemetry-instrumentation-bunyan/examples/app.js examples/bunyan/app.js

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../../tsconfig.base",
   "compilerOptions": {
     "noEmit": true,
     "rootDir": ".",

plugins/node/opentelemetry-instrumentation-bunyan/examples/app.mjs examples/bunyan/app.mjs

@@ -0,0 +1 @@
+package-lock=false

plugins/node/opentelemetry-instrumentation-bunyan/examples/package.json examples/bunyan/package.json

@@ -3,7 +3,6 @@
   "private": true,
   "version": "0.1.0",
   "description": "Example of Koa and @koa/router integration with OpenTelemetry",
-  "main": "index.js",
   "scripts": {
     "zipkin:server": "cross-env EXPORTER=zipkin ts-node src/server.ts",
     "zipkin:client": "cross-env EXPORTER=zipkin ts-node src/client.ts",
@@ -13,7 +12,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+ssh://[email protected]/open-telemetry/opentelemetry-js-contrib.git"
+    "url": "git+ssh://[email protected]/open-telemetry/opentelemetry-js-contrib.git",
+    "directory": "examples/koa"
   },
   "keywords": [
     "opentelemetry",
@@ -42,7 +42,7 @@
     "axios": "^1.6.0",
     "koa": "^2.13.0"
   },
-  "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
+  "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/examples/koa#readme",
   "devDependencies": {
     "cross-env": "^7.0.0",
     "ts-node": "^10.6.0",

plugins/node/opentelemetry-instrumentation-bunyan/examples/telemetry.js examples/bunyan/telemetry.js

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../../tsconfig.base",
   "compilerOptions": {
     "noEmit": true,
     "rootDir": ".",

examples/express/.npmrc

@@ -0,0 +1 @@
+package-lock=false

examples/express/README.md

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../../tsconfig.base",
   "compilerOptions": {
     "noEmit": true,
     "rootDir": ".",

plugins/node/opentelemetry-instrumentation-express/examples/images/jaeger.jpg examples/express/images/jaeger.jpg

@@ -0,0 +1 @@
+package-lock=false

plugins/node/opentelemetry-instrumentation-express/examples/images/zipkin.jpg examples/express/images/zipkin.jpg

@@ -42,7 +42,7 @@
     "@opentelemetry/exporter-metrics-otlp-grpc": "^0.48.0",
     "mysql": "^2.18.1"
   },
-  "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
+  "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/mysql#readme",
   "devDependencies": {
     "@types/mysql": "^2.15.21",
     "cross-env": "^7.0.0",

plugins/node/opentelemetry-instrumentation-express/examples/package.json examples/express/package.json

@@ -50,7 +50,7 @@ function startServer(port: number | undefined) {
 function handleRequest(request: any, response: any) {
   const currentSpan = api.trace.getSpan(api.context.active())
   // display traceid in the terminal
-  const traceId = currentSpan?.spanContext();
+  const traceId = currentSpan?.spanContext().traceId;
   console.log(`traceid: ${traceId}`);
   console.log(`Jaeger URL: http://localhost:16686/trace/${traceId}`);
   console.log(`Zipkin URL: http://localhost:9411/zipkin/traces/${traceId}`);

plugins/node/opentelemetry-instrumentation-express/examples/src/client.ts examples/express/src/client.ts

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../../tsconfig.base",
   "compilerOptions": {
     "noEmit": true,
     "rootDir": ".",

plugins/node/opentelemetry-instrumentation-express/examples/src/server.ts examples/express/src/server.ts

@@ -0,0 +1 @@
+package-lock=false