Export trace key in logging-{winston,bunyan} (#2602)

* Export trace key in logging-{winston,bunyan}

* Fix var to const

Author: draffensperger

packages/logging-bunyan/src/index.js

@@ -271,3 +271,4 @@ LoggingBunyan.prototype._writev = function(chunks, callback) {
 
 module.exports = LoggingBunyan;
 module.exports.BUNYAN_TO_STACKDRIVER = BUNYAN_TO_STACKDRIVER;
+module.exports.LOGGING_TRACE_KEY = LOGGING_TRACE_KEY;

packages/logging-bunyan/test/index.js

@@ -233,9 +233,8 @@ describe('logging-bunyan', function() {
     });
 
     it('should promote prefixed trace property to metadata', function(done) {
-      var recordWithRequest = extend({
-        'logging.googleapis.com/trace': 'trace1'
-      }, RECORD);
+      const recordWithTrace = extend({}, RECORD);
+      recordWithTrace[LoggingBunyan.LOGGING_TRACE_KEY] = 'trace1';
 
       loggingBunyan.log_.entry = function(entryMetadata, record) {
         assert.deepStrictEqual(entryMetadata, {
@@ -248,7 +247,7 @@ describe('logging-bunyan', function() {
         done();
       };
 
-      loggingBunyan.formatEntry_(recordWithRequest);
+      loggingBunyan.formatEntry_(recordWithTrace);
     });
   });
 
@@ -285,9 +284,9 @@ describe('logging-bunyan', function() {
         getWriterProjectId: function() { return 'project1'; }
       };
       const recordWithoutTrace = extend({}, RECORD);
-      const recordWithTrace = extend({
-        'logging.googleapis.com/trace': 'projects/project1/traces/trace1'
-      }, RECORD);
+      const recordWithTrace = extend({}, RECORD);
+      recordWithTrace[LoggingBunyan.LOGGING_TRACE_KEY] =
+          'projects/project1/traces/trace1';
 
       FakeWritable.prototype.write = function(record, encoding, callback) {
         // Check that trace field added to record before calling Writable.write
@@ -306,14 +305,13 @@ describe('logging-bunyan', function() {
     });
 
     it('should leave prefixed trace property as is if set', function(done) {
-      var oldTraceAgent = global._google_trace_agent;
+      const oldTraceAgent = global._google_trace_agent;
       global._google_trace_agent = {
         getCurrentContextId: function() { return 'trace-from-agent'; },
         getWriterProjectId: function() { return 'project1'; }
       };
-      const recordWithTraceAlreadySet = extend({
-        'logging.googleapis.com/trace': 'trace-already-set'
-      }, RECORD);
+      const recordWithTraceAlreadySet = extend({}, RECORD);
+      recordWithTraceAlreadySet[LoggingBunyan.LOGGING_TRACE_KEY] = 'trace1';
 
       FakeWritable.prototype.write = function(record, encoding, callback) {
         assert.deepStrictEqual(record, recordWithTraceAlreadySet);

packages/logging-winston/src/index.js

@@ -249,4 +249,6 @@ LoggingWinston.prototype.log = function(levelName, msg, metadata, callback) {
   this.log_[stackdriverLevel](entry, callback);
 };
 
+LoggingWinston.LOGGING_TRACE_KEY = LOGGING_TRACE_KEY;
+
 module.exports = LoggingWinston;

packages/logging-winston/test/index.js

@@ -319,9 +319,8 @@ describe('logging-winston', function() {
     });
 
     it('should promote prefixed trace property to metadata', function(done) {
-      const metadataWithTrace = extend({
-        'logging.googleapis.com/trace': 'trace1'
-      }, METADATA);
+      const metadataWithTrace = extend({}, METADATA);
+      metadataWithTrace[LoggingWinston.LOGGING_TRACE_KEY] = 'trace1';
 
       loggingWinston.log_.entry = function(entryMetadata, data) {
         assert.deepStrictEqual(entryMetadata, {