dd-trace 4.0.0-pre-e7fe5c1 → 4.0.0-pre-071951e

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "4.0.0-pre-e7fe5c1",
+  "version": "4.0.0-pre-071951e",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -36,6 +36,7 @@
     "test:integration:cucumber": "mocha --colors --timeout 30000 \"integration-tests/cucumber/*.spec.js\"",
     "test:integration:cypress": "mocha --colors --timeout 30000 \"integration-tests/cypress/*.spec.js\"",
     "test:integration:playwright": "mocha --colors --timeout 30000 \"integration-tests/playwright/*.spec.js\"",
+    "test:integration:serverless": "mocha --colors --timeout 30000 \"integration-tests/serverless/*.spec.js\"",
     "test:shimmer": "mocha --colors 'packages/datadog-shimmer/test/**/*.spec.js'",
     "test:shimmer:ci": "nyc --no-clean --include 'packages/datadog-shimmer/src/**/*.js' -- npm run test:shimmer",
     "leak:core": "node ./scripts/install_plugin_modules && (cd packages/memwatch && yarn) && NODE_PATH=./packages/memwatch/node_modules node --no-warnings ./node_modules/.bin/tape 'packages/dd-trace/test/leak/**/*.js'",

package/packages/datadog-instrumentations/src/next.js

@@ -4,6 +4,7 @@
 
 const { channel, addHook, AsyncResource } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { MAJOR } = require('../../../version')
 
 const startChannel = channel('apm:next:request:start')
 const finishChannel = channel('apm:next:request:finish')
@@ -168,7 +169,11 @@ addHook({ name: 'next', versions: ['>=11.1 <13.2'], file: 'dist/server/next-serv
   return nextServer
 })
 
