feat: add firestore v8 support (#126)

Author: sohankshirsagar

README.md

@@ -45,7 +45,7 @@ Tusk Drift currently supports the following packages and versions:
 - **HTTP/HTTPS**: All versions (Node.js built-in)
 - **GRPC**: `@grpc/grpc-js@1.x` (Outbound requests only)
 - **PG**: `pg@8.x`, `pg-pool@2.x-3.x`
-- **Firestore**: `@google-cloud/firestore@7.x`
+- **Firestore**: `@google-cloud/firestore@7.x-8.x`
 - **Postgres**: `postgres@3.x`
 - **MySQL**: `mysql2@3.x`, `mysql@2.x`
 - **IORedis**: `ioredis@4.x-5.x`

src/instrumentation/libraries/fetch/e2e-tests/cjs-fetch/docker-compose.yml

@@ -29,6 +29,9 @@ services:
       - ./src:/app/src
       # Mount .tusk config (but traces/logs are created inside container)
       - ./.tusk/config.yaml:/app/.tusk/config.yaml:ro
+      # Persist traces and logs on host
+      - ./.tusk/traces:/app/.tusk/traces
+      - ./.tusk/logs:/app/.tusk/logs
     depends_on:
       - mock-upstream
     working_dir: /app

src/instrumentation/libraries/fetch/e2e-tests/esm-fetch/docker-compose.yml

@@ -27,6 +27,9 @@ services:
       - ../../../../../..:/sdk:ro
       # Mount .tusk config
       - ./.tusk/config.yaml:/app/.tusk/config.yaml:ro
+      # Persist traces and logs on host
+      - ./.tusk/traces:/app/.tusk/traces
+      - ./.tusk/logs:/app/.tusk/logs
       # Mount app source for development
       - ./src:/app/src
     depends_on:

src/instrumentation/libraries/firestore/Instrumentation.ts

@@ -20,7 +20,7 @@ import { TdFirestoreWriteResultMock } from "./mocks/TdFirestoreWriteResultMock";
 import { PackageType } from "@use-tusk/drift-schemas/core/span";
 import { logger } from "../../../core/utils/logger";
 
-const FIRESTORE_VERSION = "7.*";
+const FIRESTORE_VERSIONS = ["7.*", "8.*"];
 const PACKAGE_NAME = "@google-cloud/firestore";
 
 export class FirestoreInstrumentation extends TdInstrumentationBase {
@@ -39,24 +39,24 @@ export class FirestoreInstrumentation extends TdInstrumentationBase {
     return [
       new TdInstrumentationNodeModule({
         name: PACKAGE_NAME,
-        supportedVersions: [FIRESTORE_VERSION],
+        supportedVersions: FIRESTORE_VERSIONS,
         files: [
           // Patch DocumentReference methods
           new TdInstrumentationNodeModuleFile({
             name: "@google-cloud/firestore/build/src/reference/document-reference.js",
-            supportedVersions: [FIRESTORE_VERSION],
+            supportedVersions: FIRESTORE_VERSIONS,
             patch: (moduleExports: any) => this._patchDocumentReference(moduleExports),
           }),
           // Patch CollectionReference methods
           new TdInstrumentationNodeModuleFile({
             name: "@google-cloud/firestore/build/src/reference/collection-reference.js",
-            supportedVersions: [FIRESTORE_VERSION],
+            supportedVersions: FIRESTORE_VERSIONS,
             patch: (moduleExports: any) => this._patchCollectionReference(moduleExports),
           }),
           // Patch Query methods
           new TdInstrumentationNodeModuleFile({
             name: "@google-cloud/firestore/build/src/reference/query.js",
-            supportedVersions: [FIRESTORE_VERSION],
+            supportedVersions: FIRESTORE_VERSIONS,
             patch: (moduleExports: any) => this._patchQuery(moduleExports),
           }),
         ],

src/instrumentation/libraries/firestore/e2e-tests/cjs-firestore/docker-compose.yml

@@ -19,6 +19,9 @@ services:
       - ../../../../../..:/sdk:ro
       # Mount .tusk config
       - ./.tusk/config.yaml:/app/.tusk/config.yaml:ro
+      # Persist traces and logs on host
+      - ./.tusk/traces:/app/.tusk/traces
+      - ./.tusk/logs:/app/.tusk/logs
       # Mount app source for development
       - ./src:/app/src
     working_dir: /app

src/instrumentation/libraries/firestore/e2e-tests/esm-firestore/docker-compose.yml

@@ -19,6 +19,9 @@ services:
       - ../../../../../..:/sdk:ro
       # Mount .tusk config
       - ./.tusk/config.yaml:/app/.tusk/config.yaml:ro
+      # Persist traces and logs on host
+      - ./.tusk/traces:/app/.tusk/traces
+      - ./.tusk/logs:/app/.tusk/logs
       # Mount app source for development
       - ./src:/app/src
     working_dir: /app

src/instrumentation/libraries/firestore/e2e-tests/esm-firestore/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@use-tusk/drift-node-sdk": "file:/sdk",
-    "@google-cloud/firestore": "^7.0.0",
+    "@google-cloud/firestore": "8.3.0",
     "express": "^4.18.2"
   },
   "devDependencies": {

src/instrumentation/libraries/grpc/e2e-tests/cjs-grpc/docker-compose.yml

@@ -18,6 +18,9 @@ services:
       - ../../../../../..:/sdk:ro
       # Mount .tusk folder to persist traces
       - ./.tusk/config.yaml:/app/.tusk/config.yaml:ro
+      # Persist traces and logs on host
+      - ./.tusk/traces:/app/.tusk/traces
+      - ./.tusk/logs:/app/.tusk/logs
       # Mount app source for development
       - ./src:/app/src
     working_dir: /app

src/instrumentation/libraries/grpc/e2e-tests/esm-grpc/docker-compose.yml

@@ -18,6 +18,9 @@ services:
       - ../../../../../..:/sdk:ro
       # Mount .tusk folder to persist traces
       - ./.tusk/config.yaml:/app/.tusk/config.yaml:ro
+      # Persist traces and logs on host
+      - ./.tusk/traces:/app/.tusk/traces
+      - ./.tusk/logs:/app/.tusk/logs
       # Mount app source for development
       - ./src:/app/src
     working_dir: /app

src/instrumentation/libraries/http/e2e-tests/cjs-http/docker-compose.yml

@@ -31,6 +31,9 @@ services:
       - ./src:/app/src
       # Mount .tusk config (but traces/logs are created inside container)
       - ./.tusk/config.yaml:/app/.tusk/config.yaml:ro
+      # Persist traces and logs on host
+      - ./.tusk/traces:/app/.tusk/traces
+      - ./.tusk/logs:/app/.tusk/logs
     depends_on:
       - mock-upstream
     working_dir: /app