diff --git a/plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts index 5b7086895d..e415e59f38 100644 --- a/plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-knex/src/instrumentation.ts @@ -25,18 +25,20 @@ import { isWrapped, } from '@opentelemetry/instrumentation'; import { - SEMATTRS_DB_NAME, - SEMATTRS_DB_OPERATION, - SEMATTRS_DB_SQL_TABLE, - SEMATTRS_DB_STATEMENT, - SEMATTRS_DB_SYSTEM, - SEMATTRS_DB_USER, - SEMATTRS_NET_PEER_NAME, - SEMATTRS_NET_PEER_PORT, - SEMATTRS_NET_TRANSPORT, -} from '@opentelemetry/semantic-conventions'; + ATTR_DB_COLLECTION_NAME, + ATTR_DB_NAMESPACE, + ATTR_DB_OPERATION_NAME, + ATTR_DB_QUERY_TEXT, + ATTR_DB_SYSTEM, + ATTR_DB_USER, +} from './semconv'; import * as utils from './utils'; import { KnexInstrumentationConfig } from './types'; +import { + ATTR_NETWORK_TRANSPORT, + ATTR_SERVER_ADDRESS, + ATTR_SERVER_PORT, +} from '@opentelemetry/semantic-conventions'; const contextSymbol = Symbol('opentelemetry.instrumentation-knex.context'); const DEFAULT_CONFIG: KnexInstrumentationConfig = { @@ -134,21 +136,21 @@ export class KnexInstrumentation extends InstrumentationBase { await client.raw(statement); const [span] = memoryExporter.getFinishedSpans(); - const limitedStatement = span?.attributes?.['db.statement'] as string; + const limitedStatement = span?.attributes?.['db.query.text'] as string; assert.strictEqual(limitedStatement.length, 52); assert.ok(statement.startsWith(limitedStatement.substring(0, 50))); }); @@ -614,15 +614,15 @@ const assertSpans = ( span.attributes['db.system'], customAssertOptions.dbSystem ); - assert.strictEqual(span.attributes['db.name'], ':memory:'); - assert.strictEqual(span.attributes['db.sql.table'], expected.table); - assert.strictEqual(span.attributes['db.statement'], expected.statement); + assert.strictEqual(span.attributes['db.namespace'], ':memory:'); + assert.strictEqual(span.attributes['db.collection.name'], expected.table); + assert.strictEqual(span.attributes['db.query.text'], expected.statement); assert.strictEqual( typeof span.attributes['knex.version'], 'string', 'knex.version not specified' ); - assert.strictEqual(span.attributes['db.operation'], expected.op); + assert.strictEqual(span.attributes['db.operation.name'], expected.op); assert.strictEqual( span.parentSpanId, expected.parentSpan?.spanContext().spanId