@instana/core - npm Package Compare versions

Comparing version 3.4.0 to 3.5.0

CHANGELOG.md

@@ -6,2 +6,8 @@ # Change Log
 
+# [3.5.0](https://github.com/instana/nodejs/compare/v3.4.0...v3.5.0) (2024-04-24)
+
+### Features
+
+- added support for prisma v5 ([#1114](https://github.com/instana/nodejs/issues/1114)) ([7cf8d90](https://github.com/instana/nodejs/commit/7cf8d90bd57b06110ea49e567be9f8a4d860b5a5))
+
 # [3.4.0](https://github.com/instana/nodejs/compare/v3.3.1...v3.4.0) (2024-04-16)
@@ -8,0 +14,0 @@

package.json

 {
   "name": "@instana/core",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "description": "Core library for Instana's Node.js packages",
@@ -73,3 +73,3 @@ "main": "src/index.js",
   },
-  "gitHead": "840c806f491830272eadacc4aeb26a41e63b9c5e"
+  "gitHead": "742e4f6e7e7fc1c96b0ff718c5b6ab90e8a759d0"
 }

src/tracing/instrumentation/database/prisma.js

@@ -39,2 +39,9 @@ /*
 
+        // NOTE: Getting the url between 4.10 and 5.1 is not possible.
+        //       Prisma did not backport the fix in 5.2
+        //       https://github.com/prisma/prisma/compare/5.1.0...5.2.0
+        // Works with @prisma/client < 4.10
+        // In 4.10 `getConfig` got removed.
+        // https://github.com/prisma/prisma/commit/30ebd6a21b180cea10320228e0392f2a5de670b6
+
         // Unfortunately, resolving the configuration is an asynchronous operation.
@@ -74,10 +81,26 @@ // If the first model access happens in the same event loop iteration as creating the client, the span for that
           } else {
-            logger.debug(
-              'The operation getConfig did not yield a thenable, the database URL will not be captured on spans.'
-            );
+            logger.debug('[Instana] Cannot read engine config. Database url & provider will not be captured on spans.');
           }
+        } else if (this._engineConfig) {
+          // works for > 5.1
+          const provider = this._engineConfig.activeProvider;
+          let dataSourceUrl = '';
+
+          try {
+            const envVarName = this._engineConfig.inlineDatasources.db.url.fromEnvVar;
+            dataSourceUrl = redactPassword(provider, process.env[envVarName]);
+          } catch (err) {
+            logger.debug('[Instana] Cannot read engine config. Database url will not be captured on spans.');
+          }
+
+          try {
+            providerAndDataSourceUriMap.set(this._engine, {
+              provider,
+              dataSourceUrl
+            });
+          } catch (err) {
+            logger.debug('[Instana] Cannot read engine config. Database url & provider will not be captured on spans.');
+          }
         } else {
-          logger.debug(
-            'PrismaClient#_engine.getConfig does not exist, the database URL will not be captured on spans.'
-          );
+          logger.debug('[Instana] Cannot read engine config. Database url & provider will not be captured on spans.');
         }
@@ -84,0 +107,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

768681

increased by0.18%

Lines of code

19798

increased by0.1%

Worsened metrics

Number of low supply chain risk alerts

47

increased by2.17%

No dependency changes