Merge pull request #7 from ExpediaDotCom/bug-fix-callback

bug fix

Author: shreyaa-sharma

src/dispatchers/remote.ts

@@ -28,6 +28,8 @@ export default class RemoteDispatcher implements Dispatcher {
 
     constructor(agentHost: string, agentPort: number, logger = new NullLogger()) {
         logger.info(`Initializing the remote dispatcher, connecting at ${agentHost}:${agentPort}`);
+        agentHost = agentHost || 'haystack-agent';
+        agentPort = agentPort || 35000;
         this._client = new services.SpanAgentClient(`${agentHost}:${agentPort}`, grpc.credentials.createInsecure());
         this._logger = logger;
     }
@@ -39,17 +41,19 @@ export default class RemoteDispatcher implements Dispatcher {
     dispatch(span: Span, callback: (error) => void): void {
         const proto = this._convertToProtoSpan(span);
         this._client.dispatch(proto, (err, response) => {
-            if (this._logger) {
-                if (err) {
+            if (err) {
+                if (this._logger) {
                     this._logger.error(`Fail to dispatch span to haystack-agent ${err.toString()}`);
-                    if (callback) {
-                        callback(new Error(err));
-                    }
-                } else {
+                }
+                if (callback) {
+                    callback(new Error(err));
+                }
+            } else {
+                if (this._logger) {
                     this._logger.debug(`grpc response code from haystack-agent - ${response.getCode()}`);
-                    if (callback) {
-                        callback(null);
-                    }
+                }
+                if (callback) {
+                    callback(null);
                 }
             }
         });