clean up integration

Author: AbhiPrasad

packages/node/src/integrations/tracing/index.ts

@@ -8,7 +8,6 @@ import { fastifyIntegration, instrumentFastify } from './fastify';
 import { genericPoolIntegration, instrumentGenericPool } from './genericPool';
 import { graphqlIntegration, instrumentGraphql } from './graphql';
 import { hapiIntegration, instrumentHapi } from './hapi';
-import { instrumentKnex, knexIntegration } from './knex';
 import { instrumentKafka, kafkaIntegration } from './kafka';
 import { instrumentKoa, koaIntegration } from './koa';
 import { instrumentLruMemoizer, lruMemoizerIntegration } from './lrumemoizer';

packages/node/src/integrations/tracing/knex.ts

@@ -19,12 +19,11 @@ const _knexIntegration = (() => {
 
     setup(client) {
       client.on('spanStart', span => {
-        const spanJSON = spanToJSON(span);
-        const spanData = spanJSON.data;
-
-        if (spanData && 'knex.version' in spanData) {
+        const { data } = spanToJSON(span);
+        // knex.version is always set in the span data
+        // https://github.com/open-telemetry/opentelemetry-js-contrib/blob/0309caeafc44ac9cb13a3345b790b01b76d0497d/plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts#L138
+        if (data && 'knex.version' in data) {
           span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.db.otel.knex');
-          span.setAttribute('db.system', 'knex');
         }
       });
     },
@@ -34,6 +33,15 @@ const _knexIntegration = (() => {
 /**
  * Knex integration
  *
- * Capture tracing data for Knex.
+ * Capture tracing data for [Knex](https://knexjs.org/).
+ *
+ * @example
+ * ```javascript
+ * import * as Sentry from '@sentry/node';
+ *
+ * Sentry.init({
+ *  integrations: [Sentry.knexIntegration()],
+ * });
+ * ```
  */
 export const knexIntegration = defineIntegration(_knexIntegration);