Fix strategyType (#110)

jaegertracing · Apr 18, 2017 · b830e0f · b830e0f
1 parent caac859
commit b830e0f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/src/_flow/sampler-thrift.js b/src/_flow/sampler-thrift.js
@@ -44,7 +44,7 @@ declare type PerOperationSamplingStrategies = {
 }
 
 declare type SamplingStrategyResponse = {
-    strategyType: number,
+    strategyType: string,
     probabilisticSampling?: ProbabilisticSamplingStrategy,
     rateLimitingSampling?: RateLimitingSamplingStrategy,
     operationSampling?: PerOperationSamplingStrategies

diff --git a/src/configuration.js b/src/configuration.js
@@ -18,10 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import SpanContext from './span_context';
-import Span from './span';
 import ConstSampler from './samplers/const_sampler';
-import InMemoryReporter from './reporters/in_memory_reporter';
 import ProbabilisticSampler from './samplers/probabilistic_sampler';
 import RateLimitingSampler from './samplers/ratelimiting_sampler';
 import RemoteReporter from './reporters/remote_reporter';
@@ -155,16 +152,18 @@ export default class Configuration {
      *        as process-level tags on the Tracer itself.
      */
     static initTracer(config, options = {}) {
-        let reporters = [];
         let reporter;
         let sampler;
+        if (options.metrics) {
+            options.metrics = new Metrics(options.metrics);
+        }
         if (config.disable) {
             return new opentracing.Tracer();
         } else {
             if (config.sampler) {
                 sampler = Configuration._getSampler(config);
             } else {
-                sampler = new RemoteSampler(config.serviceName);
+                sampler = new RemoteSampler(config.serviceName, options);
             }
 
             if (!options.reporter) {
@@ -180,17 +179,12 @@ export default class Configuration {
             );
         }
 
-        var metrics = null;
-        if (options.metrics) {
-            metrics = new Metrics(options.metrics);
-        }
-
         return new Tracer(
             config.serviceName,
             reporter,
             sampler,
             {
-                metrics: metrics,
+                metrics: options.metrics,
                 logger: options.logger,
                 tags: options.tags
             }

diff --git a/src/samplers/remote_sampler.js b/src/samplers/remote_sampler.js
@@ -32,8 +32,8 @@ const DEFAULT_REFRESH_INTERVAL = 60000;
 const DEFAULT_MAX_OPERATIONS = 2000;
 const DEFAULT_SAMPLING_HOST = '0.0.0.0';
 const DEFAULT_SAMPLING_PORT = 5778;
-const PROBABILISTIC_STRATEGY_TYPE = 0;
-const RATELIMITING_STRATEGY_TYPE = 1;
+const PROBABILISTIC_STRATEGY_TYPE = 'PROBABILISTIC';
+const RATELIMITING_STRATEGY_TYPE = 'RATE_LIMITING';
 
 export default class RemoteControlledSampler {
 

diff --git a/test/samplers/remote_sampler.js b/test/samplers/remote_sampler.js
@@ -114,7 +114,7 @@ describe('RemoteSampler', () => {
             remoteSampler._refreshSamplingStrategy();
         };
         server.addStrategy('service1', {
-            strategyType: 0,
+            strategyType: 'PROBABILISTIC',
             probabilisticSampling: {
                 samplingRate: 1.0
             }
@@ -129,7 +129,7 @@ describe('RemoteSampler', () => {
             done();
         };
         server.addStrategy('service1', {
-            strategyType: 1,
+            strategyType: 'RATE_LIMITING',
             rateLimitingSampling: {
                 maxTracesPerSecond: maxTracesPerSecond
             }
@@ -139,7 +139,7 @@ describe('RemoteSampler', () => {
 
     it('should set per-operation sampler', (done) => {
         server.addStrategy('service1', {
-            strategyType: 0,
+            strategyType: 'PROBABILISTIC',
             probabilisticSampling: {
                 samplingRate: 1.0
             },
@@ -168,7 +168,7 @@ describe('RemoteSampler', () => {
 
     it('should refresh periodically', (done) => {
         server.addStrategy('service1', {
-            strategyType: 0,
+            strategyType: 'PROBABILISTIC',
             probabilisticSampling: {
                 samplingRate: 0.777
             }