Add env vars for tracing (enabled + propability)

feature-creeps · Oct 11, 2023 · b862056 · b862056
1 parent 05fbe6a
commit b862056
Show file tree

Hide file tree

Showing 21 changed files with 42 additions and 23 deletions.
diff --git a/stack/application/imageflip/src/main/resources/application.properties b/stack/application/imageflip/src/main/resources/application.properties
@@ -9,8 +9,8 @@ spring.data.mongodb.database=imageflip
 server.error.whitelabel.enabled=false
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
-management.tracing.enabled=true
-management.tracing.sampling.probability=1.0
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
 management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 honeycomb.beeline.service-name=imageflip
 honeycomb.beeline.dataset=${HONEYCOMB_DATASET:workshop}

diff --git a/stack/application/imagegrayscale/src/main/resources/application.properties b/stack/application/imagegrayscale/src/main/resources/application.properties
@@ -6,8 +6,8 @@ server.error.whitelabel.enabled=false
 spring.application.name=imagegrayscale
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
-management.tracing.enabled=true
-management.tracing.sampling.probability=1.0
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
 management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 honeycomb.beeline.service-name=imagegrayscale
 honeycomb.beeline.dataset=${HONEYCOMB_DATASET:workshop}

diff --git a/stack/application/imageholder/src/main/resources/application.properties b/stack/application/imageholder/src/main/resources/application.properties
@@ -9,8 +9,8 @@ spring.data.mongodb.port=${MONGODB_PORT:27017}
 spring.data.mongodb.database=imageholder
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
-management.tracing.enabled=true
-management.tracing.sampling.probability=1.0
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
 management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 #logging.pattern.console=%date{"yyyy-MM-dd'T'HH:mm:ss.SSSZ", UTC} %5p %t %c{5}:%L [log_framework=logback;app_name=${APP_NAME};app_version=${APP_VERSION};instance_id=${CF_INSTANCE_INDEX}] %m MULTIEXCEPTION %replace(%xException){'\n','\u2028'}%nopex%n</pattern>
 honeycomb.beeline.service-name=imageholder

diff --git a/stack/application/imageorchestrator/src/main/resources/application.properties b/stack/application/imageorchestrator/src/main/resources/application.properties
@@ -7,8 +7,8 @@ spring.application.name=imageorchestrator
 spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
-management.tracing.enabled=true
-management.tracing.sampling.probability=1.0
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
 management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 #logging.pattern.console=%date{"yyyy-MM-dd'T'HH:mm:ss.SSSZ", UTC} %5p %t %c{5}:%L [log_framework=logback;app_name=${APP_NAME};app_version=${APP_VERSION};instance_id=${CF_INSTANCE_INDEX}] %m MULTIEXCEPTION %replace(%xException){'\n','\u2028'}%nopex%n</pattern>
 honeycomb.beeline.service-name=imageorchestrator

diff --git a/stack/application/imageresize/src/main/resources/application.properties b/stack/application/imageresize/src/main/resources/application.properties
@@ -9,8 +9,8 @@ spring.data.mongodb.port=27017
 spring.data.mongodb.database=imageresize
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
-management.tracing.enabled=true
-management.tracing.sampling.probability=1.0
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
 management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 #logging.pattern.console=%date{"yyyy-MM-dd'T'HH:mm:ss.SSSZ", UTC} %5p %t %c{5}:%L [log_framework=logback;app_name=${APP_NAME};app_version=${APP_VERSION};instance_id=${CF_INSTANCE_INDEX}] %m MULTIEXCEPTION %replace(%xException){'\n','\u2028'}%nopex%n</pattern>
 honeycomb.beeline.service-name=imageresize

