change organization

Author: juan-fernandez

integration-tests/sci-embedding.spec.js

@@ -512,9 +512,9 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
     this.isGitUploadEnabled = this.isCiVisibility &&
       (this.isIntelligentTestRunnerEnabled && !isFalse(DD_CIVISIBILITY_GIT_UPLOAD_ENABLED))
 
-    this.isTraceGitMetadataEnabled = isTrue(DD_TRACE_GIT_METADATA_ENABLED)
+    this.gitMetadataEnabled = isTrue(DD_TRACE_GIT_METADATA_ENABLED)
 
-    if (this.isTraceGitMetadataEnabled) {
+    if (this.gitMetadataEnabled) {
       this.repositoryUrl = coalesce(
         process.env.DD_GIT_REPOSITORY_URL,
         this.tags[GIT_REPOSITORY_URL]

packages/dd-trace/src/config.js

@@ -0,0 +1,16 @@
+const { SCI_COMMIT_SHA, SCI_REPOSITORY_URL } = require('./constants')
+
+class GitMetadataTagger {
+  constructor (config) {
+    this._config = config
+  }
+
+  tagGitMetadata (spanContext) {
+    if (this._config.gitMetadataEnabled) {
+      spanContext._trace.tags[SCI_COMMIT_SHA] = this._config.commitSHA
+      spanContext._trace.tags[SCI_REPOSITORY_URL] = this._config.repositoryUrl
+    }
+  }
+}
+
+module.exports = GitMetadataTagger

packages/dd-trace/src/git_metadata_tagger.js

@@ -3,6 +3,7 @@
 const log = require('./log')
 const format = require('./format')
 const SpanSampler = require('./span_sampler')
+const GitMetadataTagger = require('./git_metadata_tagger')
 
 const { SpanStatsProcessor } = require('./span_stats')
 const { SCI_COMMIT_SHA, SCI_REPOSITORY_URL } = require('./constants')
@@ -19,24 +20,22 @@ class SpanProcessor {
 
     this._stats = new SpanStatsProcessor(config)
     this._spanSampler = new SpanSampler(config.sampler)
+    this._gitMetadataTagger = new GitMetadataTagger(config)
   }
 
   process (span) {
     const spanContext = span.context()
     const active = []
     const formatted = []
     const trace = spanContext._trace
-    const { flushMinSpans, isTraceGitMetadataEnabled } = this._config
+    const { flushMinSpans } = this._config
     const { started, finished } = trace
 
     if (trace.record === false) return
     if (started.length === finished.length || finished.length >= flushMinSpans) {
       this._prioritySampler.sample(spanContext)
       this._spanSampler.sample(spanContext)
-
-      if (isTraceGitMetadataEnabled) {
-        this.addRepositoryMetadata(started)
-      }
+      this._gitMetadataTagger.tagGitMetadata(spanContext)
 
       for (const span of started) {
         if (span._duration !== undefined) {
@@ -64,13 +63,6 @@ class SpanProcessor {
     }
   }
 
-  addRepositoryMetadata (spans) {
-    const { repositoryUrl, commitSHA } = this._config
-    const firstSpan = spans[0]
-    firstSpan.setTag(SCI_REPOSITORY_URL, repositoryUrl)
-    firstSpan.setTag(SCI_COMMIT_SHA, commitSHA)
-  }
-
   killAll () {
     this._killAll = true
   }

packages/dd-trace/src/span_processor.js

@@ -0,0 +1,58 @@
+'use strict'
+
+require('./setup/tap')
+
+const agent = require('./plugins/agent')
+const { SCI_COMMIT_SHA, SCI_REPOSITORY_URL } = require('../src/constants')
+
+const DUMMY_GIT_SHA = '13851f2b092e97acebab1b73f6c0e7818e795b50'
+const DUMMY_REPOSITORY_URL = '[email protected]:DataDog/sci_git_example.git'
+
+const oldEnv = process.env
+
+describe('dd-trace', () => {
+  let tracer
+
+  beforeEach(() => {
+    process.env = {
+      ...oldEnv,
+      DD_GIT_COMMIT_SHA: DUMMY_GIT_SHA,
+      DD_TAGS: `git.repository_url:${DUMMY_REPOSITORY_URL}`
+    }
+    tracer = require('../')
+    return agent.load()
+  })
+
+  afterEach(() => {
+    agent.close()
+  })
+
+  afterEach(() => {
+    process.env = oldEnv
+  })
+
+  it(`should include git metadata when using DD_GIT_* tags and DD_TAGS`, async () => {
+    const span = tracer.startSpan('hello', {
+      tags: {
+        'resource.name': '/hello/:name'
+      }
+    })
+
+    const childSpan = tracer.startSpan('world', {
+      childOf: span
+    })
+
+    childSpan.finish()
+    span.finish()
+
+    return agent.use((payload) => {
+      const firstSpan = payload[0][0]
+      expect(firstSpan.meta[SCI_COMMIT_SHA]).to.equal(DUMMY_GIT_SHA)
+      expect(firstSpan.meta[SCI_REPOSITORY_URL]).to.equal(DUMMY_REPOSITORY_URL)
+
+      const secondSpan = payload[0][1]
+      expect(secondSpan.meta[SCI_COMMIT_SHA]).not.to.exist
+      expect(secondSpan.meta[SCI_REPOSITORY_URL]).not.to.exist
+    })
+  })
+})