-addHook({ name: 'next', versions: ['>=9.5 <11.1'], file: 'dist/next-server/server/next-server.js' }, nextServer => {
+addHook({
+  name: 'next',
+  versions: MAJOR >= 4 ? ['>=10.2 <11.1'] : ['>=9.5 <11.1'],
+  file: 'dist/next-server/server/next-server.js'
+}, nextServer => {
   const Server = nextServer.default
 
   shimmer.wrap(Server.prototype, 'handleRequest', wrapHandleRequest)

package/packages/datadog-instrumentations/src/playwright.js

@@ -214,10 +214,20 @@ function runnerHook (runnerExport, playwrightVersion) {
     })
 
     const runAllTestsReturn = await runAllTests.apply(this, arguments)
+
+    Object.values(remainingTestsByFile).forEach(tests => {
+      // `tests` should normally be empty, but if it isn't,
+      // there were tests that did not go through `testBegin` or `testEnd`,
+      // because they were skipped
+      tests.forEach(test => {
+        testBeginHandler(test)
+        testEndHandler(test, 'skip')
+      })
+    })
+
     const sessionStatus = runAllTestsReturn.status || runAllTestsReturn
 
     let onDone
-
     const flushWait = new Promise(resolve => {
       onDone = resolve
     })

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

@@ -11,9 +11,11 @@ class Amqp10ConsumerPlugin extends ConsumerPlugin {
     const source = getShortName(link)
     const address = getAddress(link)
 
-    this.startSpan({
+    this.startSpan('amqp.receive', {
+      service: this.config.service || `${this.tracer._service}-amqp`,
       resource: ['receive', source].filter(v => v).join(' '),
       type: 'worker',
+      kind: 'consumer',
       meta: {
         'amqp.link.source.address': source,
         'amqp.link.role': 'receiver',

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

@@ -13,8 +13,10 @@ class Amqp10ProducerPlugin extends ProducerPlugin {
     const address = getAddress(link)
     const target = getShortName(link)
 
-    this.startSpan({
+    this.startSpan('amqp.send', {
+      service: this.config.service || `${this.tracer._service}-amqp`,
       resource: ['send', target].filter(v => v).join(' '),
+      kind: 'producer',
       meta: {
         'amqp.link.target.address': target,
         'amqp.link.role': 'sender',

package/packages/datadog-plugin-amqplib/src/client.js

@@ -7,7 +7,6 @@ const { getResourceName } = require('./util')
 
 class AmqplibClientPlugin extends ClientPlugin {
   static get id () { return 'amqplib' }
-  static get type () { return 'messaging' }
   static get operation () { return 'command' }
 
   start ({ channel = {}, method, fields }) {
@@ -15,10 +14,10 @@ class AmqplibClientPlugin extends ClientPlugin {
     if (method === 'basic.publish') return
 
     const stream = (channel.connection && channel.connection.stream) || {}
-    const span = this.startSpan(this.operationName(), {
-      service: this.config.service || this.serviceName(),
+    const span = this.startSpan('amqp.command', {
+      service: this.config.service || `${this.tracer._service}-amqp`,
       resource: getResourceName(method, fields),
-      kind: this.constructor.kind,
+      kind: 'client',
       meta: {
         'out.host': stream._host,
         [CLIENT_PORT_KEY]: stream.remotePort,

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

@@ -13,9 +13,11 @@ class AmqplibConsumerPlugin extends ConsumerPlugin {
 
     const childOf = extract(this.tracer, message)
 
-    this.startSpan({
+    this.startSpan('amqp.command', {
       childOf,
+      service: this.config.service || `${this.tracer._service}-amqp`,
       resource: getResourceName(method, fields),
+      kind: 'consumer',
       type: 'worker',
       meta: {
         'amqp.queue': fields.queue,

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

@@ -13,8 +13,10 @@ class AmqplibProducerPlugin extends ProducerPlugin {
     if (method !== 'basic.publish') return
 
     const stream = (channel.connection && channel.connection.stream) || {}
-    const span = this.startSpan({
+    const span = this.startSpan('amqp.command', {
+      service: this.config.service || `${this.tracer._service}-amqp`,
       resource: getResourceName(method, fields),
+      kind: 'producer',
       meta: {
         'out.host': stream._host,
         [CLIENT_PORT_KEY]: stream.remotePort,

package/packages/datadog-plugin-aws-sdk/src/base.js

@@ -38,6 +38,8 @@ class BaseAwsSdkPlugin extends Plugin {
         'service.name': serviceName,
         'aws.operation': operation,
         'aws.region': awsRegion,
+        'region': awsRegion,
+        'aws_service': awsService,
         'aws.service': awsService,
         'component': 'aws-sdk'
       }
@@ -60,6 +62,7 @@ class BaseAwsSdkPlugin extends Plugin {
       const { span } = store
       if (!span) return
       span.setTag('aws.region', region)
+      span.setTag('region', region)
     })
 
     this.addSub(`apm:aws:request:complete:${this.serviceIdentifier}`, ({ response }) => {

package/packages/datadog-plugin-aws-sdk/src/services/cloudwatchlogs.js

@@ -12,7 +12,8 @@ class CloudwatchLogs extends BaseAwsSdkPlugin {
 
     return Object.assign(tags, {
       'resource.name': `${operation} ${params.logGroupName}`,
-      'aws.cloudwatch.logs.log_group_name': params.logGroupName
+      'aws.cloudwatch.logs.log_group_name': params.logGroupName,
+      'loggroupname': params.logGroupName
     })
   }
 }

package/packages/datadog-plugin-aws-sdk/src/services/dynamodb.js

@@ -12,7 +12,8 @@ class DynamoDb extends BaseAwsSdkPlugin {
       if (params.TableName) {
         Object.assign(tags, {
           'resource.name': `${operation} ${params.TableName}`,
-          'aws.dynamodb.table_name': params.TableName
+          'aws.dynamodb.table_name': params.TableName,
+          'tablename': params.TableName
         })
       }
 
@@ -27,7 +28,8 @@ class DynamoDb extends BaseAwsSdkPlugin {
             // also add span type to match serverless convention
             Object.assign(tags, {
               'resource.name': `${operation} ${tableName}`,
-              'aws.dynamodb.table_name': tableName
+              'aws.dynamodb.table_name': tableName,
+              'tablename': tableName
             })
           }
         }

package/packages/datadog-plugin-aws-sdk/src/services/eventbridge.js

@@ -7,10 +7,11 @@ class EventBridge extends BaseAwsSdkPlugin {
 
   generateTags (params, operation, response) {
     if (!params || !params.source) return {}
-
+    const rulename = params.Name ? params.Name : ''
     return {
-      'resource.name': `${operation} ${params.source}`,
-      'aws.eventbridge.source': params.source
+      'resource.name': operation ? `${operation} ${params.source}` : params.source,
+      'aws.eventbridge.source': `${params.source}`,
+      'rulename': `${rulename}`
     }
   }
 

package/packages/datadog-plugin-aws-sdk/src/services/kinesis.js

@@ -9,7 +9,8 @@ class Kinesis extends BaseAwsSdkPlugin {
 
     return {
       'resource.name': `${operation} ${params.StreamName}`,
-      'aws.kinesis.stream_name': params.StreamName
+      'aws.kinesis.stream_name': params.StreamName,
+      'streamname': params.StreamName
     }
   }
 

package/packages/datadog-plugin-aws-sdk/src/services/lambda.js

@@ -13,6 +13,7 @@ class Lambda extends BaseAwsSdkPlugin {
 
     return Object.assign(tags, {
       'resource.name': `${operation} ${params.FunctionName}`,
+      'functionname': params.FunctionName,
       'aws.lambda': params.FunctionName
     })
   }

package/packages/datadog-plugin-aws-sdk/src/services/redshift.js

@@ -12,7 +12,8 @@ class Redshift extends BaseAwsSdkPlugin {
 
     return Object.assign(tags, {
       'resource.name': `${operation} ${params.ClusterIdentifier}`,
-      'aws.redshift.cluster_identifier': params.ClusterIdentifier
+      'aws.redshift.cluster_identifier': params.ClusterIdentifier,
+      'clusteridentifier': params.ClusterIdentifier
     })
   }
 }

package/packages/datadog-plugin-aws-sdk/src/services/s3.js

@@ -12,7 +12,8 @@ class S3 extends BaseAwsSdkPlugin {
 
     return Object.assign(tags, {
       'resource.name': `${operation} ${params.Bucket}`,
-      'aws.s3.bucket_name': params.Bucket
+      'aws.s3.bucket_name': params.Bucket,
+      'bucketname': params.Bucket
     })
   }
 }

package/packages/datadog-plugin-aws-sdk/src/services/sns.js

@@ -9,10 +9,17 @@ class Sns extends BaseAwsSdkPlugin {
     if (!params) return {}
 
     if (!params.TopicArn && !(response.data && response.data.TopicArn)) return {}
+    const TopicArn = params.TopicArn || response.data.TopicArn
+    // Split the ARN into its parts
+    // ex.'arn:aws:sns:us-east-1:123456789012:my-topic'
+    const arnParts = TopicArn.split(':')
 
+    // Get the topic name from the last part of the ARN
+    const topicName = arnParts[arnParts.length - 1]
     return {
       'resource.name': `${operation} ${params.TopicArn || response.data.TopicArn}`,
-      'aws.sns.topic_arn': params.TopicArn || response.data.TopicArn
+      'aws.sns.topic_arn': TopicArn,
+      'topicname': topicName
     }
 
     // TODO: should arn be sanitized or quantized in some way here,

package/packages/datadog-plugin-aws-sdk/src/services/sqs.js

@@ -59,10 +59,16 @@ class Sqs extends BaseAwsSdkPlugin {
     const tags = {}
 
     if (!params || (!params.QueueName && !params.QueueUrl)) return tags
+    // 'https://sqs.us-east-1.amazonaws.com/123456789012/my-queue';
+    let queueName = params.QueueName
+    if (params.QueueUrl) {
+      queueName = params.QueueUrl.split('/')[params.QueueUrl.split('/').length - 1]
+    }
 
     Object.assign(tags, {
       'resource.name': `${operation} ${params.QueueName || params.QueueUrl}`,
-      'aws.sqs.queue_name': params.QueueName || params.QueueUrl
+      'aws.sqs.queue_name': params.QueueName || params.QueueUrl,
+      'queuename': queueName
     })
 
     switch (operation) {

package/packages/datadog-plugin-google-cloud-pubsub/src/client.js

@@ -4,16 +4,15 @@ const ClientPlugin = require('../../dd-trace/src/plugins/client')
 
 class GoogleCloudPubsubClientPlugin extends ClientPlugin {
   static get id () { return 'google-cloud-pubsub' }
-  static get type () { return 'messaging' }
   static get operation () { return 'request' }
 
   start ({ request, api, projectId }) {
     if (api === 'publish') return
 
-    this.startSpan(this.operationName(), {
-      service: this.config.service || this.serviceName(),
+    this.startSpan('pubsub.request', {
+      service: this.config.service || `${this.tracer._service}-pubsub`,
       resource: [api, request.name].filter(x => x).join(' '),
-      kind: this.constructor.kind,
+      kind: 'client',
       meta: {
         'pubsub.method': api,
         'gcloud.project_id': projectId

package/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js

@@ -11,9 +11,11 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
     const topic = subscription.metadata && subscription.metadata.topic
     const childOf = this.tracer.extract('text_map', message.attributes) || null
 
-    this.startSpan({
+    this.startSpan('pubsub.receive', {
       childOf,
+      service: this.config.service,
       resource: topic,
+      kind: 'consumer',
       type: 'worker',
       meta: {
         'gcloud.project_id': subscription.pubsub.projectId,

package/packages/datadog-plugin-google-cloud-pubsub/src/producer.js

@@ -11,8 +11,10 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
 
     const messages = request.messages || []
     const topic = request.topic
-    const span = this.startSpan({ // TODO: rename
+    const span = this.startSpan('pubsub.request', { // TODO: rename
+      service: this.config.service || `${this.tracer._service}-pubsub`,
       resource: `${api} ${topic}`,
+      kind: 'producer',
       meta: {
         'gcloud.project_id': projectId,
         'pubsub.method': api, // TODO: remove

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

@@ -8,9 +8,12 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
 
   start ({ topic, partition, message }) {
     const childOf = extract(this.tracer, message.headers)
-    this.startSpan({
+
+    this.startSpan('kafka.consume', {
       childOf,
+      service: this.config.service || `${this.tracer._service}-kafka`,
       resource: topic,
+      kind: 'consumer',
       type: 'worker',
       meta: {
         'component': 'kafkajs',
@@ -30,6 +33,8 @@ function extract (tracer, bufferMap) {
   const textMap = {}
 
   for (const key of Object.keys(bufferMap)) {
+    if (bufferMap[key] === null || bufferMap[key] === undefined) continue
+
     textMap[key] = bufferMap[key].toString()
   }
 

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

@@ -7,8 +7,10 @@ class KafkajsProducerPlugin extends ProducerPlugin {
   static get operation () { return 'produce' }
 
   start ({ topic, messages }) {
-    const span = this.startSpan({
+    const span = this.startSpan('kafka.produce', {
+      service: this.config.service || `${this.tracer._service}-kafka`,
       resource: topic,
+      kind: 'producer',
       meta: {
         'component': 'kafkajs',
         'kafka.topic': topic

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

@@ -19,10 +19,12 @@ class RheaConsumerPlugin extends ConsumerPlugin {
     const name = getResourceNameFromMessage(msgObj)
     const childOf = extractTextMap(msgObj, this.tracer)
 
-    this.startSpan({
+    this.startSpan('amqp.receive', {
       childOf,
+      service: this.config.service,
       resource: name,
       type: 'worker',
+      kind: 'consumer',
       meta: {
         'component': 'rhea',
         'amqp.link.source.address': name,

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

@@ -9,13 +9,17 @@ class RheaProducerPlugin extends ProducerPlugin {
 
   constructor (...args) {
     super(...args)
+
     this.addTraceSub('encode', this.encode.bind(this))
   }
 
   start ({ targetAddress, host, port }) {
     const name = targetAddress || 'amq.topic'
-    this.startSpan({
+
+    this.startSpan('amqp.send', {
+      service: this.config.service || `${this.tracer._service}-amqp-producer`,
       resource: name,
+      kind: 'producer',
       meta: {
         'component': 'rhea',
         'amqp.link.target.address': name,

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

@@ -34,19 +34,6 @@ function safeJsonParse (input) {
   }
 }
 
-const namingVersions = ['v0', 'v1']
-const defaultVersion = 'v0'
-
-function validateNamingVersion (versionString) {
-  if (!namingVersions.includes(versionString)) {
-    log.warn(
-      `Unexpected input for config.spanAttributeSchema, picked default ${defaultVersion}`
-    )
-    return defaultVersion
-  }
-  return versionString
-}
-
 // Shallow clone with property name remapping
 function remapify (input, mappings) {
   if (!input) return
@@ -172,6 +159,8 @@ class Config {
       process.env.DD_SERVICE_NAME ||
       this.tags.service ||
       process.env.AWS_LAMBDA_FUNCTION_NAME ||
+      process.env.FUNCTION_NAME || // Google Cloud Function Name set by deprecated runtimes
+      process.env.K_SERVICE || // Google Cloud Function Name set by newer runtimes
       pkg.name ||
       'node'
     const DD_SERVICE_MAPPING = coalesce(
@@ -196,9 +185,18 @@ class Config {
       process.env.DD_TRACE_STARTUP_LOGS,
       false
     )
+
+    const inAWSLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== undefined
+
+    const isDeprecatedGCPFunction = process.env.FUNCTION_NAME !== undefined && process.env.GCP_PROJECT !== undefined
+    const isNewerGCPFunction = process.env.K_SERVICE !== undefined && process.env.FUNCTION_TARGET !== undefined
+    const isGCPFunction = isDeprecatedGCPFunction || isNewerGCPFunction
+
+    const inServerlessEnvironment = inAWSLambda || isGCPFunction
+
     const DD_TRACE_TELEMETRY_ENABLED = coalesce(
       process.env.DD_TRACE_TELEMETRY_ENABLED,
-      !process.env.AWS_LAMBDA_FUNCTION_NAME
+      !inServerlessEnvironment
     )
     const DD_TELEMETRY_DEBUG_ENABLED = coalesce(
       process.env.DD_TELEMETRY_DEBUG_ENABLED,
@@ -273,9 +271,7 @@ class Config {
       process.env.DD_TRACE_EXPERIMENTAL_GET_RUM_DATA_ENABLED,
       false
     )
-    const DD_TRACE_SPAN_ATTRIBUTE_SCHEMA = validateNamingVersion(
-      process.env.DD_TRACE_SPAN_ATTRIBUTE_SCHEMA
-    )
+
     const DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH = coalesce(
       process.env.DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH,
       '512'
@@ -284,7 +280,7 @@ class Config {
     const DD_TRACE_STATS_COMPUTATION_ENABLED = coalesce(
       options.stats,
       process.env.DD_TRACE_STATS_COMPUTATION_ENABLED,
-      false
+      isGCPFunction
     )
 
     const DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED = coalesce(
@@ -351,12 +347,10 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
       maybeFile(process.env.DD_APPSEC_HTTP_BLOCKED_TEMPLATE_JSON)
     )
 
-    const inAWSLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== undefined
-
     const remoteConfigOptions = options.remoteConfig || {}
     const DD_REMOTE_CONFIGURATION_ENABLED = coalesce(
       process.env.DD_REMOTE_CONFIGURATION_ENABLED && isTrue(process.env.DD_REMOTE_CONFIGURATION_ENABLED),
-      !inAWSLambda
+      !inServerlessEnvironment
     )
     const DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS = coalesce(
       parseInt(remoteConfigOptions.pollInterval),
@@ -439,7 +433,7 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
       })
     }
 
-    const defaultFlushInterval = inAWSLambda ? 0 : 2000
+    const defaultFlushInterval = inServerlessEnvironment ? 0 : 2000
 
     this.tracing = !isFalse(DD_TRACING_ENABLED)
     this.dbmPropagationMode = DD_DBM_PROPAGATION_MODE
@@ -482,7 +476,6 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
       sourceMap: !isFalse(DD_PROFILING_SOURCE_MAP),
       exporters: DD_PROFILING_EXPORTERS
     }
-    this.spanAttributeSchema = DD_TRACE_SPAN_ATTRIBUTE_SCHEMA
     this.lookup = options.lookup
     this.startupLogs = isTrue(DD_TRACE_STARTUP_LOGS)
     // Disabled for CI Visibility's agentless
@@ -529,6 +522,8 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
     this.traceId128BitGenerationEnabled = isTrue(DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED)
     this.traceId128BitLoggingEnabled = isTrue(DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED)
 
+    this.isGCPFunction = isGCPFunction
+
     tagger.add(this.tags, {
       service: this.service,
       env: this.env,

package/packages/dd-trace/src/encode/agentless-ci-visibility.js

@@ -129,12 +129,17 @@ class AgentlessCiVisibilityEncoder extends AgentEncoder {
   _encodeEventContent (bytes, content) {
     const keysLength = Object.keys(content).length
 
+    let totalKeysLength = keysLength
     if (content.meta.test_session_id) {
-      this._encodeMapPrefix(bytes, keysLength + 3)
-    } else {
-      this._encodeMapPrefix(bytes, keysLength)
+      totalKeysLength = totalKeysLength + 1
     }
-
+    if (content.meta.test_module_id) {
+      totalKeysLength = totalKeysLength + 1
+    }
+    if (content.meta.test_suite_id) {
+      totalKeysLength = totalKeysLength + 1
+    }
+    this._encodeMapPrefix(bytes, totalKeysLength)
     if (content.type) {
       this._encodeString(bytes, 'type')
       this._encodeString(bytes, content.type)
@@ -170,15 +175,20 @@ class AgentlessCiVisibilityEncoder extends AgentEncoder {
       this._encodeString(bytes, 'test_session_id')
       this._encodeId(bytes, id(content.meta.test_session_id, 10))
       delete content.meta.test_session_id
+    }
 
+    if (content.meta.test_module_id) {
       this._encodeString(bytes, 'test_module_id')
       this._encodeId(bytes, id(content.meta.test_module_id, 10))
       delete content.meta.test_module_id
+    }
 
+    if (content.meta.test_suite_id) {
       this._encodeString(bytes, 'test_suite_id')
       this._encodeId(bytes, id(content.meta.test_suite_id, 10))
       delete content.meta.test_suite_id
     }
+
     this._encodeString(bytes, 'meta')
     this._encodeMap(bytes, content.meta)
     this._encodeString(bytes, 'metrics')

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

@@ -4,7 +4,6 @@ const { channel } = require('../../diagnostics_channel')
 const { isFalse } = require('./util')
 const plugins = require('./plugins')
 const log = require('./log')
-const Nomenclature = require('./service-naming')
 
 const loadChannel = channel('dd-trace:instrumentation:load')
 
@@ -97,7 +96,6 @@ module.exports = class PluginManager {
   // like instrumenter.enable()
   configure (config = {}) {
     this._tracerConfig = config
-    Nomenclature.configure(config)
 
     for (const name in pluginClasses) {
       this.loadPlugin(name)

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

@@ -1,10 +1,9 @@
 'use strict'
 
-const OutboundPlugin = require('./outbound')
+const OutgoingPlugin = require('./outgoing')
 
-class ClientPlugin extends OutboundPlugin {
+class ClientPlugin extends OutgoingPlugin {
   static get operation () { return 'request' }
-  static get kind () { return 'client' }
 }
 
 module.exports = ClientPlugin

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

@@ -1,24 +1,9 @@
 'use strict'
 
-const InboundPlugin = require('./inbound')
+const IncomingPlugin = require('./incoming')
 
-class ConsumerPlugin extends InboundPlugin {
+class ConsumerPlugin extends IncomingPlugin {
   static get operation () { return 'receive' }
-  static get kind () { return 'consumer' }
-  static get type () { return 'messaging' }
-
-  startSpan (options) {
-    const spanDefaults = {
-      service: this.config.service || this.serviceName(),
-      kind: this.constructor.kind
-    }
-    Object.keys(spanDefaults).forEach(
-      key => {
-        if (!options[key]) options[key] = spanDefaults[key]
-      }
-    )
-    return super.startSpan(this.operationName(), options)
-  }
 }
 
 module.exports = ConsumerPlugin

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

@@ -0,0 +1,7 @@
+'use strict'
+
+const TracingPlugin = require('./tracing')
+
+class IncomingPlugin extends TracingPlugin {}
+
+module.exports = IncomingPlugin

package/packages/dd-trace/src/plugins/{outbound.js → outgoing.js}

@@ -4,7 +4,7 @@ const { CLIENT_PORT_KEY } = require('../constants')
 const TracingPlugin = require('./tracing')
 
 // TODO: Exit span on finish when AsyncResource instances are removed.
-class OutboundPlugin extends TracingPlugin {
+class OutgoingPlugin extends TracingPlugin {
   constructor (...args) {
     super(...args)
 
@@ -29,4 +29,4 @@ class OutboundPlugin extends TracingPlugin {
   }
 }
 
-module.exports = OutboundPlugin
+module.exports = OutgoingPlugin

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

@@ -1,24 +1,9 @@
 'use strict'
 
-const OutboundPlugin = require('./outbound')
+const OutgoingPlugin = require('./outgoing')
 
-class ProducerPlugin extends OutboundPlugin {
+class ProducerPlugin extends OutgoingPlugin {
   static get operation () { return 'publish' }
-  static get kind () { return 'producer' }
-  static get type () { return 'messaging' }
-
-  startSpan (options) {
-    const spanDefaults = {
-      service: this.config.service || this.serviceName(),
-      kind: this.constructor.kind
-    }
-    Object.keys(spanDefaults).forEach(
-      key => {
-        if (!options[key]) options[key] = spanDefaults[key]
-      }
-    )
-    return super.startSpan(this.operationName(), options)
-  }
 }
 
 module.exports = ProducerPlugin

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

@@ -1,8 +1,8 @@
 'use strict'
 
-const InboundPlugin = require('./inbound')
+const IncomingPlugin = require('./incoming')
 
-class ServerPlugin extends InboundPlugin {
+class ServerPlugin extends IncomingPlugin {
   static get operation () { return 'request' }
 }
 

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

@@ -4,7 +4,6 @@ const Plugin = require('./plugin')
 const { storage } = require('../../../datadog-core')
 const analyticsSampler = require('../analytics_sampler')
 const { COMPONENT } = require('../constants')
-const Nomenclature = require('../service-naming')
 
 class TracingPlugin extends Plugin {
   constructor (...args) {
@@ -32,16 +31,6 @@ class TracingPlugin extends Plugin {
     return store && store.span
   }
 
-  serviceName (serviceArgs) {
-    const { type, id, kind } = this.constructor
-    return Nomenclature.serviceName(type, kind, id, serviceArgs)
-  }
-
-  operationName (opNameArgs) {
-    const { type, id, kind } = this.constructor
-    return Nomenclature.opName(type, kind, id, opNameArgs)
-  }
-
   configure (config) {
     return super.configure({
       ...config,

package/packages/dd-trace/src/profiling/constants.js

@@ -9,7 +9,6 @@ const snapshotKinds = Object.freeze({
 const oomExportStrategies = Object.freeze({
   PROCESS: 'process',
   ASYNC_CALLBACK: 'async',
-  INTERRUPT_CALLBACK: 'interrupt',
   LOGS: 'logs'
 })
 

package/packages/dd-trace/src/profiling/profilers/space.js

@@ -3,9 +3,7 @@
 const { oomExportStrategies } = require('../constants')
 
 function strategiesToCallbackMode (strategies, callbackMode) {
-  const hasInterrupt = strategies.includes(oomExportStrategies.INTERRUPT_CALLBACK) ? callbackMode.Interrupt : 0
-  const hasCallback = strategies.includes(oomExportStrategies.ASYNC_CALLBACK) ? callbackMode.Async : 0
-  return hasInterrupt | hasCallback
+  return strategies.includes(oomExportStrategies.ASYNC_CALLBACK) ? callbackMode.Async : 0
 }
 
 class NativeSpaceProfiler {

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

@@ -30,6 +30,10 @@ class Tracer extends NoopProxy {
         remoteConfig.enable(config)
       }
 
+      if (config.isGCPFunction) {
+        require('./serverless').maybeStartServerlessMiniAgent()
+      }
+
       if (config.profiling.enabled) {
         // do not stop tracer initialization if the profiler fails to be imported
         try {

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

@@ -0,0 +1,25 @@
+'use strict'
+
+function maybeStartServerlessMiniAgent () {
+  let rustBinaryPath =
+    '/workspace/node_modules/@datadog/sma/datadog-serverless-agent-linux-amd64/datadog-serverless-trace-mini-agent'
+  if (process.env.DD_MINI_AGENT_PATH !== undefined) {
+    rustBinaryPath = process.env.DD_MINI_AGENT_PATH
+  }
+  const log = require('./log')
+  const fs = require('fs')
+
+  // trying to spawn with an invalid path will return a non-descriptive error, so we want to catch
+  // invalid paths and log our own error.
+  if (!fs.existsSync(rustBinaryPath)) {
+    log.error('Serverless Mini Agent did not start. Could not find mini agent binary.')
+    return
+  }
+  try {
+    require('child_process').spawn(rustBinaryPath, { stdio: 'inherit' })
+  } catch (err) {
+    log.error(`Error spawning mini agent process: ${err}`)
+  }
+}
+
+module.exports = { maybeStartServerlessMiniAgent }

package/version.js

@@ -0,0 +1,9 @@
+'use strict'
+
+const matches = require('./package.json').version.match(/^(\d+)\.(\d+)\.(\d+)/)
+
+module.exports = {
+  MAJOR: parseInt(matches[1]),
+  MINOR: parseInt(matches[2]),
+  PATCH: parseInt(matches[3])
+}

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

@@ -1,7 +0,0 @@
-'use strict'
-
-const TracingPlugin = require('./tracing')
-
-class InboundPlugin extends TracingPlugin {}
-
-module.exports = InboundPlugin

package/packages/dd-trace/src/service-naming/index.js

@@ -1,41 +0,0 @@
-const { schemaDefinitions } = require('./schemas')
-
-const kindMap = {
-  messaging: {
-    client: 'controlPlane',
-    consumer: 'inbound',
-    producer: 'outbound'
-  }
-}
-
-class SchemaManager {
-  constructor () {
-    this.schemas = schemaDefinitions
-    this.config = { spanAttributeSchema: 'v0' }
-  }
-
-  get schema () {
-    return this.schemas[this.version]
-  }
-
-  get version () {
-    return this.config.spanAttributeSchema
-  }
-
-  opName (type, kind, plugin, opNameArgs) {
-    return this.schema.getOpName(type, kindMap[type][kind], plugin, opNameArgs)
-  }
-
-  serviceName (type, kind, plugin, serviceNameArgs) {
-    return this.schema.getServiceName(type, kindMap[type][kind], plugin, serviceNameArgs)
-  }
-
-  configure (config = {}) {
-    this.config = config
-    Object.values(this.schemas).forEach(schemaDef => {
-      schemaDef.configure(config)
-    })
-  }
-}
-
-module.exports = new SchemaManager()

package/packages/dd-trace/src/service-naming/schemas/definition.js

@@ -1,28 +0,0 @@
-class SchemaDefinition {
-  constructor (schema) {
-    this.schema = schema
-  }
-
-  getSchemaItem (type, subType, plugin) {
-    const schema = this.schema
-    if (schema && schema[type] && schema[type][subType] && schema[type][subType][plugin]) {
-      return schema[type][subType][plugin]
-    }
-  }
-
-  getOpName (type, subType, plugin, opNameArgs) {
-    const item = this.getSchemaItem(type, subType, plugin)
-    return item.opName(opNameArgs)
-  }
-
-  getServiceName (type, subType, plugin, serviceNameArgs) {
-    const item = this.getSchemaItem(type, subType, plugin)
-    return item.serviceName(this.service, serviceNameArgs)
-  }
-
-  configure ({ service }) {
-    this.service = service
-  }
-}
-
-module.exports = SchemaDefinition

package/packages/dd-trace/src/service-naming/schemas/index.js

@@ -1,6 +0,0 @@
-const v0 = require('./v0')
-const v1 = require('./v1')
-
-module.exports = {
-  schemaDefinitions: { v0, v1 }
-}

package/packages/dd-trace/src/service-naming/schemas/v0.js

@@ -1,66 +0,0 @@
-const SchemaDefinition = require('./definition')
-
-function amqpServiceName (service) {
-  return `${service}-amqp`
-}
-
-const schema = {
-  messaging: {
-    outbound: {
-      amqplib: {
-        opName: () => 'amqp.command',
-        serviceName: amqpServiceName
-      },
-      amqp10: {
-        opName: () => 'amqp.send',
-        serviceName: amqpServiceName
-      },
-      'google-cloud-pubsub': {
-        opName: () => 'pubsub.request',
-        serviceName: service => `${service}-pubsub`
-      },
-      kafkajs: {
-        opName: () => 'kafka.produce',
-        serviceName: service => `${service}-kafka`
-      },
-      rhea: {
-        opName: () => 'amqp.send',
-        serviceName: service => `${service}-amqp-producer`
-      }
-    },
-    inbound: {
-      amqplib: {
-        opName: () => 'amqp.command',
-        serviceName: amqpServiceName
-      },
-      amqp10: {
-        opName: () => 'amqp.receive',
-        serviceName: amqpServiceName
-      },
-      'google-cloud-pubsub': {
-        opName: () => 'pubsub.receive',
-        serviceName: service => service
-      },
-      kafkajs: {
-        opName: () => 'kafka.consume',
-        serviceName: service => `${service}-kafka`
-      },
-      rhea: {
-        opName: () => 'amqp.receive',
-        serviceName: service => service
-      }
-    },
-    controlPlane: {
-      amqplib: {
-        opName: () => 'amqp.command',
-        serviceName: amqpServiceName
-      },
-      'google-cloud-pubsub': {
-        opName: () => 'pubsub.request',
-        serviceName: service => `${service}-pubsub`
-      }
-    }
-  }
-}
-
-module.exports = new SchemaDefinition(schema)

package/packages/dd-trace/src/service-naming/schemas/v1.js

@@ -1,58 +0,0 @@
-const SchemaDefinition = require('./definition')
-
-function identityService (service) {
-  return service
-}
-
-const amqpInbound = {
-  opName: () => 'amqp.process',
-  serviceName: identityService
-}
-
-const amqpOutbound = {
-  opName: () => 'amqp.send',
-  serviceName: identityService
-}
-
-const schema = {
-  messaging: {
-    outbound: {
-      amqplib: amqpOutbound,
-      amqp10: amqpOutbound,
-      'google-cloud-pubsub': {
-        opName: () => 'gcp.pubsub.send',
-        serviceName: identityService
-      },
-      kafkajs: {
-        opName: () => 'kafka.send',
-        serviceName: identityService
-      },
-      rhea: amqpOutbound
-    },
-    inbound: {
-      amqplib: amqpInbound,
-      amqp10: amqpInbound,
-      'google-cloud-pubsub': {
-        opName: () => 'gcp.pubsub.process',
-        serviceName: identityService
-      },
-      kafkajs: {
-        opName: () => 'kafka.process',
-        serviceName: identityService
-      },
-      rhea: amqpInbound
-    },
-    controlPlane: {
-      amqplib: {
-        opName: () => 'amqp.command',
-        serviceName: identityService
-      },
-      'google-cloud-pubsub': {
-        opName: () => 'gcp.pubsub.request',
-        serviceName: identityService
-      }
-    }
-  }
-}
-
-module.exports = new SchemaDefinition(schema)