Make tracing configurable via globals

- define settings for jaeger url, enabling/disabling and sampling probability in globals
- have tracing disabled by default

Issue-ID: AAI-4152
Change-Id: I061ac681fc4dcb079a326d0c58dd5160255955c4
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

2 files changed, 9 insertions, 6 deletions

diff --git a/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties b/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
index 004a9909ab..248e5bf4ec 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
+++ b/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
@@ -197,12 +197,13 @@ blueprintprocessor.k8s.plugin.url=http://multicloud-k8s:9015/
 blueprintsprocessor.workflow.self-service-api.audit.storeEnable={{ .Values.workflow.storeEnabled }}
 
 #Tracing
-spring.zipkin.baseUrl={{ .Values.tracing.collector.baseUrl }}
+spring.sleuth.enabled={{ .Values.global.tracing.enabled }}
+spring.zipkin.baseUrl={{ .Values.global.tracing.collector.baseUrl }}
 spring.zipkin.checkTimeout=5000
 spring.zipkin.service.name={{ include "common.name" . }}
 spring.sleuth.messaging.jms.enabled=false
 spring.sleuth.trace-id128=true
-spring.sleuth.sampler.probability={{ .Values.tracing.sampling.probability }}
+spring.sleuth.sampler.probability={{ .Values.global.tracing.sampling.probability }}
 spring.sleuth.propagation.type=w3c, b3
 spring.sleuth.supports-join=false
 spring.sleuth.web.skip-pattern={{ join "," .Values.tracing.ignorePatterns }}
diff --git a/kubernetes/cds/components/cds-blueprints-processor/values.yaml b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
index 469e40f4bd..549a44f986 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
@@ -36,6 +36,12 @@ global:
   # This configuration specifies Service and port for SDNC OAM interface
   sdncOamService: sdnc-oam
   sdncOamPort: 8282
+  tracing:
+    enabled: false
+    collector:
+      baseUrl: http://jaeger-collector.istio-config:9411
+    sampling:
+      probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%)
   # This concerns CDS/AAI communication through HTTP when TLS is not being needed
   # Port value should match the one in aai/values.yml : service.externalPlainPort
   aaiData:
@@ -244,9 +250,5 @@ workflow:
   storeEnabled: false
 
 tracing:
-  collector:
-    baseUrl: http://jaeger-collector.istio-system:9411
-  sampling:
-    probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%)
   ignorePatterns:
     - .*/execution-service/health-check