fix: allow override global trace params limits (#643)

census-instrumentation · Aug 27, 2019 · 0d9427b · 0d9427b
1 parent 2ae76c3
commit 0d9427b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 37 deletions.
diff --git a/packages/opencensus-core/src/trace/sampler/sampler.ts b/packages/opencensus-core/src/trace/sampler/sampler.ts
@@ -118,45 +118,26 @@ export class TraceParamsBuilder {
   static getNumberOfAnnotationEventsPerSpan(
     traceParameters: TraceParams
   ): number {
-    if (
-      !traceParameters.numberOfAnnontationEventsPerSpan ||
-      traceParameters.numberOfAnnontationEventsPerSpan >
-        DEFAULT_SPAN_MAX_NUM_ANNOTATIONS
-    ) {
-      return DEFAULT_SPAN_MAX_NUM_ANNOTATIONS;
-    }
-    return traceParameters.numberOfAnnontationEventsPerSpan;
+    return !traceParameters.numberOfAnnontationEventsPerSpan
+      ? DEFAULT_SPAN_MAX_NUM_ANNOTATIONS
+      : traceParameters.numberOfAnnontationEventsPerSpan;
   }
 
   static getNumberOfAttributesPerSpan(traceParameters: TraceParams): number {
-    if (
-      !traceParameters.numberOfAttributesPerSpan ||
-      traceParameters.numberOfAttributesPerSpan >
-        DEFAULT_SPAN_MAX_NUM_ATTRIBUTES
-    ) {
-      return DEFAULT_SPAN_MAX_NUM_ATTRIBUTES;
-    }
-    return traceParameters.numberOfAttributesPerSpan;
+    return !traceParameters.numberOfAttributesPerSpan
+      ? DEFAULT_SPAN_MAX_NUM_ATTRIBUTES
+      : traceParameters.numberOfAttributesPerSpan;
   }
 
   static getNumberOfMessageEventsPerSpan(traceParameters: TraceParams): number {
-    if (
-      !traceParameters.numberOfMessageEventsPerSpan ||
-      traceParameters.numberOfMessageEventsPerSpan >
-        DEFAULT_SPAN_MAX_NUM_MESSAGE_EVENTS
-    ) {
-      return DEFAULT_SPAN_MAX_NUM_MESSAGE_EVENTS;
-    }
-    return traceParameters.numberOfMessageEventsPerSpan;
+    return !traceParameters.numberOfMessageEventsPerSpan
+      ? DEFAULT_SPAN_MAX_NUM_MESSAGE_EVENTS
+      : traceParameters.numberOfMessageEventsPerSpan;
   }
 
   static getNumberOfLinksPerSpan(traceParameters: TraceParams): number {
-    if (
-      !traceParameters.numberOfLinksPerSpan ||
-      traceParameters.numberOfLinksPerSpan > DEFAULT_SPAN_MAX_NUM_LINKS
-    ) {
-      return DEFAULT_SPAN_MAX_NUM_LINKS;
-    }
-    return traceParameters.numberOfLinksPerSpan;
+    return !traceParameters.numberOfLinksPerSpan
+      ? DEFAULT_SPAN_MAX_NUM_LINKS
+      : traceParameters.numberOfLinksPerSpan;
   }
 }
diff --git a/packages/opencensus-core/test/test-tracer-base.ts b/packages/opencensus-core/test/test-tracer-base.ts
@@ -259,7 +259,7 @@ describe('Tracer Base', () => {
       );
     });
 
-    it('should create a tracer with default TraceParams when parameters with values higher than maximum limit are specified upon initialisation', () => {
+    it('should create a tracer with default TraceParams when parameters with values higher than limit are specified upon initialisation', () => {
       const traceParametersWithHigherThanMaximumValues: TraceParams = {
         numberOfAnnontationEventsPerSpan: 50,
         numberOfMessageEventsPerSpan: 200,
@@ -271,16 +271,16 @@ describe('Tracer Base', () => {
       tracer.start(defaultConfig);
       assert.strictEqual(
         tracer.activeTraceParams.numberOfAnnontationEventsPerSpan,
-        32
+        50
       );
       assert.strictEqual(
         tracer.activeTraceParams.numberOfAttributesPerSpan,
-        32
+        37
       );
-      assert.strictEqual(tracer.activeTraceParams.numberOfLinksPerSpan, 32);
+      assert.strictEqual(tracer.activeTraceParams.numberOfLinksPerSpan, 45);
       assert.strictEqual(
         tracer.activeTraceParams.numberOfMessageEventsPerSpan,
-        128
+        200
       );
     });
   });
@@ -382,6 +382,21 @@ describe('Tracer Base', () => {
         assert.strictEqual(rootSpan.allDescendants().length, 3);
       });
     });
+
+    it('should add attributes more than default limit when override', () => {
+      defaultConfig.traceParams = { numberOfAttributesPerSpan: 48 };
+      tracer.start(defaultConfig);
+      tracer.startRootSpan(options, rootSpan => {
+        const span = tracer.startChildSpan({
+          name: 'spanName',
+          childOf: rootSpan,
+        });
+        for (let i = 0; i < 40; i++) {
+          span.addAttribute(`attr ${i}`, i);
+        }
+        assert.strictEqual(Object.keys(span.attributes).length, 40);
+      });
+    });
   });
 
   /** Should not create a Span instance */
@@ -422,7 +437,7 @@ describe('Tracer Base', () => {
         });
       });
     });
-    it('should add add attributes to spans', () => {
+    it('should add attributes to spans', () => {
       assert.deepStrictEqual(
         rootSpanLocal.attributes,
         tracerConfig.defaultAttributes