Allow configuring http client timeout

README.md

@@ -67,6 +67,7 @@ None of the env vars are required and all of them can be overridden via properti
 | JAEGER_PASSWORD                  | Password to send as part of "Basic" authentication to the collector endpoint                                                                                                                                                                                                                                     |
 | JAEGER_REPORTER_LOG_SPANS        | Whether the reporter should also log the spans                                                                                                                                                                                                                                                                   |
 | JAEGER_REPORTER_FLUSH_INTERVAL   | The reporter's flush interval (ms)                                                                                                                                                                                                                                                                               |
+| JAEGER_REPORTER_TIMEOUT          | The reporter's http timeout (ms)                                                                                                                                                                                                                                                                                 |
 | JAEGER_SAMPLER_TYPE              | The sampler type                                                                                                                                                                                                                                                                                                 |
 | JAEGER_SAMPLER_PARAM             | The sampler parameter (number)                                                                                                                                                                                                                                                                                   |
 | JAEGER_SAMPLER_MANAGER_HOST_PORT | The HTTP endpoint when using the remote sampler, i.e. http://jaeger-agent:5778/sampling                                                                                                                                                                                                                          |

src/configuration.js

@@ -54,6 +54,7 @@ let jaegerSchema = {
         username: { type: 'string' },
         password: { type: 'string' },
         flushIntervalMs: { type: 'number' },
+        timeoutMs: { type: 'number' },
       },
       additionalProperties: false,
     },
@@ -136,6 +137,9 @@ export default class Configuration {
         if (config.reporter.password) {
           senderConfig['password'] = config.reporter.password;
         }
+        if (config.reporter.timeoutMs) {
+          senderConfig[ 'timeoutMs' ] = config.reporter.timeoutMs;
+        }
       }
       if (config.reporter.agentHost) {
         senderConfig['host'] = config.reporter.agentHost;

src/configuration_env.js

@@ -140,6 +140,15 @@ export default class ConfigurationEnv {
       reporterConfig.agentHost = value;
     }
 
+    value = ConfigurationEnv._getConfigValue(
+      config.reporter,
+      'timeoutMs',
+      process.env.JAEGER_REPORTER_TIMEOUT
+    );
+    if (value) {
+      reporterConfig.timeoutMs = parseInt(value);
+    }
+
     value = ConfigurationEnv._getConfigValue(
       config.reporter,
       'agentPort',

src/reporters/http_sender.js

@@ -32,7 +32,7 @@ export default class HTTPSender {
   _username: string;
   _password: string;
   _emitSpanBatchOverhead: number;
-  _timeoutMS: number;
+  _timeoutMs: number;
   _httpAgent: http$Agent;
   _logger: Logger;
   _jaegerThrift: Thrift;
@@ -46,7 +46,7 @@ export default class HTTPSender {
     this._url = URL.parse(options.endpoint);
     this._username = options.username;
     this._password = options.password;
-    this._timeoutMS = options.timeoutMS || DEFAULT_TIMEOUT_MS;
+    this._timeoutMs = options.timeoutMs || options.timeoutMS || DEFAULT_TIMEOUT_MS;
     this._httpAgent =
       this._url.protocol === 'https:'
         ? new https.Agent({ keepAlive: true })
@@ -72,7 +72,7 @@ export default class HTTPSender {
         Connection: 'keep-alive',
       },
       agent: this._httpAgent,
-      timeout: this._timeoutMS,
+      timeout: this._timeoutMs,
     };
   }
 

test/http_sender.js

@@ -219,6 +219,17 @@ describe('http sender', () => {
     });
   });
 
+  it('should use timeout provided', done => {
+    sender = new HTTPSender({
+      endpoint: serverEndpoint,
+      timeoutMs: 20,
+    });
+    sender.setProcess(reporter._process);
+
+    assert.equal(sender._timeoutMs, 20);
+    done();
+  });
+
   it('should returns error from flush() on failed buffer conversion', done => {
     let span = tracer.startSpan('leela');
     span.finish(); // finish to set span duration

test/init_tracer.js

@@ -183,6 +183,7 @@ describe('initTracer', () => {
             username: protocol === 'https' ? 'test' : undefined,
             password: protocol === 'https' ? 'mypass' : undefined,
             flushIntervalMs: 2000,
+            timeoutMs: 225,
           },
         };
         let tracer = initTracer(config);
@@ -198,6 +199,7 @@ describe('initTracer', () => {
         }
 
         assert.equal(url.format(remoteReporter._sender._url), `${protocol}://127.0.0.1:4939/my/path`);
+        assert.equal(remoteReporter._sender._timeoutMs, 225);
         assert.instanceOf(remoteReporter._sender, HTTPSender);
         tracer.close(done);
       });
@@ -502,6 +504,7 @@ describe('initTracerFromENV', () => {
     process.env.JAEGER_SERVICE_NAME = 'test-service';
     process.env.JAEGER_REPORTER_FLUSH_INTERVAL = 3000;
     process.env.JAEGER_REPORTER_ENDPOINT = 'http://127.0.0.1:8080';
+    process.env.JAEGER_REPORTER_TIMEOUT = 225;
     process.env.JAEGER_REPORTER_USER = 'test';
     process.env.JAEGER_REPORTER_PASSWORD = 'xxxx';
 
@@ -512,6 +515,7 @@ describe('initTracerFromENV', () => {
     assert.equal(tracer._reporter._sender._url.href, 'http://127.0.0.1:8080/');
     assert.equal(tracer._reporter._sender._username, 'test');
     assert.equal(tracer._reporter._sender._password, 'xxxx');
+    assert.equal(tracer._reporter._sender._timeoutMs, 225);
 
     tracer.close(done);
   });