chore: update opentelemetry/instrumentation to 0.50.0 and improve int…

…egration test runs (#2834)

* chore: update opentelemetry/instrumentation to 0.50.0

* chore: change ubuntu runner for integration tests

* chore: change integration runner back to ubuntu-latest

* chore: remove macos run from integration tests

* test: try out run integration tests without oclif/test

* Revert "test: try out run integration tests without oclif/test"

This reverts commit 2ed9824.

* chore: remove run-v5 integration test run

* test: run integration test suites separately

* test: testing location

* test: fix directory location for orgs-v5 integration tests

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         node-version: [16.x]
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
     environment: AcceptanceTests
     env:
       HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
@@ -38,7 +38,14 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: yarn
       - run: yarn --immutable --network-timeout 1500000
-      - run: yarn lerna run test:integration
+      - name: Run cli package integration tests
+        run: |
+          cd packages/cli
+          yarn test:integration
+      - name: Run orgs-v5 integration tests
+        run: |
+          cd packages/orgs-v5
+          yarn test:integration
 
   acceptance:
     runs-on: ${{ matrix.os }}

packages/cli/package.json

@@ -38,7 +38,7 @@
     "@oclif/plugin-which": "2.2.8",
     "@opentelemetry/api": "^1.4.1",
     "@opentelemetry/exporter-trace-otlp-http": "^0.41.1",
-    "@opentelemetry/instrumentation": "^0.41.1",
+    "@opentelemetry/instrumentation": "^0.50.0",
     "@opentelemetry/resources": "^1.15.1",
     "@opentelemetry/sdk-trace-base": "^1.15.1",
     "@opentelemetry/sdk-trace-node": "^1.15.1",

packages/run-v5/package.json

@@ -74,7 +74,6 @@
     "postpack": "rm oclif.manifest.json",
     "prepack": "oclif manifest",
     "test": "nyc --extension .js mocha \"test/**/*.unit.test.js\" && yarn lint",
-    "test:integration": "mocha --forbid-only \"test/**/*.integration.test.js\"",
     "version": "oclif readme && git add README.md"
   }
 }

yarn.lock

@@ -4207,6 +4207,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@opentelemetry/api-logs@npm:0.50.0":
+  version: 0.50.0
+  resolution: "@opentelemetry/api-logs@npm:0.50.0"
+  dependencies:
+    "@opentelemetry/api": ^1.0.0
+  checksum: 5d4d9d448d1dc3a74879a19d5d24b9aecfd180e05acc622e25e5ca1bd0ad2c27b5541e101e474f2870e6470e148a7bad3c1b041d5a41181ebcde1f38a1ee6feb
+  languageName: node
+  linkType: hard
+
 "@opentelemetry/api@npm:^1.0.0, @opentelemetry/api@npm:^1.4.1":
   version: 1.4.1
   resolution: "@opentelemetry/api@npm:1.4.1"
@@ -4249,18 +4258,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation@npm:^0.41.1":
-  version: 0.41.2
-  resolution: "@opentelemetry/instrumentation@npm:0.41.2"
+"@opentelemetry/instrumentation@npm:^0.50.0":
+  version: 0.50.0
+  resolution: "@opentelemetry/instrumentation@npm:0.50.0"
   dependencies:
+    "@opentelemetry/api-logs": 0.50.0
     "@types/shimmer": ^1.0.2
-    import-in-the-middle: 1.4.2
+    import-in-the-middle: 1.7.1
     require-in-the-middle: ^7.1.1
-    semver: ^7.5.1
+    semver: ^7.5.2
     shimmer: ^1.2.1
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 73df84c356064aaf2465f691001d6c165877d7204d2c66063b89dfa8b7206bc47442cd6dec88c40af86b104dbe72081c2e234376a63b3afaa529a9648ac016cd
+  checksum: 371398639ca68c188d4b77a0034ea369222a2a1de421be37190900bade1210802a50b53cc48fd21206917817319a92a4cb52bd92bd534889355b54316145e634
   languageName: node
   linkType: hard
 
@@ -11225,7 +11235,7 @@ __metadata:
     "@oclif/test": ^2.3.25
     "@opentelemetry/api": ^1.4.1
     "@opentelemetry/exporter-trace-otlp-http": ^0.41.1
-    "@opentelemetry/instrumentation": ^0.41.1
+    "@opentelemetry/instrumentation": ^0.50.0
     "@opentelemetry/resources": ^1.15.1
     "@opentelemetry/sdk-trace-base": ^1.15.1
     "@opentelemetry/sdk-trace-node": ^1.15.1
@@ -11627,15 +11637,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"import-in-the-middle@npm:1.4.2":
-  version: 1.4.2
-  resolution: "import-in-the-middle@npm:1.4.2"
+"import-in-the-middle@npm:1.7.1":
+  version: 1.7.1
+  resolution: "import-in-the-middle@npm:1.7.1"
   dependencies:
     acorn: ^8.8.2
     acorn-import-assertions: ^1.9.0
     cjs-module-lexer: ^1.2.2
     module-details-from-path: ^1.0.3
-  checksum: 52971f821e9a3c94834cd5cf0ab5178321c07d4f4babd547b3cb24c4de21670d05b42ca1523890e7e90525c3bba6b7db7e54cf45421919b0b2712a34faa96ea5
+  checksum: 37cc8c75fb7eac60611bafafea7fc60f794d0931fdabcec516c8a26effe69e914b1f7e8116e98549c6fdd1fe88dcaebfdebf35d7f52c761b48b312e40f3bf323
   languageName: node
   linkType: hard
 
@@ -17264,7 +17274,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:7.6.0, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.3, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.1, semver@npm:^7.5.3, semver@npm:^7.5.4":
+"semver@npm:7.6.0, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.3, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.1, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4":
   version: 7.6.0
   resolution: "semver@npm:7.6.0"
   dependencies: