From 5c5a72e4a2fffa66c916ca413c3428911704f46b Mon Sep 17 00:00:00 2001
From: Kelvin Jin <kelvinjin@google.com>
Date: Thu, 6 Sep 2018 10:16:58 -0700
Subject: [PATCH] fix: pass spread args instead of args; add tests

---
 src/logger.ts                            | 10 +++++-----
 test/logger.ts                           |  2 +-
 test/plugins/common.ts                   |  4 ++--
 test/test-env-log-level.ts               |  4 +---
 test/test-modules-loaded-before-agent.ts |  1 -
 test/trace.ts                            |  1 -
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/logger.ts b/src/logger.ts
index a45bc1034..d1abc332b 100644
--- a/src/logger.ts
+++ b/src/logger.ts
@@ -65,32 +65,32 @@ export class Logger {
 
     this.logger = consoleLogLevel({
       stderr: true,
-      prefix: opts && opts.tag ? opts.tag : '@google-cloud/trace-agent',
+      prefix: opts && opts.tag ? opts.tag : 'unknown',
       level: levelName as ConsoleLogLevel
     });
   }
 
   error(...args: Array<{}>): void {
     if (this.logger) {
-      this.logger.error(args);
+      this.logger.error(...args);
     }
   }
 
   warn(...args: Array<{}>): void {
     if (this.logger) {
-      this.logger.warn(args);
+      this.logger.warn(...args);
     }
   }
 
   debug(...args: Array<{}>): void {
     if (this.logger) {
-      this.logger.debug(args);
+      this.logger.debug(...args);
     }
   }
 
   info(...args: Array<{}>): void {
     if (this.logger) {
-      this.logger.info(args);
+      this.logger.info(...args);
     }
   }
 }
diff --git a/test/logger.ts b/test/logger.ts
index 64f326db6..c041f84f9 100644
--- a/test/logger.ts
+++ b/test/logger.ts
@@ -32,7 +32,7 @@ export class TestLogger extends Logger {
       new OriginalLogger({level: LEVELS[PASS_THROUGH_LOG_LEVEL]});
 
   constructor(options?: Partial<LoggerConfig>) {
-    super(options);
+    super(Object.assign({tag: '@google-cloud/trace-agent'}, options));
   }
 
   private makeLoggerFn(logLevel: keyof Logger): LoggerFunction<this> {
diff --git a/test/plugins/common.ts b/test/plugins/common.ts
index 11cdb118f..96810ab26 100644
--- a/test/plugins/common.ts
+++ b/test/plugins/common.ts
@@ -30,10 +30,10 @@ import { StackdriverTracer } from '../../src/trace-api';
 import { traceWriter } from '../../src/trace-writer';
 import * as TracingPolicy from '../../src/tracing-policy';
 import { SpanType } from '../../src/constants';
+import { TestLogger } from '../logger';
 
 var semver = require('semver');
 
-var logger = require('@google-cloud/common').logger;
 var trace = require('../../..');
 if (semver.satisfies(process.version, '>=8')) {
   // Monkeypatch Mocha's it() to create a fresh context with each test case.
@@ -75,7 +75,7 @@ shimmer.wrap(trace, 'start', function(original) {
       ignoreContextHeader: false,
       rootSpanNameOverride: (name: string) => name,
       samplingRate: 0
-    }, logger());
+    }, new TestLogger());
     testTraceAgent.policy = new TracingPolicy.TraceAllPolicy();
     return result;
   };
diff --git a/test/test-env-log-level.ts b/test/test-env-log-level.ts
index 16e1adb25..4b92b9864 100644
--- a/test/test-env-log-level.ts
+++ b/test/test-env-log-level.ts
@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
-import * as common from '@google-cloud/common';
 import * as assert from 'assert';
 import * as shimmer from 'shimmer';
 
 import * as logger from '../src/logger';
-import {FORCE_NEW} from '../src/util';
 
 import {TestLogger} from './logger';
 import * as traceTestModule from './trace';
@@ -69,6 +67,6 @@ describe('should respect environment variables', () => {
     assert.strictEqual(logLevel, logger.LEVELS[0]);
     process.env.GCLOUD_TRACE_LOGLEVEL = '300';
     traceTestModule.start();
-    assert.strictEqual(logLevel, logger.LEVELS[5]);
+    assert.strictEqual(logLevel, logger.LEVELS[4]);
   });
 });
diff --git a/test/test-modules-loaded-before-agent.ts b/test/test-modules-loaded-before-agent.ts
index 7806b3a28..74dcaf935 100644
--- a/test/test-modules-loaded-before-agent.ts
+++ b/test/test-modules-loaded-before-agent.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import * as common from '@google-cloud/common';
 import * as assert from 'assert';
 import * as shimmer from 'shimmer';
 
diff --git a/test/trace.ts b/test/trace.ts
index e14143f0a..8b519e585 100644
--- a/test/trace.ts
+++ b/test/trace.ts
@@ -34,7 +34,6 @@
  * Most tests should include this file instead of the main module root.
  */
 
-import * as common from '@google-cloud/common';
 import * as assert from 'assert';
 import * as shimmer from 'shimmer';