Change customSampler config to Sampler instead of function returning …

…a Sampler
thundra-io · Mar 14, 2019 · a68315d · a68315d
1 parent 3e1baf9
commit a68315d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/plugins/Trace.ts b/src/plugins/Trace.ts
@@ -188,8 +188,8 @@ export class Trace {
 
         const spanList = this.tracer.getRecorder().getSpanList();
         const sampled = (this.config && this.config.samplerConfig) ? this.config.samplerConfig.isSampled(this.rootSpan) : true;
-        const customSampler = (this.config && this.config.samplerConfig) ?
-            this.config.samplerConfig.createCustomSampler() : false;
+        const customSampler = (this.config && this.config.samplerConfig && this.config.samplerConfig.customSampler) ?
+                            this.config.samplerConfig.customSampler : false;
 
         if (sampled) {
             for (const span of spanList) {

diff --git a/src/plugins/config/TraceSamplerConfig.ts b/src/plugins/config/TraceSamplerConfig.ts
@@ -10,7 +10,7 @@ class TraceSamplerConfig {
     errorAwareSamplerConfig: ErrorAwareSamplerConfig;
     durationAwareSampler: DurationAwareSampler;
     errorAwareSampler: ErrorAwareSampler;
-    customSampler: () => Sampler<ThundraSpan>;
+    customSampler: Sampler<ThundraSpan>;
 
     constructor(options: any) {
         options = options ? options : {};
@@ -46,14 +46,6 @@ class TraceSamplerConfig {
 
         return isSampled;
     }
-
-    createCustomSampler(): Sampler<ThundraSpan> {
-        if (this.customSampler &&
-            typeof this.customSampler === 'function') {
-
-            return this.customSampler();
-        }
-    }
 }
 
 export default TraceSamplerConfig;