logging: allow for encoding options

callmehiphop · callmehiphop · commit 54bb503307ae · 2016-07-13T11:56:12.000-04:00
diff --git a/lib/logging/entry.js b/lib/logging/entry.js
@@ -133,7 +133,7 @@ Entry.fromApiResponse_ = function(entry) {
  *
  * @private
  */
-Entry.prototype.toJSON = function() {
+Entry.prototype.toJSON = function(options) {
   var entry = extend(true, {}, this);
 
   var whitelist = [
@@ -160,9 +160,9 @@ Entry.prototype.toJSON = function() {
   }
 
   if (is.object(this.data)) {
-    entry.jsonPayload = GrpcService.objToStruct_(this.data, {
+    entry.jsonPayload = GrpcService.objToStruct_(this.data, extend({
       serialize: true
-    });
+    }, options));
   } else if (is.string(this.data)) {
     entry.textPayload = this.data;
   }
diff --git a/lib/logging/log.js b/lib/logging/log.js
@@ -474,6 +474,8 @@ Log.prototype.warning = function(entry, options, callback) {
  * log.write(entries, options, function(err, apiResponse) {});
  */
 Log.prototype.write = function(entry, options, callback) {
+  var self = this;
+
   if (is.fn(options)) {
     callback = options;
     options = {};
@@ -486,9 +488,13 @@ Log.prototype.write = function(entry, options, callback) {
 
   var reqOpts = extend({
     logName: this.formattedName_,
-    entries: arrify(entry).map(this.formatEntryForApi_.bind(this))
+    entries: arrify(entry).map(function(entry) {
+      return self.formatEntryForApi_(entry, options.encoding);
+    })
   }, options);
 
+  delete reqOpts.encoding;
+
   this.request(protoOpts, reqOpts, function(err, resp) {
     callback(err, resp);
   });
@@ -502,12 +508,12 @@ Log.prototype.write = function(entry, options, callback) {
  *
  * @param {object} entry - An entry object.
  */
-Log.prototype.formatEntryForApi_ = function(entry) {
+Log.prototype.formatEntryForApi_ = function(entry, options) {
   if (!(entry instanceof Entry)) {
     entry = this.entry(entry);
   }
 
-  var formattedEntry = entry.toJSON();
+  var formattedEntry = entry.toJSON(options);
   formattedEntry.logName = this.formattedName_;
   return formattedEntry;
 };
diff --git a/system-test/logging.js b/system-test/logging.js
@@ -347,14 +347,18 @@ describe('Logging', function() {
       });
     });
 
-    it('should write an entry with primitive values', function(done) {
+    it('should stringify unknown value types', function(done) {
       var logEntry = log.entry({
         when: new Date(),
         matchUser: /username: (.+)/,
         matchUserError: new Error('No user found.'),
         shouldNotBeSaved: undefined
       });
 
+      options.encoding = {
+        stringify: true
+      };
+
       log.write(logEntry, options, function(err) {
         assert.ifError(err);
 

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ Entry.fromApiResponse_ = function(entry) {`
`133`	`133`	`*`
`134`	`134`	`* @private`
`135`	`135`	`*/`
`136`		`-Entry.prototype.toJSON = function() {`
	`136`	`+Entry.prototype.toJSON = function(options) {`
`137`	`137`	`var entry = extend(true, {}, this);`
`138`	`138`
`139`	`139`	`var whitelist = [`
`@@ -160,9 +160,9 @@ Entry.prototype.toJSON = function() {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`if (is.object(this.data)) {`
`163`		`- entry.jsonPayload = GrpcService.objToStruct_(this.data, {`
	`163`	`+ entry.jsonPayload = GrpcService.objToStruct_(this.data, extend({`
`164`	`164`	`serialize: true`
`165`		`- });`
	`165`	`+ }, options));`
`166`	`166`	`} else if (is.string(this.data)) {`
`167`	`167`	`entry.textPayload = this.data;`
`168`	`168`	`}`