feat: Added compact type for partial granularity traces. (#3608)

Author: bizob2828

lib/metrics/names.js

@@ -294,18 +294,23 @@ const DISTRIBUTED_TRACE = {
   TRANSPORT: 'TransportDuration'
 }
 
-const SPAN_EVENT_PREFIX = 'SpanEvent/'
+const PARTIAL_GRANULARITY = '/PartialGranularity'
+const DISTRIBUTED_TRACING = 'DistributedTrace'
 
-const PARTIAL_GRANULARITY = 'DistributedTrace/PartialGranularity'
+const PARTIAL_TRACE = {
+  PREFIX: SUPPORTABILITY.NODEJS + PARTIAL_GRANULARITY,
+  SPAN_PREFIX: SUPPORTABILITY.PREFIX + DISTRIBUTED_TRACING + PARTIAL_GRANULARITY,
+  INSTRUMENTED: '/Span/Instrumented',
+  KEPT: '/Span/Kept',
+  DROPPED: SUPPORTABILITY.NODEJS + PARTIAL_GRANULARITY + '/NrIds/Dropped'
+}
 
+const SPAN_EVENT_PREFIX = 'SpanEvent/'
 const SPAN_EVENTS = {
   SEEN: SUPPORTABILITY.PREFIX + SPAN_EVENT_PREFIX + 'TotalEventsSeen',
   SENT: SUPPORTABILITY.PREFIX + SPAN_EVENT_PREFIX + 'TotalEventsSent',
   DROPPED: SUPPORTABILITY.PREFIX + SPAN_EVENT_PREFIX + 'Discarded',
-  LIMIT: SUPPORTABILITY.PREFIX + SPAN_EVENT_PREFIX + 'Limit',
-  PARTIAL_PREFIX: SUPPORTABILITY.PREFIX + PARTIAL_GRANULARITY,
-  KEPT: '/Span/Kept',
-  INSTRUMENTED: '/Span/Instrumented',
+  LIMIT: SUPPORTABILITY.PREFIX + SPAN_EVENT_PREFIX + 'Limit'
 }
 
 const INFINITE_TRACING = {
@@ -408,6 +413,7 @@ module.exports = {
   NODEJS,
   NORMALIZED: 'NormalizedUri',
   OTHER_TRANSACTION,
+  PARTIAL_TRACE,
   POSTGRES,
   PRISMA,
   QUEUETIME: 'WebFrontend/QueueTime',

lib/spans/helpers.js

@@ -60,23 +60,10 @@ function addSpanKind({ segment, span }) {
   }
 }
 
-/**
- * Checks if the segment is an entry point.
- * An entry point span is defined as the base segment of a transaction.
- * @param {object} params to function
- * @param {Transaction} params.transaction active transaction
- * @param {TraceSegment} params.segment segment that is creating span
- * @returns {boolean} true if the segment is an entry point span
- */
-function isEntryPoint({ transaction, segment }) {
-  return transaction?.baseSegment === segment
-}
-
 module.exports = {
   HTTP_LIBRARY,
   CATEGORIES,
   SPAN_KIND,
   REGEXS,
-  addSpanKind,
-  isEntryPoint
+  addSpanKind
 }

lib/spans/span-event-aggregator.js

@@ -84,8 +84,9 @@ class SpanEventAggregator extends EventAggregator {
    * @param {Transaction} params.transaction active transaction
    * @param {string} [params.parentId] GUID of the parent span.
    * @param {boolean} params.isRoot if segment is root segment
+   * @param {boolean} params.isEntry if segment is entry point
    */
-  addSegment({ segment, transaction, parentId, isRoot }) {
+  addSegment({ segment, transaction, parentId, isRoot, isEntry }) {
     // Check if the priority would be accepted before creating the event object.
 
     if (transaction.priority < this._items.getMinimumPriority()) {
@@ -95,19 +96,11 @@ class SpanEventAggregator extends EventAggregator {
       return false
     }
 
-    const span = SpanEvent.fromSegment({ segment, transaction, parentId, isRoot })
+    const span = SpanEvent.fromSegment({ segment, transaction, parentId, isRoot, isEntry })
 
     // Do not add span to aggregator if it is part of a partial trace
-    // We need to reparent spans or in the case of `compact`, associate
-    // all exit spans dropped to the same entity as `nr.ids` and `nr.durations`
-    if (transaction.partialType) {
-      const prefix = `${this._metricNames.PARTIAL_PREFIX}/${transaction.partialType}`
-      this._metrics.getOrCreateMetric(prefix).incrementCallCount()
-      this._metrics.getOrCreateMetric(`${prefix}${this._metricNames.INSTRUMENTED}`).incrementCallCount()
-      transaction.trace.addSpan({ span, id: segment.id, parentId })
-      if (span) {
-        this._metrics.getOrCreateMetric(`${prefix}${this._metricNames.KEPT}`).incrementCallCount()
-      }
+    if (transaction.partialTrace) {
+      transaction.partialTrace.addSpan({ span, isEntry })
     } else if (span) {
       this.add(span, transaction.priority)
     }