From 7da113f3779aba5b497fc0089bf7b44b19388e98 Mon Sep 17 00:00:00 2001 From: James Sumners Date: Thu, 13 Feb 2025 08:28:07 -0500 Subject: [PATCH] address feedback --- lib/otel/segments/consumer.js | 5 ++--- test/versioned/otel-bridge/span.test.js | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/otel/segments/consumer.js b/lib/otel/segments/consumer.js index 076dc6b03f..592f4d736d 100644 --- a/lib/otel/segments/consumer.js +++ b/lib/otel/segments/consumer.js @@ -29,7 +29,7 @@ function createConsumerSegment(agent, otelSpan) { const system = otelSpan.attributes[ATTR_MESSAGING_SYSTEM] ?? 'unknown' const destination = otelSpan.attributes[ATTR_MESSAGING_DESTINATION] ?? 'unknown' const destKind = otelSpan.attributes[ATTR_MESSAGING_DESTINATION_KIND] ?? 'unknown' - const segmentName = `OtherTransaction/Message/${system}/${destKind}/Named/${destination}` + const segmentName = `${system}/${destKind}/Named/${destination}` const txAttrs = transaction.trace.attributes txAttrs.addAttribute(DESTINATIONS.TRANS_SCOPE, 'message.queueName', destination) @@ -39,11 +39,10 @@ function createConsumerSegment(agent, otelSpan) { // // ) transaction.setPartialName(segmentName) - transaction.finalizeName() const segment = agent.tracer.createSegment({ recorder, - name: segmentName, + name: transaction.getFullName(), parent: transaction.trace.root, transaction }) diff --git a/test/versioned/otel-bridge/span.test.js b/test/versioned/otel-bridge/span.test.js index a8ba0b5968..7b8c021f29 100644 --- a/test/versioned/otel-bridge/span.test.js +++ b/test/versioned/otel-bridge/span.test.js @@ -409,21 +409,20 @@ test('messaging consumer metrics are bridged correctly', (t, end) => { tracer.startActiveSpan('consumer-test', { kind: otel.SpanKind.CONSUMER, attributes }, (span) => { const tx = agent.getTransaction() const segment = agent.tracer.getSegment() - assert.equal(segment.name, 'OtherTransaction/Message/kafka/queue/Named/work-queue') span.end() const duration = hrTimeToMilliseconds(span.duration) assert.equal(duration, segment.getDurationInMillis()) tx.end() + assert.equal(segment.name, 'OtherTransaction/Message/kafka/queue/Named/work-queue') assert.equal(tx.type, 'message') const unscopedMetrics = tx.metrics.unscoped const expectedMetrics = [ 'OtherTransaction/all', 'OtherTransaction/Message/all', - 'OtherTransaction/Message/OtherTransaction/Message/kafka/queue/Named/work-queue', - 'OtherTransactionTotalTime', - 'OtherTransactionTotalTime/Message/OtherTransaction/Message/kafka/queue/Named/work-queue' + 'OtherTransaction/Message/kafka/queue/Named/work-queue', + 'OtherTransactionTotalTime' ] for (const expectedMetric of expectedMetrics) { assert.equal(unscopedMetrics[expectedMetric].callCount, 1, `${expectedMetric}.callCount`)