push changes

Author: khanayan123

.vscode/settings.json

@@ -1,2 +0,0 @@
-{
-}

package.json

@@ -23,7 +23,7 @@
     "test:appsec:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/src/appsec/**/*.js\" -- npm run test:appsec:plugins",
     "test:debugger": "mocha -r 'packages/dd-trace/test/setup/mocha.js' 'packages/dd-trace/test/debugger/**/*.spec.js'",
     "test:debugger:ci": "nyc --no-clean --include 'packages/dd-trace/src/debugger/**/*.js' -- npm run test:debugger",
-    "test:trace:core": "tap packages/dd-trace/test/encode/0.5.spec.js",
+    "test:trace:core": "tap packages/dd-trace/test/tagger.spec.js",
     "test:trace:core:ci": "npm run test:trace:core -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/**/*.js\"",
     "test:instrumentations": "mocha -r 'packages/dd-trace/test/setup/mocha.js' 'packages/datadog-instrumentations/test/**/*.spec.js'",
     "test:instrumentations:ci": "nyc --no-clean --include 'packages/datadog-instrumentations/src/**/*.js' -- npm run test:instrumentations",

packages/dd-trace/src/tagger.js

@@ -21,7 +21,7 @@ function add (carrier, keyValuePairs, parseOtelTags = false) {
   try {
     if (typeof keyValuePairs === 'string') {
       // split on comma or whitespace
-      const segments = keyValuePairs.split(/[ ,]+/)
+      const segments = keyValuePairs.split(keyValuePairs.includes(',') ? ',' : ' ')
       for (const segment of segments) {
         const separatorIndex = parseOtelTags ? segment.indexOf('=') : segment.indexOf(':')
         if (separatorIndex === -1) continue

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

@@ -299,6 +299,24 @@ describe('format', () => {
       })
     })
 
+    it('should extract empty tags', () => {
+      spanContext._trace.tags = {
+        foo: '',
+        count: 1
+      }
+
+      trace = format(span)
+
+      expect(trace.meta).to.include({
+        foo: ''
+      })
+
+      expect(trace.metrics).to.include({
+        count: 1
+      })
+    })
+
+
     it('should discard user-defined tags with name HOSTNAME_KEY by default', () => {
       spanContext._tags[HOSTNAME_KEY] = 'some_hostname'
 

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

@@ -54,6 +54,13 @@ describe('tagger', () => {
     expect(carrier).to.have.property('cKey', '')
   })
 
+  it('should add tags from space separated string3', () => {
+    tagger.add(carrier, 'env:test,aKey:aVal bKey:bVal cKey:')
+
+    expect(carrier).to.have.property('env', 'test')
+    expect(carrier).to.have.property('aKey', 'aVal bKey:bVal cKey:')
+  })
+
   it('should add tags as an array', () => {
     tagger.add(carrier, ['foo:bar', 'baz:qux'])