chore: add cache-busting to e2e tests and improve mysql2 base connection support (#33)

* fixes

* improve mysql2 version handling

* fix script

* fix integration test

Author: sohankshirsagar

docs/nextjs-initialization.md

@@ -1,4 +1,4 @@
-# Next.js Initialization
+# Next.js Initialization (Beta)
 
 This guide explains how to set up Tusk Drift in your Next.js application.
 

src/core/tracing/JsonSchemaHelper.ts

@@ -169,7 +169,7 @@ export class JsonSchemaHelper {
 
   /**
    * Generate schema from data object using standardized types
-   * 
+   *
    * Note: We properties always exists on JsonSchema because proto3 maps cannot be marked optional.
    * The JSON data is a bit inefficient because of this, but the easiest way to handle this is to keep it for now.
    */
@@ -188,7 +188,10 @@ export class JsonSchemaHelper {
       if (Array.isArray(data) && data.length === 0) {
         return { type: JsonSchemaType.ORDERED_LIST, properties: {} };
       }
-      const items = Array.isArray(data) && data.length > 0 ? JsonSchemaHelper.generateSchema(data[0]) : undefined;
+      const items =
+        Array.isArray(data) && data.length > 0
+          ? JsonSchemaHelper.generateSchema(data[0])
+          : undefined;
       if (items !== undefined) {
         return {
           type: JsonSchemaType.ORDERED_LIST,

src/instrumentation/libraries/fetch/e2e-tests/cjs-fetch/Dockerfile

@@ -9,6 +9,8 @@ COPY src/instrumentation/libraries/fetch/e2e-tests/cjs-fetch/tsconfig.json ./
 # Install dependencies
 RUN npm install
 
+# Add cache-busting argument to force fresh CLI download
+ARG CACHEBUST=1
 # Install Tusk Drift CLI
 RUN curl -fsSL https://raw.githubusercontent.com/Use-Tusk/tusk-drift-cli/main/install.sh | sh
 

src/instrumentation/libraries/fetch/e2e-tests/esm-fetch/Dockerfile

@@ -9,6 +9,8 @@ COPY src/instrumentation/libraries/fetch/e2e-tests/esm-fetch/tsconfig.json ./
 # Install dependencies
 RUN npm install
 
+# Add cache-busting argument to force fresh CLI download
+ARG CACHEBUST=1
 # Install Tusk Drift CLI
 RUN curl -fsSL https://raw.githubusercontent.com/Use-Tusk/tusk-drift-cli/main/install.sh | sh
 

src/instrumentation/libraries/grpc/e2e-tests/cjs-grpc/Dockerfile

@@ -9,6 +9,8 @@ COPY src/instrumentation/libraries/grpc/e2e-tests/cjs-grpc/tsconfig.json ./
 # Install dependencies
 RUN npm install
 
+# Add cache-busting argument to force fresh CLI download
+ARG CACHEBUST=1
 # Install Tusk Drift CLI
 RUN curl -fsSL https://raw.githubusercontent.com/Use-Tusk/tusk-drift-cli/main/install.sh | sh
 

src/instrumentation/libraries/grpc/e2e-tests/esm-grpc/Dockerfile

@@ -9,6 +9,8 @@ COPY src/instrumentation/libraries/grpc/e2e-tests/esm-grpc/tsconfig.json ./
 # Install dependencies
 RUN npm install
 
+# Add cache-busting argument to force fresh CLI download
+ARG CACHEBUST=1
 # Install Tusk Drift CLI
 RUN curl -fsSL https://raw.githubusercontent.com/Use-Tusk/tusk-drift-cli/main/install.sh | sh
 

src/instrumentation/libraries/http/Instrumentation.ts

@@ -91,7 +91,7 @@ export class HttpInstrumentation extends TdInstrumentationBase {
     }
 
     // ESM Support: Detect if this is an ESM module
-    const isESM = (httpModule as any)[Symbol.toStringTag] === 'Module';
+    const isESM = (httpModule as any)[Symbol.toStringTag] === "Module";
 
     if (isESM) {
       // ESM Case: Also set wrapped methods on the default export
@@ -181,6 +181,8 @@ export class HttpInstrumentation extends TdInstrumentationBase {
             return originalHandler.call(this);
           }
 
+          logger.debug(`[HttpInstrumentation] Setting replay trace id`, replayTraceId);
+
           // Set env vars for current trace
           const envVars = this.replayHooks.extractEnvVarsFromHeaders(req);
           if (envVars) {
@@ -933,7 +935,7 @@ export class HttpInstrumentation extends TdInstrumentationBase {
           complete: true,
           readable: false,
           // Add error-specific fields
-          errorName: error.name || 'UNKNOWN',
+          errorName: error.name || "UNKNOWN",
           errorMessage: error.message,
         };
 

src/instrumentation/libraries/http/e2e-tests/cjs-http/Dockerfile

@@ -9,6 +9,8 @@ COPY src/instrumentation/libraries/http/e2e-tests/cjs-http/tsconfig.json ./
 # Install dependencies
 RUN npm install
 
+# Add cache-busting argument to force fresh CLI download
+ARG CACHEBUST=1
 # Install Tusk Drift CLI
 RUN curl -fsSL https://raw.githubusercontent.com/Use-Tusk/tusk-drift-cli/main/install.sh | sh
 

src/instrumentation/libraries/http/e2e-tests/esm-http/Dockerfile

@@ -9,6 +9,8 @@ COPY src/instrumentation/libraries/http/e2e-tests/esm-http/tsconfig.json ./
 # Install dependencies
 RUN npm install
 
+# Add cache-busting argument to force fresh CLI download
+ARG CACHEBUST=1
 # Install Tusk Drift CLI
 RUN curl -fsSL https://raw.githubusercontent.com/Use-Tusk/tusk-drift-cli/main/install.sh | sh
 

src/instrumentation/libraries/ioredis/Instrumentation.ts

@@ -17,9 +17,7 @@ import {
   IORedisOutputValue,
   BufferMetadata,
 } from "./types";
-import {
-  convertValueToJsonable,
-} from "./utils";
+import { convertValueToJsonable } from "./utils";
 import { PackageType } from "@use-tusk/drift-schemas/core/span";
 import { logger } from "../../../core/utils/logger";
 
@@ -125,7 +123,7 @@ export class IORedisInstrumentation extends TdInstrumentationBase {
     const actualExports = isESM ? moduleExports.default : moduleExports;
 
     if (!actualExports || !actualExports.prototype) {
-      logger.error(`[IORedisInstrumentation] Invalid Pipeline module exports, cannot patch`);
+      logger.debug(`[IORedisInstrumentation] Invalid Pipeline module exports, cannot patch`);
       return moduleExports;
     }
 
@@ -550,7 +548,10 @@ export class IORedisInstrumentation extends TdInstrumentationBase {
     return promise;
   }
 
-  private async _handleReplayConnect(spanInfo: SpanInfo, thisContext: IORedisInterface): Promise<any> {
+  private async _handleReplayConnect(
+    spanInfo: SpanInfo,
+    thisContext: IORedisInterface,
+  ): Promise<any> {
     logger.debug(`[IORedisInstrumentation] Replaying IORedis connect`);
 
     // Connect operations typically don't have meaningful output to replay