Merge pull request #876 from appsignal/bump-otel-dependencies

Update OpenTelemetry dependencies

package.json

@@ -12,50 +12,50 @@
     "appsignal-diagnose": "./bin/diagnose"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/instrumentation-express": "^0.32.0",
-    "@opentelemetry/instrumentation-fastify": "^0.31.0",
-    "@opentelemetry/instrumentation-graphql": "^0.33.0",
-    "@opentelemetry/instrumentation-http": "^0.34.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.33.0",
-    "@opentelemetry/instrumentation-knex": "^0.31.0",
-    "@opentelemetry/instrumentation-koa": "^0.34.0",
-    "@opentelemetry/instrumentation-mongodb": "0.33.0",
-    "@opentelemetry/instrumentation-mongoose": "^0.32.0",
-    "@opentelemetry/instrumentation-mysql": "^0.32.0",
-    "@opentelemetry/instrumentation-mysql2": "^0.33.0",
-    "@opentelemetry/instrumentation-nestjs-core": "^0.32.0",
-    "@opentelemetry/instrumentation-pg": "^0.33.0",
-    "@opentelemetry/instrumentation-redis": "^0.34.0",
-    "@opentelemetry/instrumentation-redis-4": "^0.34.0",
-    "@opentelemetry/instrumentation-restify": "^0.32.0",
-    "@opentelemetry/sdk-node": "^0.34.0",
-    "@opentelemetry/sdk-trace-base": "^1.8.0",
-    "@prisma/instrumentation": "^4.9.0",
+    "@opentelemetry/api": "^1.4.1",
+    "@opentelemetry/instrumentation-express": "^0.32.1",
+    "@opentelemetry/instrumentation-fastify": "^0.31.1",
+    "@opentelemetry/instrumentation-graphql": "^0.33.2",
+    "@opentelemetry/instrumentation-http": "^0.37.0",
+    "@opentelemetry/instrumentation-ioredis": "^0.34.0",
+    "@opentelemetry/instrumentation-knex": "^0.31.1",
+    "@opentelemetry/instrumentation-koa": "^0.34.2",
+    "@opentelemetry/instrumentation-mongodb": "0.34.1",
+    "@opentelemetry/instrumentation-mongoose": "^0.32.1",
+    "@opentelemetry/instrumentation-mysql": "^0.33.0",
+    "@opentelemetry/instrumentation-mysql2": "^0.33.1",
+    "@opentelemetry/instrumentation-nestjs-core": "^0.32.2",
+    "@opentelemetry/instrumentation-pg": "^0.35.0",
+    "@opentelemetry/instrumentation-redis": "^0.34.3",
+    "@opentelemetry/instrumentation-redis-4": "^0.34.3",
+    "@opentelemetry/instrumentation-restify": "^0.32.1",
+    "@opentelemetry/sdk-node": "^0.37.0",
+    "@opentelemetry/sdk-trace-base": "^1.11.0",
+    "@prisma/instrumentation": "^4.12.0",
     "node-addon-api": "^3.1.0",
     "node-gyp": "^9.0.0",
     "tslib": "^2.0.3",
     "winston": "^3.6.0"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.19",
-    "@typescript-eslint/eslint-plugin": "^5.13.0",
-    "@typescript-eslint/parser": "^5.13.0",
+    "@types/jest": "^29.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.57.0",
+    "@typescript-eslint/parser": "^5.57.0",
     "eslint": "^8.10.0",
     "eslint-config-prettier": "^8.4.0",
     "eslint-plugin-jest": "^26.1.1",
     "eslint-plugin-prettier": "^4.0.0",
     "husky": "^4.3.6",
-    "jest": "^26.6.3",
+    "jest": "^29.0.0",
     "lint-staged": "^10.5.3",
     "mongoose": "6.5.2",
     "mysql2": "2.3.0",
     "nock": "^13.2.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
     "rimraf": "^3.0.2",
-    "ts-jest": "^26.4.4",
-    "typescript": "~4.1.3"
+    "ts-jest": "^29.0.0",
+    "typescript": "5.0.3"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",

src/__tests__/helpers.test.ts

@@ -138,7 +138,7 @@ describe("Helpers", () => {
         try {
           throwError()
         } catch (err) {
-          setError(err)
+          setError(err as Error)
         }
 
         span.end()
@@ -176,7 +176,7 @@ describe("Helpers", () => {
         try {
           throwError()
         } catch (err) {
-          sendError(err)
+          sendError(err as Error)
         }
 
         expect(trace.getActiveSpan()).toBe(span)
@@ -202,7 +202,7 @@ describe("Helpers", () => {
       try {
         throwError()
       } catch (err) {
-        sendError(err, () => {
+        sendError(err as Error, () => {
           setCustomData({ chunky: "bacon" })
         })
       }
@@ -249,7 +249,7 @@ describe("Helpers", () => {
         try {
           throwError()
         } catch (err) {
-          setError(err, childSpan)
+          setError(err as Error, childSpan)
         }
 
         childSpan.end()

src/client.ts

@@ -376,7 +376,7 @@ export class Client {
       spanProcessor
     })
 
-    this.instrumentationsLoaded = sdk.start()
+    sdk.start()
 
     return sdk
   }

src/diagnose.ts

@@ -105,7 +105,7 @@ export class DiagnoseTool {
     try {
       rawReport = fs.readFileSync(installReportPath(), "utf8")
       return JSON.parse(rawReport)
-    } catch (error) {
+    } catch (error: any) {
       const report = {
         parsing_error: {
           error: `${error.name}: ${error.message}`,

test/express-apollo/tests/spec/app_spec.rb

@@ -12,7 +12,7 @@
       graphql_query = "{ books { title author } }"
       response = HTTP.post("#{@test_app_url}/graphql", :json => { :query => graphql_query })
 
-      expect(Span.root!).to be_http_span_with_route("HTTP POST")
+      expect(Span.root!).to be_http_span_with_route("POST /graphql")
       expect(response.code.to_i).to eq(200)
       expect(graphql_query).to have_graphql_span
     end

test/express-yoga/tests/spec/app_spec.rb

@@ -12,7 +12,7 @@
       graphql_query = "{ books { title author } }"
       response = HTTP.post("#{@test_app_url}/graphql", :json => { :query => graphql_query })
 
-      expect(Span.root!).to be_http_span_with_route("HTTP POST")
+      expect(Span.root!).to be_http_span_with_route("POST /graphql")
       expect(response.code.to_i).to eq(200)
       expect(graphql_query).to have_graphql_span
     end

test/helpers/span.rb

@@ -92,7 +92,7 @@ def transitive_parent_of?(child)
   def sql_child_by_library_and_type(library:, type:)
     sql_span = children.find do |child_span|
       child_span.instrumentation_library_name == library &&
-        child_span.name == type
+        child_span.name.start_with?(type)
     end
 
     unless sql_span

test/nextjs/tests/spec/app_spec.rb

@@ -9,7 +9,7 @@
     it "creates an HTTP root span" do
       response = HTTP.get("#{@test_app_url}/api/hello")
       root_span = Span.find_by_attribute("http.target", "/api/hello")
-      expect(root_span).to be_http_span_with_route("HTTP GET")
+      expect(root_span).to be_http_span_with_route("GET")
       expect(response.status).to eq(200)
     end
   end