dd-trace 5.61.0 → 5.62.0

package/packages/datadog-plugin-prisma/src/index.js

@@ -6,7 +6,7 @@ const PrismaClientPlugin = require('./client')
 const PrismaEnginePlugin = require('./engine')
 
 class PrismaPlugin extends CompositePlugin {
-  static get id () { return 'prisma' }
+  static id = 'prisma'
   static get plugins () {
     return {
       client: PrismaClientPlugin,

package/packages/datadog-plugin-protobufjs/src/index.js

@@ -4,13 +4,9 @@ const SchemaPlugin = require('../../dd-trace/src/plugins/schema')
 const SchemaExtractor = require('./schema_iterator')
 
 class ProtobufjsPlugin extends SchemaPlugin {
-  static get id () {
-    return 'protobufjs'
-  }
+  static id = 'protobufjs'
 
-  static get schemaExtractor () {
-    return SchemaExtractor
-  }
+  static schemaExtractor = SchemaExtractor
 }
 
 module.exports = ProtobufjsPlugin

package/packages/datadog-plugin-redis/src/index.js

@@ -5,8 +5,8 @@ const CachePlugin = require('../../dd-trace/src/plugins/cache')
 const urlFilter = require('../../dd-trace/src/plugins/util/urlfilter')
 
 class RedisPlugin extends CachePlugin {
-  static get id () { return 'redis' }
-  static get system () { return 'redis' }
+  static id = 'redis'
+  static system = 'redis'
 
   constructor (...args) {
     super(...args)

package/packages/datadog-plugin-restify/src/index.js

@@ -4,9 +4,7 @@ const RouterPlugin = require('../../datadog-plugin-router/src')
 const web = require('../../dd-trace/src/plugins/util/web')
 
 class RestifyPlugin extends RouterPlugin {
-  static get id () {
-    return 'restify'
-  }
+  static id = 'restify'
 
   constructor (...args) {
     super(...args)

package/packages/datadog-plugin-rhea/src/consumer.js

@@ -4,7 +4,7 @@ const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
 const { getAmqpMessageSize } = require('../../dd-trace/src/datastreams')
 
 class RheaConsumerPlugin extends ConsumerPlugin {
-  static get id () { return 'rhea' }
+  static id = 'rhea'
 
   constructor (...args) {
     super(...args)

package/packages/datadog-plugin-rhea/src/index.js

@@ -5,7 +5,7 @@ const ConsumerPlugin = require('./consumer')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class RheaPlugin extends CompositePlugin {
-  static get id () { return 'rhea' }
+  static id = 'rhea'
   static get plugins () {
     return {
       producer: ProducerPlugin,

package/packages/datadog-plugin-rhea/src/producer.js

@@ -5,8 +5,8 @@ const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 const { getAmqpMessageSize, DsmPathwayCodec } = require('../../dd-trace/src/datastreams')
 
 class RheaProducerPlugin extends ProducerPlugin {
-  static get id () { return 'rhea' }
-  static get operation () { return 'send' }
+  static id = 'rhea'
+  static operation = 'send'
 
   constructor (...args) {
     super(...args)

package/packages/datadog-plugin-router/src/index.js

@@ -7,9 +7,7 @@ const { storage } = require('../../datadog-core')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 
 class RouterPlugin extends WebPlugin {
-  static get id () {
-    return 'router'
-  }
+  static id = 'router'
 
   constructor (...args) {
     super(...args)

package/packages/datadog-plugin-selenium/src/index.js

@@ -27,9 +27,7 @@ function getTestSpanFromTrace (trace) {
 }
 
 class SeleniumPlugin extends CiPlugin {
-  static get id () {
-    return 'selenium'
-  }
+  static id = 'selenium'
 
   constructor (...args) {
     super(...args)

package/packages/datadog-plugin-sharedb/src/index.js

@@ -3,7 +3,7 @@
 const ServerPlugin = require('../../dd-trace/src/plugins/server')
 
 class SharedbPlugin extends ServerPlugin {
-  static get id () { return 'sharedb' }
+  static id = 'sharedb'
 
   bindStart (ctx) {
     const { actionName, request } = ctx

package/packages/datadog-plugin-tedious/src/index.js

@@ -4,9 +4,9 @@ const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 
 class TediousPlugin extends DatabasePlugin {
-  static get id () { return 'tedious' }
-  static get operation () { return 'request' } // TODO: change to match other database plugins
-  static get system () { return 'mssql' }
+  static id = 'tedious'
+  static operation = 'request' // TODO: change to match other database plugins
+  static system = 'mssql'
 
   bindStart (ctx) {
     const service = this.serviceName({ pluginConfig: this.config, system: this.system })

package/packages/datadog-plugin-undici/src/index.js

@@ -3,10 +3,8 @@
 const FetchPlugin = require('../../datadog-plugin-fetch/src/index.js')
 
 class UndiciPlugin extends FetchPlugin {
-  static get id () { return 'undici' }
-  static get prefix () {
-    return 'tracing:apm:undici:fetch'
-  }
+  static id = 'undici'
+  static prefix = 'tracing:apm:undici:fetch'
 }
 
 module.exports = UndiciPlugin

package/packages/datadog-plugin-vitest/src/index.js

@@ -47,9 +47,7 @@ const { DD_MAJOR } = require('../../../version')
 const MILLISECONDS_TO_SUBTRACT_FROM_FAILED_TEST_DURATION = 5
 
 class VitestPlugin extends CiPlugin {
-  static get id () {
-    return 'vitest'
-  }
+  static id = 'vitest'
 
   constructor (...args) {
     super(...args)

package/packages/datadog-plugin-web/src/index.js

@@ -4,9 +4,7 @@ const Plugin = require('../../dd-trace/src/plugins/plugin')
 const web = require('../../dd-trace/src/plugins/util/web')
 
 class WebPlugin extends Plugin {
-  static get id () {
-    return 'web'
-  }
+  static id = 'web'
 
   configure (config) {
     return super.configure(web.normalizeConfig(config))

package/packages/datadog-plugin-winston/src/index.js

@@ -1,10 +1,8 @@
 'use strict'
 
-const StructuredLogPlugin = require('../../dd-trace/src/plugins/structured_log_plugin')
+const LogPlugin = require('../../dd-trace/src/plugins/log_plugin')
 
-class WinstonPlugin extends StructuredLogPlugin {
-  static get id () {
-    return 'winston'
-  }
+class WinstonPlugin extends LogPlugin {
+  static id = 'winston'
 }
 module.exports = WinstonPlugin

package/packages/dd-trace/src/appsec/channels.js

@@ -5,6 +5,7 @@ const dc = require('dc-polyfill')
 // TODO: use TBD naming convention
 module.exports = {
   apolloChannel: dc.tracingChannel('datadog:apollo:request'),
+  apolloHttpServerChannel: dc.tracingChannel('datadog:apollo:httpserver'),
   apolloServerCoreChannel: dc.tracingChannel('datadog:apollo-server-core:request'),
   bodyParser: dc.channel('datadog:body-parser:read:finish'),
   childProcessExecutionTracingChannel: dc.tracingChannel('datadog:child_process:execution'),

package/packages/dd-trace/src/appsec/graphql.js

@@ -14,6 +14,7 @@ const web = require('../plugins/util/web')
 const {
   startGraphqlResolve,
   graphqlMiddlewareChannel,
+  apolloHttpServerChannel,
   apolloChannel,
   apolloServerCoreChannel
 } = require('./channels')
@@ -55,7 +56,6 @@ function enterInApolloMiddleware (data) {
   if (!req) return
 
   graphqlRequestData.set(req, {
-    inApolloMiddleware: true,
     blocked: false
   })
 }
@@ -70,17 +70,13 @@ function enterInApolloServerCoreRequest () {
   })
 }
 
-function exitFromApolloMiddleware (data) {
-  const req = data?.req || storage('legacy').getStore()?.req
-  const requestData = graphqlRequestData.get(req)
-  if (requestData) requestData.inApolloMiddleware = false
-}
-
 function enterInApolloRequest () {
   const req = storage('legacy').getStore()?.req
 
   const requestData = graphqlRequestData.get(req)
-  if (requestData?.inApolloMiddleware) {
+  if (requestData) {
+    // Set isInGraphqlRequest=true since this function only runs for GraphQL requests
+    // This works for both Apollo v4 (middleware) and v5 (HTTP server) contexts
     requestData.isInGraphqlRequest = true
     addSpecificEndpoint(req.method, req.originalUrl || req.url, specificBlockingTypes.GRAPHQL)
   }
@@ -118,8 +114,7 @@ function beforeWriteApolloGraphqlResponse ({ abortController, abortData }) {
 
 function enableApollo () {
   graphqlMiddlewareChannel.subscribe({
-    start: enterInApolloMiddleware,
-    end: exitFromApolloMiddleware
+    start: enterInApolloMiddleware
   })
 
   apolloServerCoreChannel.subscribe({
@@ -131,12 +126,15 @@ function enableApollo () {
     start: enterInApolloRequest,
     asyncEnd: beforeWriteApolloGraphqlResponse
   })
+
+  apolloHttpServerChannel.subscribe({
+    start: enterInApolloMiddleware
+  })
 }
 
 function disableApollo () {
   graphqlMiddlewareChannel.unsubscribe({
-    start: enterInApolloMiddleware,
-    end: exitFromApolloMiddleware
+    start: enterInApolloMiddleware
   })
 
   apolloServerCoreChannel.unsubscribe({
@@ -148,6 +146,10 @@ function disableApollo () {
     start: enterInApolloRequest,
     asyncEnd: beforeWriteApolloGraphqlResponse
   })
+
+  apolloHttpServerChannel.unsubscribe({
+    start: enterInApolloMiddleware
+  })
 }
 
 function enableGraphql () {

package/packages/dd-trace/src/appsec/iast/taint-tracking/plugin.js

@@ -180,7 +180,7 @@ class TaintTrackingPlugin extends SourceIastPlugin {
       { channelName: 'apm:graphql:resolve:start', tag: HTTP_REQUEST_BODY },
       (data) => {
         const iastContext = getIastContext(storage('legacy').getStore())
-        const source = data.context?.source
+        const source = data.rootCtx?.source
         const ranges = source && getRanges(iastContext, source)
         if (ranges?.length) {
           this._taintTrackingHandler(ranges[0].iinfo.type, data.args, null, iastContext)

package/packages/dd-trace/src/appsec/waf/waf_manager.js

@@ -7,7 +7,7 @@ const WAFContextWrapper = require('./waf_context_wrapper')
 const contexts = new WeakMap()
 
 class WAFManager {
-  static get defaultWafConfigPath () { return 'datadog/00/ASM_DD/default/config' }
+  static defaultWafConfigPath = 'datadog/00/ASM_DD/default/config'
 
   constructor (rules, config) {
     this.config = config

package/packages/dd-trace/src/ci-visibility/log-submission/log-submission-plugin.js

@@ -36,9 +36,7 @@ function getWinstonLogSubmissionParameters (config) {
 }
 
 class LogSubmissionPlugin extends Plugin {
-  static get id () {
-    return 'log-submission'
-  }
+  static id = 'log-submission'
 
   constructor (...args) {
     super(...args)

package/packages/dd-trace/src/ci-visibility/test-api-manual/test-api-manual-plugin.js

@@ -9,9 +9,7 @@ const {
 const { storage } = require('../../../../datadog-core')
 
 class TestApiManualPlugin extends CiPlugin {
-  static get id () {
-    return 'test-api-manual'
-  }
+  static id = 'test-api-manual'
 
   constructor (...args) {
     super(...args)

package/packages/dd-trace/src/config.js

@@ -571,7 +571,7 @@ class Config {
     defaults.testManagementAttemptToFixRetries = 20
     defaults.isTestManagementEnabled = false
     defaults.isImpactedTestsEnabled = false
-    defaults.logInjection = 'structured'
+    defaults.logInjection = true
     defaults.lookup = undefined
     defaults.inferredProxyServicesEnabled = false
     defaults.memcachedCommandEnabled = false

package/packages/dd-trace/src/datastreams/checkpointer.js

@@ -9,6 +9,12 @@ class DataStreamsCheckpointer {
     this.dsmProcessor = tracer._dataStreamsProcessor
   }
 
+  /**
+   * @param {string} type - The type of the checkpoint, usually the streaming technology being used.
+   *                       Examples include kafka, kinesis, sns etc.
+   * @param {string} target - The target of data. This can be a topic, exchange or stream name.
+   * @param {Object} carrier - The carrier object to inject context into.
+   */
   setProduceCheckpoint (type, target, carrier) {
     if (!this.config.dsmEnabled) return
 
@@ -23,14 +29,29 @@ class DataStreamsCheckpointer {
     this.tracer.inject(ctx, 'text_map_dsm', carrier)
   }
 
-  setConsumeCheckpoint (type, source, carrier) {
+  /**
+   * @param {string} type - The type of the checkpoint, usually the streaming technology being used.
+   *                       Examples include kafka, kinesis, sns etc.
+   * @param {string} source - The source of data. This can be a topic, exchange or stream name.
+   * @param {Object} carrier - The carrier object to extract context from.
+   * @param {boolean} [manualCheckpoint=true] - Whether this checkpoint was manually set. Keep true if manually
+   *                                           instrumenting. Manual instrumentation always overrides automatic
+   *                                           instrumentation in the case a call is both manually and automatically
+   *                                           instrumented.
+   */
+  setConsumeCheckpoint (type, source, carrier, manualCheckpoint = true) {
     if (!this.config.dsmEnabled) return
 
     const parentCtx = this.tracer.extract('text_map_dsm', carrier)
     DataStreamsContext.setDataStreamsContext(parentCtx)
 
+    const tags = ['type:' + type, 'topic:' + source, 'direction:in']
+    if (manualCheckpoint) {
+      tags.push('manual_checkpoint:true')
+    }
+
     const ctx = this.dsmProcessor.setCheckpoint(
-      ['type:' + type, 'topic:' + source, 'direction:in', 'manual_checkpoint:true'],
+      tags,
       null,
       parentCtx,
       null

package/packages/dd-trace/src/datastreams/processor.js

@@ -17,8 +17,9 @@ const ENTRY_PARENT_HASH = Buffer.from('0000000000000000', 'hex')
 
 class StatsPoint {
   constructor (hash, parentHash, edgeTags) {
-    this.hash = hash.readBigUInt64BE()
-    this.parentHash = parentHash.readBigUInt64BE()
+    this.hash = hash.readBigUInt64LE()
+    this.parentHash = parentHash.readBigUInt64LE()
+
     this.edgeTags = edgeTags
     this.edgeLatency = new LogCollapsingLowestDenseDDSketch()
     this.pathwayLatency = new LogCollapsingLowestDenseDDSketch()
@@ -191,7 +192,7 @@ class DataStreamsProcessor {
       .addLatencies(checkpoint)
     // set DSM pathway hash on span to enable related traces feature on DSM tab, convert from buffer to uint64
     if (span) {
-      span.setTag(PATHWAY_HASH, checkpoint.hash.readBigUInt64BE(0).toString())
+      span.setTag(PATHWAY_HASH, checkpoint.hash.readBigUInt64LE(0).toString())
     }
   }
 

package/packages/dd-trace/src/llmobs/plugins/langchain/index.js

@@ -25,11 +25,9 @@ const ToolHandler = require('./handlers/tool')
 const VectorStoreHandler = require('./handlers/vectorstore')
 
 class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
-  static get integration () { return 'langchain' }
-  static get id () { return 'langchain' }
-  static get prefix () {
-    return 'tracing:apm:langchain:invoke'
-  }
+  static integration = 'langchain'
+  static id = 'langchain'
+  static prefix = 'tracing:apm:langchain:invoke'
 
   constructor () {
     super(...arguments)
@@ -150,75 +148,57 @@ class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
 }
 
 class RunnableSequenceInvokePlugin extends BaseLangChainLLMObsPlugin {
-  static get id () { return 'llmobs_langchain_rs_invoke' }
-  static get lcType () { return 'chain' }
-  static get prefix () {
-    return 'tracing:orchestrion:@langchain/core:RunnableSequence_invoke'
-  }
+  static id = 'llmobs_langchain_rs_invoke'
+  static lcType = 'chain'
+  static prefix = 'tracing:orchestrion:@langchain/core:RunnableSequence_invoke'
 }
 
 class RunnableSequenceBatchPlugin extends BaseLangChainLLMObsPlugin {
-  static get id () { return 'llmobs_langchain_rs_batch' }
-  static get lcType () { return 'chain' }
-  static get prefix () {
-    return 'tracing:orchestrion:@langchain/core:RunnableSequence_batch'
-  }
+  static id = 'llmobs_langchain_rs_batch'
+  static lcType = 'chain'
+  static prefix = 'tracing:orchestrion:@langchain/core:RunnableSequence_batch'
 }
 
 class BaseChatModelGeneratePlugin extends BaseLangChainLLMObsPlugin {
-  static get id () { return 'llmobs_langchain_chat_model_generate' }
-  static get lcType () { return 'chat_model' }
-  static get prefix () {
-    return 'tracing:orchestrion:@langchain/core:BaseChatModel_generate'
-  }
+  static id = 'llmobs_langchain_chat_model_generate'
+  static lcType = 'chat_model'
+  static prefix = 'tracing:orchestrion:@langchain/core:BaseChatModel_generate'
 }
 
 class BaseLLMGeneratePlugin extends BaseLangChainLLMObsPlugin {
-  static get id () { return 'llmobs_langchain_llm_generate' }
-  static get lcType () { return 'llm' }
-  static get prefix () {
-    return 'tracing:orchestrion:@langchain/core:BaseLLM_generate'
-  }
+  static id = 'llmobs_langchain_llm_generate'
+  static lcType = 'llm'
+  static prefix = 'tracing:orchestrion:@langchain/core:BaseLLM_generate'
 }
 
 class EmbeddingsEmbedQueryPlugin extends BaseLangChainLLMObsPlugin {
-  static get id () { return 'llmobs_langchain_embeddings_embed_query' }
-  static get lcType () { return 'embedding' }
-  static get prefix () {
-    return 'tracing:apm:@langchain/core:Embeddings_embedQuery'
-  }
+  static id = 'llmobs_langchain_embeddings_embed_query'
+  static lcType = 'embedding'
+  static prefix = 'tracing:apm:@langchain/core:Embeddings_embedQuery'
 }
 
 class EmbeddingsEmbedDocumentsPlugin extends BaseLangChainLLMObsPlugin {
-  static get id () { return 'llmobs_langchain_embeddings_embed_documents' }
-  static get lcType () { return 'embedding' }
-  static get prefix () {
-    return 'tracing:apm:@langchain/core:Embeddings_embedDocuments'
-  }
+  static id = 'llmobs_langchain_embeddings_embed_documents'
+  static lcType = 'embedding'
+  static prefix = 'tracing:apm:@langchain/core:Embeddings_embedDocuments'
 }
 
 class ToolInvokePlugin extends BaseLangChainLLMObsPlugin {
-  static get id () { return 'llmobs_langchain_tool_invoke' }
-  static get lcType () { return 'tool' }
-  static get prefix () {
-    return 'tracing:orchestrion:@langchain/core:Tool_invoke'
-  }
+  static id = 'llmobs_langchain_tool_invoke'
+  static lcType = 'tool'
+  static prefix = 'tracing:orchestrion:@langchain/core:Tool_invoke'
 }
 
 class VectorStoreSimilaritySearchPlugin extends BaseLangChainLLMObsPlugin {
-  static get id () { return 'llmobs_langchain_vectorstore_similarity_search' }
-  static get lcType () { return 'similarity_search' }
-  static get prefix () {
-    return 'tracing:orchestrion:@langchain/core:VectorStore_similaritySearch'
-  }
+  static id = 'llmobs_langchain_vectorstore_similarity_search'
+  static lcType = 'similarity_search'
+  static prefix = 'tracing:orchestrion:@langchain/core:VectorStore_similaritySearch'
 }
 
 class VectorStoreSimilaritySearchWithScorePlugin extends BaseLangChainLLMObsPlugin {
-  static get id () { return 'llmobs_langchain_vectorstore_similarity_search_with_score' }
-  static get lcType () { return 'similarity_search' }
-  static get prefix () {
-    return 'tracing:orchestrion:@langchain/core:VectorStore_similaritySearchWithScore'
-  }
+  static id = 'llmobs_langchain_vectorstore_similarity_search_with_score'
+  static lcType = 'similarity_search'
+  static prefix = 'tracing:orchestrion:@langchain/core:VectorStore_similaritySearchWithScore'
 }
 
 module.exports = [

package/packages/dd-trace/src/llmobs/plugins/openai.js

@@ -10,11 +10,9 @@ function isIterable (obj) {
 }
 
 class OpenAiLLMObsPlugin extends LLMObsPlugin {
-  static get id () { return 'openai' }
-  static get integration () { return 'openai' }
-  static get prefix () {
-    return 'tracing:apm:openai:request'
-  }
+  static id = 'openai'
+  static integration = 'openai'
+  static prefix = 'tracing:apm:openai:request'
 
   getLLMObsSpanRegisterOptions (ctx) {
     const resource = ctx.methodName

package/packages/dd-trace/src/llmobs/plugins/vertexai.js

@@ -7,11 +7,9 @@ const {
 } = require('../../../../datadog-plugin-google-cloud-vertexai/src/utils')
 
 class VertexAILLMObsPlugin extends LLMObsPlugin {
-  static get integration () { return 'vertexai' } // used for llmobs telemetry
-  static get id () { return 'vertexai' }
-  static get prefix () {
-    return 'tracing:apm:vertexai:request'
-  }
+  static integration = 'vertexai' // used for llmobs telemetry
+  static id = 'vertexai'
+  static prefix = 'tracing:apm:vertexai:request'
 
   getLLMObsSpanRegisterOptions (ctx) {
     const history = ctx.instance?.historyInternal || []

package/packages/dd-trace/src/opentracing/propagation/text_map.js

@@ -8,9 +8,12 @@ const TraceState = require('./tracestate')
 const tags = require('../../../../../ext/tags')
 const { channel } = require('dc-polyfill')
 const { setBaggageItem, getAllBaggageItems, removeAllBaggageItems } = require('../../baggage')
+const telemetryMetrics = require('../../telemetry/metrics')
 
 const { AUTO_KEEP, AUTO_REJECT, USER_KEEP } = require('../../../../../ext/priority')
 
+const tracerMetrics = telemetryMetrics.manager.namespace('tracers')
+
 const injectCh = channel('dd-trace:span:inject')
 const extractCh = channel('dd-trace:span:extract')
 
@@ -142,12 +145,27 @@ class TextMapPropagator {
         const item = `${this._encodeOtelBaggageKey(String(key).trim())}=${encodeURIComponent(String(value).trim())},`
         itemCounter += 1
         byteCounter += Buffer.byteLength(item)
-        if (itemCounter > this._config.baggageMaxItems || byteCounter > this._config.baggageMaxBytes) break
+
+        // Check for item count limit exceeded
+        if (itemCounter > this._config.baggageMaxItems) {
+          tracerMetrics.count('context_header_style.truncated', ['truncation_reason:baggage_item_count_exceeded']).inc()
+          break
+        }
+
+        // Check for byte count limit exceeded
+        if (byteCounter > this._config.baggageMaxBytes) {
+          tracerMetrics.count('context_header_style.truncated', ['truncation_reason:baggage_byte_count_exceeded']).inc()
+          break
+        }
+
         baggage += item
       }
 
       baggage = baggage.slice(0, -1)
-      if (baggage) carrier.baggage = baggage
+      if (baggage) {
+        carrier.baggage = baggage
+        tracerMetrics.count('context_header_style.injected', ['header_style:baggage']).inc()
+      }
     }
   }
 
@@ -635,6 +653,7 @@ class TextMapPropagator {
       : new Set(this._config.baggageTagKeys.split(','))
     for (const keyValue of baggages) {
       if (!keyValue.includes('=')) {
+        tracerMetrics.count('context_header_style.malformed', ['header_style:baggage']).inc()
         removeAllBaggageItems()
         return
       }
@@ -642,6 +661,7 @@ class TextMapPropagator {
       key = this._decodeOtelBaggageKey(key.trim())
       value = decodeURIComponent(value.trim())
       if (!key || !value) {
+        tracerMetrics.count('context_header_style.malformed', ['header_style:baggage']).inc()
         removeAllBaggageItems()
         return
       }
@@ -650,6 +670,9 @@ class TextMapPropagator {
       }
       setBaggageItem(key, value)
     }
+
+    // Successfully extracted baggage
+    tracerMetrics.count('context_header_style.extracted', ['header_style:baggage']).inc()
   }
 
   _extractSamplingPriority (carrier, spanContext) {

package/packages/dd-trace/src/plugins/apollo.js

@@ -4,9 +4,9 @@ const TracingPlugin = require('./tracing')
 const { storage } = require('../../../datadog-core')
 
 class ApolloBasePlugin extends TracingPlugin {
-  static get id () { return 'apollo.gateway' }
-  static get type () { return 'web' }
-  static get kind () { return 'server' }
+  static id = 'apollo.gateway'
+  static type = 'web'
+  static kind = 'server'
 
   bindStart (ctx) {
     const store = storage('legacy').getStore()

package/packages/dd-trace/src/plugins/cache.js

@@ -3,7 +3,7 @@
 const StoragePlugin = require('./storage')
 
 class CachePlugin extends StoragePlugin {
-  static get operation () { return 'command' }
+  static operation = 'command'
 
   startSpan (options, ctx) {
     if (!options.kind) {

package/packages/dd-trace/src/plugins/client.js

@@ -3,9 +3,9 @@
 const OutboundPlugin = require('./outbound')
 
 class ClientPlugin extends OutboundPlugin {
-  static get operation () { return 'request' }
-  static get kind () { return 'client' }
-  static get type () { return 'web' } // overridden by storage and other client type plugins
+  static operation = 'request'
+  static kind = 'client'
+  static type = 'web' // overridden by storage and other client type plugins
 }
 
 module.exports = ClientPlugin