@prisma/instrumentation 7.2.0 → 7.3.0-integration-prisma6-fix-cloudflare-engine.1

package/README.md

@@ -4,6 +4,9 @@
 
 [OTEL - OpenTelemetry](https://opentelemetry.io/) compliant instrumentation for Prisma Client.
 
+⚠️ **Warning**: This package is provided as part of the `tracing` Preview Feature
+Its release cycle does not follow SemVer, which means we might release breaking changes (change APIs, remove functionality) without any prior warning.
+
 ## Installing
 
 ```
@@ -21,6 +24,14 @@ registerInstrumentations({
 })
 ```
 
+Don't forget to set `previewFeatures`:
+
+```prisma
+generator client {
+  provider = "prisma-client-js"
+}
+```
+
 ## Jaeger
 
 Exporting traces to [Jaeger Tracing](https://jaegertracing.io).

package/dist/index.js

@@ -29,73 +29,6 @@ module.exports = __toCommonJS(index_exports);
 var import_api2 = require("@opentelemetry/api");
 var import_instrumentation = require("@opentelemetry/instrumentation");
 
-// ../instrumentation-contract/dist/index.mjs
-var package_default = {
-  name: "@prisma/instrumentation-contract",
-  version: "7.2.0",
-  description: "Shared types and utilities for Prisma instrumentation",
-  main: "dist/index.js",
-  module: "dist/index.mjs",
-  types: "dist/index.d.ts",
-  exports: {
-    ".": {
-      require: {
-        types: "./dist/index.d.ts",
-        default: "./dist/index.js"
-      },
-      import: {
-        types: "./dist/index.d.mts",
-        default: "./dist/index.mjs"
-      }
-    }
-  },
-  license: "Apache-2.0",
-  homepage: "https://www.prisma.io",
-  repository: {
-    type: "git",
-    url: "https://github.com/prisma/prisma.git",
-    directory: "packages/instrumentation-contract"
-  },
-  bugs: "https://github.com/prisma/prisma/issues",
-  scripts: {
-    dev: "DEV=true tsx helpers/build.ts",
-    build: "tsx helpers/build.ts",
-    prepublishOnly: "pnpm run build",
-    test: "vitest run"
-  },
-  files: [
-    "dist"
-  ],
-  sideEffects: false,
-  devDependencies: {
-    "@opentelemetry/api": "1.9.0"
-  },
-  peerDependencies: {
-    "@opentelemetry/api": "^1.8"
-  }
-};
-var majorVersion = package_default.version.split(".")[0];
-var GLOBAL_INSTRUMENTATION_KEY = "PRISMA_INSTRUMENTATION";
-var GLOBAL_VERSIONED_INSTRUMENTATION_KEY = `V${majorVersion}_PRISMA_INSTRUMENTATION`;
-var globalThisWithPrismaInstrumentation = globalThis;
-function getGlobalTracingHelper() {
-  const versionedGlobal = globalThisWithPrismaInstrumentation[GLOBAL_VERSIONED_INSTRUMENTATION_KEY];
-  if (versionedGlobal?.helper) {
-    return versionedGlobal.helper;
-  }
-  const fallbackGlobal = globalThisWithPrismaInstrumentation[GLOBAL_INSTRUMENTATION_KEY];
-  return fallbackGlobal?.helper;
-}
-function setGlobalTracingHelper(helper) {
-  const globalValue = { helper };
-  globalThisWithPrismaInstrumentation[GLOBAL_VERSIONED_INSTRUMENTATION_KEY] = globalValue;
-  globalThisWithPrismaInstrumentation[GLOBAL_INSTRUMENTATION_KEY] = globalValue;
-}
-function clearGlobalTracingHelper() {
-  delete globalThisWithPrismaInstrumentation[GLOBAL_VERSIONED_INSTRUMENTATION_KEY];
-  delete globalThisWithPrismaInstrumentation[GLOBAL_INSTRUMENTATION_KEY];
-}
-
 // src/ActiveTracingHelper.ts
 var import_api = require("@opentelemetry/api");
 var showAllTraces = process.env.PRISMA_SHOW_ALL_TRACES === "true";
@@ -216,9 +149,9 @@ function shouldIgnoreSpan(spanName, ignoreSpanTypes) {
 }
 
 // package.json
-var package_default2 = {
+var package_default = {
   name: "@prisma/instrumentation",
-  version: "7.2.0",
+  version: "7.3.0-integration-prisma6-fix-cloudflare-engine.1",
   description: "OpenTelemetry compliant instrumentation for Prisma Client",
   main: "dist/index.js",
   module: "dist/index.mjs",
@@ -244,13 +177,13 @@ var package_default2 = {
   },
   bugs: "https://github.com/prisma/prisma/issues",
   devDependencies: {
+    "@prisma/internals": "workspace:*",
+    "@types/node": "18.19.76",
     "@opentelemetry/api": "1.9.0",
-    "@prisma/instrumentation-contract": "workspace:*",
-    "@types/node": "~20.19.24",
     typescript: "5.4.5"
   },
   dependencies: {
-    "@opentelemetry/instrumentation": "^0.207.0"
+    "@opentelemetry/instrumentation": ">=0.52.0 <1"
   },
   peerDependencies: {
     "@opentelemetry/api": "^1.8"
@@ -274,8 +207,11 @@ var package_default2 = {
 };
 
 // src/constants.ts
-var VERSION = package_default2.version;
-var NAME = package_default2.name;
+var VERSION = package_default.version;
+var majorVersion = VERSION.split(".")[0];
+var GLOBAL_INSTRUMENTATION_ACCESSOR_KEY = "PRISMA_INSTRUMENTATION";
+var GLOBAL_VERSIONED_INSTRUMENTATION_ACCESSOR_KEY = `V${majorVersion}_PRISMA_INSTRUMENTATION`;
+var NAME = package_default.name;
 var MODULE_NAME = "@prisma/client";
 
 // src/PrismaInstrumentation.ts
@@ -293,18 +229,21 @@ var PrismaInstrumentation = class extends import_instrumentation.Instrumentation
   }
   enable() {
     const config = this._config;
-    setGlobalTracingHelper(
-      new ActiveTracingHelper({
+    const globalValue = {
+      helper: new ActiveTracingHelper({
         tracerProvider: this.tracerProvider ?? import_api2.trace.getTracerProvider(),
         ignoreSpanTypes: config.ignoreSpanTypes ?? []
       })
-    );
+    };
+    global[GLOBAL_INSTRUMENTATION_ACCESSOR_KEY] = globalValue;
+    global[GLOBAL_VERSIONED_INSTRUMENTATION_ACCESSOR_KEY] = globalValue;
   }
   disable() {
-    clearGlobalTracingHelper();
+    delete global[GLOBAL_INSTRUMENTATION_ACCESSOR_KEY];
+    delete global[GLOBAL_VERSIONED_INSTRUMENTATION_ACCESSOR_KEY];
   }
   isEnabled() {
-    return getGlobalTracingHelper() !== void 0;
+    return Boolean(global[GLOBAL_VERSIONED_INSTRUMENTATION_ACCESSOR_KEY]);
   }
 };
 

package/dist/index.mjs

@@ -5,73 +5,6 @@ import {
   InstrumentationNodeModuleDefinition
 } from "@opentelemetry/instrumentation";
 
-// ../instrumentation-contract/dist/index.mjs
-var package_default = {
-  name: "@prisma/instrumentation-contract",
-  version: "7.2.0",
-  description: "Shared types and utilities for Prisma instrumentation",
-  main: "dist/index.js",
-  module: "dist/index.mjs",
-  types: "dist/index.d.ts",
-  exports: {
-    ".": {
-      require: {
-        types: "./dist/index.d.ts",
-        default: "./dist/index.js"
-      },
-      import: {
-        types: "./dist/index.d.mts",
-        default: "./dist/index.mjs"
-      }
-    }
-  },
-  license: "Apache-2.0",
-  homepage: "https://www.prisma.io",
-  repository: {
-    type: "git",
-    url: "https://github.com/prisma/prisma.git",
-    directory: "packages/instrumentation-contract"
-  },
-  bugs: "https://github.com/prisma/prisma/issues",
-  scripts: {
-    dev: "DEV=true tsx helpers/build.ts",
-    build: "tsx helpers/build.ts",
-    prepublishOnly: "pnpm run build",
-    test: "vitest run"
-  },
-  files: [
-    "dist"
-  ],
-  sideEffects: false,
-  devDependencies: {
-    "@opentelemetry/api": "1.9.0"
-  },
-  peerDependencies: {
-    "@opentelemetry/api": "^1.8"
-  }
-};
-var majorVersion = package_default.version.split(".")[0];
-var GLOBAL_INSTRUMENTATION_KEY = "PRISMA_INSTRUMENTATION";
-var GLOBAL_VERSIONED_INSTRUMENTATION_KEY = `V${majorVersion}_PRISMA_INSTRUMENTATION`;
-var globalThisWithPrismaInstrumentation = globalThis;
-function getGlobalTracingHelper() {
-  const versionedGlobal = globalThisWithPrismaInstrumentation[GLOBAL_VERSIONED_INSTRUMENTATION_KEY];
-  if (versionedGlobal?.helper) {
-    return versionedGlobal.helper;
-  }
-  const fallbackGlobal = globalThisWithPrismaInstrumentation[GLOBAL_INSTRUMENTATION_KEY];
-  return fallbackGlobal?.helper;
-}
-function setGlobalTracingHelper(helper) {
-  const globalValue = { helper };
-  globalThisWithPrismaInstrumentation[GLOBAL_VERSIONED_INSTRUMENTATION_KEY] = globalValue;
-  globalThisWithPrismaInstrumentation[GLOBAL_INSTRUMENTATION_KEY] = globalValue;
-}
-function clearGlobalTracingHelper() {
-  delete globalThisWithPrismaInstrumentation[GLOBAL_VERSIONED_INSTRUMENTATION_KEY];
-  delete globalThisWithPrismaInstrumentation[GLOBAL_INSTRUMENTATION_KEY];
-}
-
 // src/ActiveTracingHelper.ts
 import {
   context as _context,
@@ -196,9 +129,9 @@ function shouldIgnoreSpan(spanName, ignoreSpanTypes) {
 }
 
 // package.json
-var package_default2 = {
+var package_default = {
   name: "@prisma/instrumentation",
-  version: "7.2.0",
+  version: "7.3.0-integration-prisma6-fix-cloudflare-engine.1",
   description: "OpenTelemetry compliant instrumentation for Prisma Client",
   main: "dist/index.js",
   module: "dist/index.mjs",
@@ -224,13 +157,13 @@ var package_default2 = {
   },
   bugs: "https://github.com/prisma/prisma/issues",
   devDependencies: {
+    "@prisma/internals": "workspace:*",
+    "@types/node": "18.19.76",
     "@opentelemetry/api": "1.9.0",
-    "@prisma/instrumentation-contract": "workspace:*",
-    "@types/node": "~20.19.24",
     typescript: "5.4.5"
   },
   dependencies: {
-    "@opentelemetry/instrumentation": "^0.207.0"
+    "@opentelemetry/instrumentation": ">=0.52.0 <1"
   },
   peerDependencies: {
     "@opentelemetry/api": "^1.8"
@@ -254,8 +187,11 @@ var package_default2 = {
 };
 
 // src/constants.ts
-var VERSION = package_default2.version;
-var NAME = package_default2.name;
+var VERSION = package_default.version;
+var majorVersion = VERSION.split(".")[0];
+var GLOBAL_INSTRUMENTATION_ACCESSOR_KEY = "PRISMA_INSTRUMENTATION";
+var GLOBAL_VERSIONED_INSTRUMENTATION_ACCESSOR_KEY = `V${majorVersion}_PRISMA_INSTRUMENTATION`;
+var NAME = package_default.name;
 var MODULE_NAME = "@prisma/client";
 
 // src/PrismaInstrumentation.ts
@@ -273,18 +209,21 @@ var PrismaInstrumentation = class extends InstrumentationBase {
   }
   enable() {
     const config = this._config;
-    setGlobalTracingHelper(
-      new ActiveTracingHelper({
+    const globalValue = {
+      helper: new ActiveTracingHelper({
         tracerProvider: this.tracerProvider ?? trace2.getTracerProvider(),
         ignoreSpanTypes: config.ignoreSpanTypes ?? []
       })
-    );
+    };
+    global[GLOBAL_INSTRUMENTATION_ACCESSOR_KEY] = globalValue;
+    global[GLOBAL_VERSIONED_INSTRUMENTATION_ACCESSOR_KEY] = globalValue;
   }
   disable() {
-    clearGlobalTracingHelper();
+    delete global[GLOBAL_INSTRUMENTATION_ACCESSOR_KEY];
+    delete global[GLOBAL_VERSIONED_INSTRUMENTATION_ACCESSOR_KEY];
   }
   isEnabled() {
-    return getGlobalTracingHelper() !== void 0;
+    return Boolean(global[GLOBAL_VERSIONED_INSTRUMENTATION_ACCESSOR_KEY]);
   }
 };
 

package/dist/src/ActiveTracingHelper.d.ts

@@ -1,5 +1,5 @@
 import { Context, TracerProvider } from '@opentelemetry/api';
-import type { EngineSpan, ExtendedSpanOptions, SpanCallback, TracingHelper } from '@prisma/instrumentation-contract';
+import { EngineSpan, ExtendedSpanOptions, SpanCallback, TracingHelper } from '@prisma/internals';
 type Options = {
     tracerProvider: TracerProvider;
     ignoreSpanTypes: (string | RegExp)[];

package/dist/src/constants.d.ts

@@ -1,3 +1,5 @@
 export declare const VERSION: string;
+export declare const GLOBAL_INSTRUMENTATION_ACCESSOR_KEY = "PRISMA_INSTRUMENTATION";
+export declare const GLOBAL_VERSIONED_INSTRUMENTATION_ACCESSOR_KEY: string;
 export declare const NAME: string;
 export declare const MODULE_NAME = "@prisma/client";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/instrumentation",
-  "version": "7.2.0",
+  "version": "7.3.0-integration-prisma6-fix-cloudflare-engine.1",
   "description": "OpenTelemetry compliant instrumentation for Prisma Client",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -26,13 +26,13 @@
   },
   "bugs": "https://github.com/prisma/prisma/issues",
   "devDependencies": {
+    "@types/node": "18.19.76",
     "@opentelemetry/api": "1.9.0",
-    "@types/node": "~20.19.24",
     "typescript": "5.4.5",
-    "@prisma/instrumentation-contract": "7.2.0"
+    "@prisma/internals": "7.3.0-integration-prisma6-fix-cloudflare-engine.1"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.207.0"
+    "@opentelemetry/instrumentation": ">=0.52.0 <1"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.8"