diff --git a/stack/application/imagerotator/src/main/resources/application.properties b/stack/application/imagerotator/src/main/resources/application.properties
@@ -9,8 +9,8 @@ spring.data.mongodb.port=27017
 spring.data.mongodb.database=imagerotator
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
-management.tracing.enabled=true
-management.tracing.sampling.probability=1.0
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
 management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 #logging.pattern.console=%date{"yyyy-MM-dd'T'HH:mm:ss.SSSZ", UTC} %5p %t %c{5}:%L [log_framework=logback;app_name=${APP_NAME};app_version=${APP_VERSION};instance_id=${CF_INSTANCE_INDEX}] %m MULTIEXCEPTION %replace(%xException){'\n','\u2028'}%nopex%n</pattern>
 honeycomb.beeline.service-name=imagerotator

diff --git a/stack/application/imagethumbnail/src/main/resources/application.properties b/stack/application/imagethumbnail/src/main/resources/application.properties
@@ -9,8 +9,8 @@ spring.data.mongodb.port=27017
 spring.data.mongodb.database=imagethumbnail
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
-management.tracing.enabled=true
-management.tracing.sampling.probability=1.0
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
 management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 #logging.pattern.console=%date{"yyyy-MM-dd'T'HH:mm:ss.SSSZ", UTC} %5p %t %c{5}:%L [log_framework=logback;app_name=${APP_NAME};app_version=${APP_VERSION};instance_id=${CF_INSTANCE_INDEX}] %m MULTIEXCEPTION %replace(%xException){'\n','\u2028'}%nopex%n</pattern>
 honeycomb.beeline.service-name=imagethumbnail

diff --git a/stack/application/trafficgen/src/main/resources/application.properties b/stack/application/trafficgen/src/main/resources/application.properties
@@ -7,8 +7,8 @@ spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
 spring.application.name=trafficgen
 spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration
-management.tracing.enabled=true
-management.tracing.sampling.probability=1.0
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
 management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 honeycomb.beeline.service-name=trafficgen
 honeycomb.beeline.dataset=${HONEYCOMB_DATASET:workshop}

diff --git a/stack/kubernetes/application/charts/imageflip/values.yaml b/stack/kubernetes/application/charts/imageflip/values.yaml
@@ -10,4 +10,5 @@ ingress:
   host: o11y.fans
 
 tracing:
-  enabled: true
+  enabled: true
+  samplingPropability: 1.0
diff --git a/stack/kubernetes/application/charts/imagegrayscale/templates/deployment.yaml b/stack/kubernetes/application/charts/imagegrayscale/templates/deployment.yaml
@@ -44,6 +44,8 @@ spec:
           value: "true"
         - name: TRACING_ENABLED
           value: {{ .Values.tracing.enabled | quote }}
+        - name: TRACING_SAMPLING_PROPABILITY
+          value: {{ .Values.tracing.samplingPropability | quote }}
         - name: SPRING_ZIPKIN_ENDPOINT
           value: {{ .Values.global.tracing.endpoint }}
         - name: APM_ENABLED

diff --git a/stack/kubernetes/application/charts/imagegrayscale/values.yaml b/stack/kubernetes/application/charts/imagegrayscale/values.yaml
@@ -9,4 +9,5 @@ ingress:
   host: o11y.fans
 
 tracing:
-  enabled: true
+  enabled: true
+  samplingPropability: 1.0
diff --git a/stack/kubernetes/application/charts/imageholder/templates/deployment.yaml b/stack/kubernetes/application/charts/imageholder/templates/deployment.yaml
@@ -48,6 +48,8 @@ spec:
           value: "true"
         - name: TRACING_ENABLED
           value: {{ .Values.tracing.enabled | quote }}
+        - name: TRACING_SAMPLING_PROPABILITY
+          value: {{ .Values.tracing.samplingPropability | quote }}
         - name: SPRING_ZIPKIN_ENDPOINT
           value: {{ .Values.global.tracing.endpoint }}
         - name: APM_ENABLED

diff --git a/stack/kubernetes/application/charts/imageholder/values.yaml b/stack/kubernetes/application/charts/imageholder/values.yaml
@@ -13,4 +13,5 @@ mongodb:
   port: 27017
 
 tracing:
