refactor: addressing additional review comments

Author: silva-fabio

packages/opencensus-instrumentation-http/src/http.ts

@@ -111,10 +111,10 @@ export class HttpPlugin extends classes.BasePlugin {
    * Creates spans for incoming requests, restoring spans' context if applied.
    */
   patchIncomingRequest() {
-    const plugin = this;
     // TODO: evaluate if this function should return RequestFunction
     return (original: RequestFunction):
                types.Func<httpModule.ClientRequest> => {
+      const plugin = this;
       return function incomingRequest(
                  event: string, request: httpModule.IncomingMessage,
                  response: httpModule.ServerResponse):
@@ -199,9 +199,9 @@ export class HttpPlugin extends classes.BasePlugin {
    * tracing.
    */
   patchOutgoingRequest() {
-    const plugin = this;
     return (original: types.Func<httpModule.ClientRequest>):
                types.Func<httpModule.ClientRequest> => {
+      const plugin = this;
       return function outgoingRequest(
                  options, callback): httpModule.ClientRequest {
         if (!options) {
@@ -229,7 +229,7 @@ export class HttpPlugin extends classes.BasePlugin {
         plugin.logger.debug('%s plugin outgoingRequest', plugin.moduleName);
         const traceOptions = {
           name:
-              `${request.method ? request.method : 'GET'}  ${options.pathname}`,
+              `${request.method ? request.method : 'GET'} ${options.pathname}`,
           type: 'CLIENT',
         };
 
@@ -252,6 +252,7 @@ export class HttpPlugin extends classes.BasePlugin {
     };
   }
 
+  // TODO: type of options shold be better define
   /**
    * Injects span's context to header for distributed tracing and finshes the
    * span when the response is finished.

packages/opencensus-instrumentation-http/test/test-http.ts

@@ -282,6 +282,7 @@ describe('HttpPlugin', () => {
     it('should not create a root span for incoming requests', async () => {
       plugin.applyUnpatch();
       const testPath = '/incoming/unpatch/';
+      nock.enableNetConnect();
 
       const options = {host: 'localhost', path: testPath, port: serverPort};
 

packages/opencensus-propagation-b3/src/b3-format.ts

@@ -62,10 +62,8 @@ export class B3Format implements types.Propagation {
    */
   inject(setter: types.HeaderSetter, spanContext: types.SpanContext): void {
     if (setter) {
-      setter.setHeader(
-          X_B3_TRACE_ID, spanContext && spanContext.traceId || 'undefined');
-      setter.setHeader(
-          X_B3_SPAN_ID, spanContext && spanContext.spanId || 'undefined');
+      setter.setHeader(X_B3_TRACE_ID, spanContext.traceId || 'undefined');
+      setter.setHeader(X_B3_SPAN_ID, spanContext.spanId || 'undefined');
       if (spanContext && (spanContext.options & SAMPLED_VALUE) !== 0) {
         setter.setHeader(X_B3_SAMPLED, `${SAMPLED_VALUE}`);
       } else {