wip

Author: tlhunter

packages/dd-trace/src/exporters/agent/writer.js

@@ -42,7 +42,7 @@ class Writer extends BaseWriter {
       startupLog({ agentError: err })
 
       if (err) {
-        log.error('Error sending payload to the agent (status code: %s)', err.status, err, log.MUTE)
+        log.error('Error sending payload to the agent (status code: %s)', err.status, err, log.NO_TELEMETRY)
         done()
         return
       }

packages/dd-trace/src/log/index.js

@@ -15,11 +15,11 @@ const config = {
   logLevel: 'debug'
 }
 
-const mute = new LogConfig(false)
+const NO_TRANSMIT = new LogConfig(false)
 
 const log = {
   LogConfig,
-  MUTE: mute,
+  NO_TRANSMIT,
 
   /**
    * @returns Read-only version of logging config. To modify config, call `log.use` and `log.toggle`
@@ -91,6 +91,7 @@ const log = {
   },
 
   error (...args) {
+    console.log('log.error', ...args)
     if (errorChannel.hasSubscribers) {
       errorChannel.publish(Log.parse(...args))
     }

packages/dd-trace/src/remote_config/manager.js

@@ -153,7 +153,7 @@ class RemoteConfigManager extends EventEmitter {
       if (statusCode === 404) return cb()
 
       if (err) {
-        log.error('[RC] Error in request', err, log.MUTE)
+        log.error('[RC] Error in request', err, log.NO_TELEMETRY)
         return cb()
       }
 

packages/dd-trace/src/telemetry/logs/log-collector.js

@@ -27,6 +27,7 @@ function createHash (logEntry) {
 }
 
 function isValid (logEntry) {
+  console.log('isValid', logEntry)
   return logEntry?.level && logEntry.message && logEntry.transmit !== false
 }
 

packages/dd-trace/test/exporters/agent/writer.spec.js

@@ -159,7 +159,7 @@ function describeWriter (protocolVersion) {
       setTimeout(() => {
         expect(log.error)
           .to.have.been.calledWith('Error sending payload to the agent (status code: %s)',
-            error.status, error, log.MUTE)
+            error.status, error, log.NO_TELEMETRY)
         done()
       })
     })

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

@@ -245,6 +245,16 @@ describe('log', () => {
         expect(console.error.secondCall.args[0]).to.be.instanceof(Error)
         expect(console.error.secondCall.args[0]).to.have.property('message', 'cause')
       })
+
+      it('should work with a log config object', () => {
+        log.error('this is an error', new Error('cause'), log.NO_TELEMETRY)
+
+        expect(console.error).to.have.been.called
+        expect(console.error.firstCall.args[0]).to.be.instanceof(Error)
+        expect(console.error.firstCall.args[0]).to.have.property('message', 'this is an error')
+        expect(console.error.secondCall.args[0]).to.be.instanceof(Error)
+        expect(console.error.secondCall.args[0]).to.have.property('message', 'cause')
+      })
     })
 
     describe('toggle', () => {