-  enabled: true
+  enabled: true
+  samplingPropability: 1.0
diff --git a/stack/kubernetes/application/charts/imageorchestrator/templates/deployment.yaml b/stack/kubernetes/application/charts/imageorchestrator/templates/deployment.yaml
@@ -44,6 +44,8 @@ spec:
           value: "true"
         - name: TRACING_ENABLED
           value: {{ .Values.tracing.enabled | quote }}
+        - name: TRACING_SAMPLING_PROPABILITY
+          value: {{ .Values.tracing.samplingPropability | quote }}
         - name: SPRING_ZIPKIN_ENDPOINT
           value: {{ .Values.global.tracing.endpoint }}
         - name: APM_ENABLED

diff --git a/stack/kubernetes/application/charts/imageorchestrator/values.yaml b/stack/kubernetes/application/charts/imageorchestrator/values.yaml
@@ -10,4 +10,5 @@ ingress:
   host: o11y.fans
 
 tracing:
-  enabled: true
+  enabled: true
+  samplingPropability: 1.0
diff --git a/stack/kubernetes/application/charts/imageresize/templates/deployment.yaml b/stack/kubernetes/application/charts/imageresize/templates/deployment.yaml
@@ -44,6 +44,8 @@ spec:
           value: "true"
         - name: TRACING_ENABLED
           value: {{ .Values.tracing.enabled | quote }}
+        - name: TRACING_SAMPLING_PROPABILITY
+          value: {{ .Values.tracing.samplingPropability | quote }}
         - name: SPRING_ZIPKIN_ENDPOINT
           value: {{ .Values.global.tracing.endpoint }}
         - name: APM_ENABLED

diff --git a/stack/kubernetes/application/charts/imageresize/values.yaml b/stack/kubernetes/application/charts/imageresize/values.yaml
@@ -10,4 +10,5 @@ ingress:
   host: o11y.fans
 
 tracing:
-  enabled: true
+  enabled: true
+  samplingPropability: 1.0
diff --git a/stack/kubernetes/application/charts/imagerotator/templates/deployment.yaml b/stack/kubernetes/application/charts/imagerotator/templates/deployment.yaml
@@ -44,6 +44,8 @@ spec:
           value: "true"
         - name: TRACING_ENABLED
           value: {{ .Values.tracing.enabled | quote }}
+        - name: TRACING_SAMPLING_PROPABILITY
+          value: {{ .Values.tracing.samplingPropability | quote }}
         - name: SPRING_ZIPKIN_ENDPOINT
           value: {{ .Values.global.tracing.endpoint }}
         - name: APM_ENABLED

diff --git a/stack/kubernetes/application/charts/imagerotator/values.yaml b/stack/kubernetes/application/charts/imagerotator/values.yaml
@@ -10,4 +10,5 @@ ingress:
   host: o11y.fans
 
 tracing:
-  enabled: true
+  enabled: true
+  samplingPropability: 1.0
diff --git a/stack/kubernetes/application/charts/imagethumbnail/templates/deployment.yaml b/stack/kubernetes/application/charts/imagethumbnail/templates/deployment.yaml
@@ -45,6 +45,8 @@ spec:
           value: "true"
         - name: TRACING_ENABLED
           value: {{ .Values.tracing.enabled | quote }}
+        - name: TRACING_SAMPLING_PROPABILITY
+          value: {{ .Values.tracing.samplingPropability | quote }}
         - name: SPRING_ZIPKIN_ENDPOINT
           value: {{ .Values.global.tracing.endpoint }}
         - name: APM_ENABLED

diff --git a/stack/kubernetes/application/charts/imagethumbnail/values.yaml b/stack/kubernetes/application/charts/imagethumbnail/values.yaml
@@ -10,4 +10,5 @@ ingress:
   host: o11y.fans
 
 tracing:
-  enabled: true
+  enabled: true
+  samplingPropability: 1.0