diff --git a/content/200-orm/200-prisma-client/100-queries/058-transactions.mdx b/content/200-orm/200-prisma-client/100-queries/058-transactions.mdx index 4f5409d729..1faee26a55 100644 --- a/content/200-orm/200-prisma-client/100-queries/058-transactions.mdx +++ b/content/200-orm/200-prisma-client/100-queries/058-transactions.mdx @@ -202,7 +202,7 @@ Sometimes you need more control over what queries execute within a transaction. Interactive transactions have been generally available from version 4.7.0. -If you use interactive transactions in preview from version 2.29.0 to 4.6.1 (included), you need to add the `interactiveTransactions` preview feature to the generator block of your Prisma schema. +If you use interactive transactions in preview from version 2.29.0 to 4.6.1 (inclusive), you need to add the `interactiveTransactions` preview feature to the generator block of your Prisma schema. diff --git a/content/200-orm/200-prisma-client/600-observability-and-logging/250-opentelemetry-tracing.mdx b/content/200-orm/200-prisma-client/600-observability-and-logging/250-opentelemetry-tracing.mdx index 707ee123ad..6ba196a7ed 100644 --- a/content/200-orm/200-prisma-client/600-observability-and-logging/250-opentelemetry-tracing.mdx +++ b/content/200-orm/200-prisma-client/600-observability-and-logging/250-opentelemetry-tracing.mdx @@ -1,9 +1,7 @@ --- title: 'OpenTelemetry tracing' -metaTitle: 'OpenTelemetry tracing (Preview)' +metaTitle: 'OpenTelemetry tracing' metaDescription: 'Diagnose application performance with detailed traces of each query.' -sidebar_class_name: preview-badge -toc_max_heading_level: 4 --- @@ -80,7 +78,7 @@ This section explains how to install and register tracing in your application. ### Step 1. Install up-to-date Prisma ORM dependencies -Use version `4.2.0` or later of the `prisma`, `@prisma/client`, and `@prisma/instrumentation` npm packages. +Use version `6.1.0` or later of the `prisma`, `@prisma/client`, and `@prisma/instrumentation` npm packages. ```terminal npm install prisma@latest --save-dev @@ -88,9 +86,10 @@ npm install @prisma/client@latest --save npm install @prisma/instrumentation@latest --save ``` -### Step 2: Enable the feature flag in your Prisma schema file +
+Tracing on previous versions of Prisma ORM -In the `generator` block of your `schema.prisma` file, enable the `tracing` feature flag: +Tracing was added in version `4.2.0` of Prisma ORM as a Preview feature. For versions of Prisma ORM between `4.2.0` and `6.1.0`, you need to enable the `tracing` Preview feature in your Prisma schema file. ```prisma generator client { @@ -99,15 +98,17 @@ generator client { } ``` -### Step 3: Install OpenTelemetry packages +
-Finally, install the appropriate OpenTelemetry packages, as follows: +### Step 2: Install OpenTelemetry packages + +Now install the appropriate OpenTelemetry packages, as follows: ```console npm install @opentelemetry/semantic-conventions @opentelemetry/exporter-trace-otlp-http @opentelemetry/instrumentation @opentelemetry/sdk-trace-base @opentelemetry/sdk-trace-node @opentelemetry/resources ``` -### Register tracing in your application +### Step 3: Register tracing in your application The following code provides two examples of configuring OpenTelemetry tracing in Prisma: @@ -308,7 +309,6 @@ As an example, take the following Prisma schema: ```prisma file=schema.prisma showLineNumbers generator client { provider = "prisma-client-js" - previewFeatures = ["tracing", "interactiveTransactions"] } datasource db { diff --git a/content/200-orm/500-reference/500-preview-features/050-client-preview-features.mdx b/content/200-orm/500-reference/500-preview-features/050-client-preview-features.mdx index ffbd2a3c44..bde9a0ac5e 100644 --- a/content/200-orm/500-reference/500-preview-features/050-client-preview-features.mdx +++ b/content/200-orm/500-reference/500-preview-features/050-client-preview-features.mdx @@ -66,6 +66,7 @@ In the list below, you can find a history of Prisma Client and Prisma schema fea | [`fieldReference`](/orm/reference/prisma-client-reference#compare-columns-in-the-same-table) | [4.3.0](https://github.com/prisma/prisma/releases/tag/4.3.0) | [5.0.0](https://github.com/prisma/prisma/releases/tag/5.0.0) | | [`clientExtensions`](/orm/prisma-client/client-extensions) | [4.7.0](https://github.com/prisma/prisma/releases/tag/4.7.0) | [4.16.0](https://github.com/prisma/prisma/releases/tag/4.16.0) | | [`filteredRelationCount`](/orm/prisma-client/queries/aggregation-grouping-summarizing#filter-the-relation-count) | [4.3.0](https://github.com/prisma/prisma/releases/tag/4.3.0) | [4.16.0](https://github.com/prisma/prisma/releases/tag/4.16.0) | +| [`tracing`](/orm/prisma-client/observability-and-logging/opentelemetry-tracing) | [4.2.0](https://github.com/prisma/prisma/releases/tag/4.2.0) | [6.1.0](https://github.com/prisma/prisma/releases/tag/6.1.0) | [`orderByNulls`](/orm/prisma-client/queries/filtering-and-sorting#sort-with-null-records-first-or-last) | [4.1.0](https://github.com/prisma/prisma/releases/tag/4.1.0) | [4.16.0](https://github.com/prisma/prisma/releases/tag/4.16.0) | | [`referentialIntegrity`](/orm/prisma-schema/data-model/relations/relation-mode) | [3.1.1](https://github.com/prisma/prisma/releases/tag/3.1.1) | [4.7.0](https://github.com/prisma/prisma/releases/tag/4.7.0) | | [`interactiveTransactions`](/orm/prisma-client/queries/transactions#interactive-transactions) | [2.29.0](https://github.com/prisma/prisma/releases/tag/2.29.0) | | diff --git a/content/700-optimize/200-getting-started.mdx b/content/700-optimize/200-getting-started.mdx index 4ed7412029..14b8925720 100644 --- a/content/700-optimize/200-getting-started.mdx +++ b/content/700-optimize/200-getting-started.mdx @@ -27,9 +27,18 @@ Prisma Optimize is intended for use in local environments. Learn more in the [FA ## 2. Add Optimize to your application -### 2.1. Update Your `schema.prisma` file +### 2.1. Install the Optimize Prisma Client extension -In the `generator` block of your Prisma schema, add the `tracing` preview feature: +Install the latest versions of Prisma Client and the Optimize extension: + +```bash +npm install @prisma/client@latest @prisma/extension-optimize +``` + +
+Enabling tracing in older versions of Prisma ORM + +For versions of Prisma ORM between `4.2.0` and `6.1.0`, you need to enable the `tracing` preview feature in your Prisma schema file. ```prisma generator client { @@ -38,21 +47,9 @@ generator client { } ``` -Then, generate the Prisma Client: - -```bash -npx prisma generate -``` - -### 2.2. Install the Optimize Prisma Client extension - -Install the latest versions of Prisma Client and the Optimize extension: - -```bash -npm install @prisma/client@latest @prisma/extension-optimize -``` +
-### 2.3. Add the Optimize API Key to your `.env` file +### 2.2. Add the Optimize API Key to your `.env` file Generate a Prisma Optimize API key and add it to your `.env` file: @@ -60,7 +57,7 @@ npm install @prisma/client@latest @prisma/extension-optimize OPTIMIZE_API_KEY="YOUR_OPTIMIZE_API_KEY" ``` -### 2.4. Extend your Prisma Client instance +### 2.3. Extend your Prisma Client instance Extend your existing Prisma Client instance with the Optimize extension: