move to better tracer option name

Author: Jordi Bertran de Balanda

packages/dd-trace/src/config.js

@@ -351,7 +351,7 @@ class Config {
     )
 
     const DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED = coalesce(
-      options.flattenIntegrationServiceNames,
+      options.spanRemoveIntegrationFromService,
       isTrue(process.env.DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED)
     )
     const DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH = coalesce(
@@ -585,7 +585,7 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
     }
     this.spanAttributeSchema = DD_TRACE_SPAN_ATTRIBUTE_SCHEMA
     this.spanComputePeerService = DD_TRACE_PEER_SERVICE_DEFAULTS_ENABLED
-    this.flattenIntegrationServiceNames = DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED
+    this.spanRemoveIntegrationFromService = DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED
     this.peerServiceMapping = DD_TRACE_PEER_SERVICE_MAPPING
     this.lookup = options.lookup
     this.startupLogs = isTrue(DD_TRACE_STARTUP_LOGS)

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

@@ -3,7 +3,7 @@ const { schemaDefinitions } = require('./schemas')
 class SchemaManager {
   constructor () {
     this.schemas = schemaDefinitions
-    this.config = { spanAttributeSchema: 'v0', flattenIntegrationServiceNames: false }
+    this.config = { spanAttributeSchema: 'v0', spanRemoveIntegrationFromService: false }
   }
 
   get schema () {
@@ -15,7 +15,7 @@ class SchemaManager {
   }
 
   get shouldUseConsistentServiceNaming () {
-    return this.config.flattenIntegrationServiceNames && this.version === 'v0'
+    return this.config.spanRemoveIntegrationFromService && this.version === 'v0'
   }
 
   opName (type, kind, plugin, ...opNameArgs) {

packages/dd-trace/test/config.spec.js

@@ -93,7 +93,7 @@ describe('Config', () => {
     expect(config).to.have.property('traceId128BitLoggingEnabled', false)
     expect(config).to.have.property('spanAttributeSchema', 'v0')
     expect(config).to.have.property('spanComputePeerService', false)
-    expect(config).to.have.property('flattenIntegrationServiceNames', false)
+    expect(config).to.have.property('spanRemoveIntegrationFromService', false)
     expect(config).to.have.deep.property('serviceMapping', {})
     expect(config).to.have.nested.deep.property('tracePropagationStyle.inject', ['tracecontext', 'datadog'])
     expect(config).to.have.nested.deep.property('tracePropagationStyle.extract', ['tracecontext', 'datadog'])
@@ -239,7 +239,7 @@ describe('Config', () => {
     expect(config).to.have.property('traceId128BitGenerationEnabled', true)
     expect(config).to.have.property('traceId128BitLoggingEnabled', true)
     expect(config).to.have.property('spanAttributeSchema', 'v1')
-    expect(config).to.have.property('flattenIntegrationServiceNames', true)
+    expect(config).to.have.property('spanRemoveIntegrationFromService', true)
     expect(config).to.have.property('spanComputePeerService', true)
     expect(config.tags).to.include({ foo: 'bar', baz: 'qux' })
     expect(config.tags).to.include({ service: 'service', 'version': '1.0.0', 'env': 'test' })
@@ -378,7 +378,7 @@ describe('Config', () => {
       ],
       spanAttributeSchema: 'v1',
       spanComputePeerService: true,
-      flattenIntegrationServiceNames: true,
+      spanRemoveIntegrationFromService: true,
       peerServiceMapping: {
         d: 'dd'
       },
@@ -447,7 +447,7 @@ describe('Config', () => {
     expect(config).to.have.property('logLevel', logLevel)
     expect(config).to.have.property('traceId128BitGenerationEnabled', true)
     expect(config).to.have.property('traceId128BitLoggingEnabled', true)
-    expect(config).to.have.property('flattenIntegrationServiceNames', true)
+    expect(config).to.have.property('spanRemoveIntegrationFromService', true)
     expect(config).to.have.property('spanComputePeerService', true)
     expect(config).to.have.deep.property('peerServiceMapping', { d: 'dd' })
     expect(config).to.have.property('tags')
@@ -677,7 +677,7 @@ describe('Config', () => {
       },
       spanAttributeSchema: 'v1',
       spanComputePeerService: true,
-      flattenIntegrationServiceNames: true,
+      spanRemoveIntegrationFromService: true,
       peerServiceMapping: {
         d: 'dd'
       },
@@ -736,7 +736,7 @@ describe('Config', () => {
     expect(config.tags).to.include({ service: 'test', version: '1.0.0', env: 'development' })
     expect(config).to.have.deep.property('serviceMapping', { b: 'bb' })
     expect(config).to.have.property('spanAttributeSchema', 'v1')
-    expect(config).to.have.property('flattenIntegrationServiceNames', true)
+    expect(config).to.have.property('spanRemoveIntegrationFromService', true)
     expect(config).to.have.property('spanComputePeerService', true)
     expect(config).to.have.deep.property('peerServiceMapping', { d: 'dd' })
     expect(config).to.have.nested.deep.property('tracePropagationStyle.inject', [])

packages/dd-trace/test/setup/mocha.js

@@ -86,7 +86,7 @@ function withNamingSchema (spanProducerFn, expectedOpName, expectedServiceName,
         Nomenclature.configure({
           spanAttributeSchema: 'v0',
           service: fullConfig.service,
-          flattenIntegrationServiceNames: true
+          spanRemoveIntegrationFromService: true
         })
       })
       after(() => {