Skip to content

Commit 7ff4ef6

Browse files
authored
Merge pull request #2270 from beyonnex-io/helm/configure-tracing-options
add possibility to configure tracing tick-interval and queue-size
2 parents cba7316 + 2ce31ac commit 7ff4ef6

File tree

8 files changed

+40
-1
lines changed

8 files changed

+40
-1
lines changed

deployment/helm/ditto/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ description: |
1616
A digital twin is a virtual, cloud based, representation of his real world counterpart
1717
(real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
1818
type: application
19-
version: 3.8.6 # chart version is effectively set by release-job
19+
version: 3.8.7 # chart version is effectively set by release-job
2020
appVersion: 3.8.6
2121
keywords:
2222
- iot-chart

deployment/helm/ditto/templates/connectivity-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ spec:
101101
value: "{{ .Values.global.metrics.systemMetrics.enabled }}"
102102
- name: DITTO_TRACING_ENABLED
103103
value: "{{ .Values.global.tracing.enabled }}"
104+
- name: DITTO_TRACING_TICK_INTERVAL
105+
value: "{{ .Values.global.tracing.tickInterval }}"
106+
- name: DITTO_TRACING_REPORTER_QUEUE_SIZE
107+
value: "{{ .Values.global.tracing.reporterQueueSize }}"
104108
- name: DITTO_TRACING_OTEL_TRACE_REPORTER_ENABLED
105109
value: "{{ .Values.global.tracing.otelTraceReporterEnabled }}"
106110
- name: OTEL_EXPORTER_OTLP_ENDPOINT

deployment/helm/ditto/templates/gateway-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ spec:
101101
value: "{{ .Values.global.metrics.systemMetrics.enabled }}"
102102
- name: DITTO_TRACING_ENABLED
103103
value: "{{ .Values.global.tracing.enabled }}"
104+
- name: DITTO_TRACING_TICK_INTERVAL
105+
value: "{{ .Values.global.tracing.tickInterval }}"
106+
- name: DITTO_TRACING_REPORTER_QUEUE_SIZE
107+
value: "{{ .Values.global.tracing.reporterQueueSize }}"
104108
- name: DITTO_TRACING_OTEL_TRACE_REPORTER_ENABLED
105109
value: "{{ .Values.global.tracing.otelTraceReporterEnabled }}"
106110
- name: OTEL_EXPORTER_OTLP_ENDPOINT

deployment/helm/ditto/templates/policies-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ spec:
101101
value: "{{ .Values.global.metrics.systemMetrics.enabled }}"
102102
- name: DITTO_TRACING_ENABLED
103103
value: "{{ .Values.global.tracing.enabled }}"
104+
- name: DITTO_TRACING_TICK_INTERVAL
105+
value: "{{ .Values.global.tracing.tickInterval }}"
106+
- name: DITTO_TRACING_REPORTER_QUEUE_SIZE
107+
value: "{{ .Values.global.tracing.reporterQueueSize }}"
104108
- name: DITTO_TRACING_OTEL_TRACE_REPORTER_ENABLED
105109
value: "{{ .Values.global.tracing.otelTraceReporterEnabled }}"
106110
- name: OTEL_EXPORTER_OTLP_ENDPOINT

deployment/helm/ditto/templates/things-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ spec:
101101
value: "{{ .Values.global.metrics.systemMetrics.enabled }}"
102102
- name: DITTO_TRACING_ENABLED
103103
value: "{{ .Values.global.tracing.enabled }}"
104+
- name: DITTO_TRACING_TICK_INTERVAL
105+
value: "{{ .Values.global.tracing.tickInterval }}"
106+
- name: DITTO_TRACING_REPORTER_QUEUE_SIZE
107+
value: "{{ .Values.global.tracing.reporterQueueSize }}"
104108
- name: DITTO_TRACING_OTEL_TRACE_REPORTER_ENABLED
105109
value: "{{ .Values.global.tracing.otelTraceReporterEnabled }}"
106110
- name: OTEL_EXPORTER_OTLP_ENDPOINT

deployment/helm/ditto/templates/thingssearch-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ spec:
101101
value: "{{ .Values.global.metrics.systemMetrics.enabled }}"
102102
- name: DITTO_TRACING_ENABLED
103103
value: "{{ .Values.global.tracing.enabled }}"
104+
- name: DITTO_TRACING_TICK_INTERVAL
105+
value: "{{ .Values.global.tracing.tickInterval }}"
106+
- name: DITTO_TRACING_REPORTER_QUEUE_SIZE
107+
value: "{{ .Values.global.tracing.reporterQueueSize }}"
104108
- name: DITTO_TRACING_OTEL_TRACE_REPORTER_ENABLED
105109
value: "{{ .Values.global.tracing.otelTraceReporterEnabled }}"
106110
- name: OTEL_EXPORTER_OTLP_ENDPOINT

deployment/helm/ditto/values.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,12 @@ global:
195195
tracing:
196196
# enabled whether tracing (via OpenTelemetry) is enabled
197197
enabled: false
198+
# tickInterval the interval at which tracing metrics are reported
199+
tickInterval: 10s
200+
# reporterQueueSize size of the internal queue where sampled spans will stay until they get flushed.
201+
# If the queue becomes full then sampled finished spans will be dropped in order to avoid consuming excessive
202+
# amounts of memory. Each configured reporter has a separate queue.
203+
reporterQueueSize: 4096
198204
# otelTraceReporterEnabled whether reporting traces via the OLTP endpoint should be activated
199205
otelTraceReporterEnabled: false
200206
# otelExporterOtlpEndpoint the OTLP endpoint to report traces to

internal/utils/config/src/main/resources/ditto-kamon.conf

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@ kamon {
8282
}
8383

8484
trace {
85+
tick-interval = 10s
86+
tick-interval = ${?DITTO_TRACING_TICK_INTERVAL}
87+
tick-interval = ${?OTEL_BSP_SCHEDULE_DELAY} # this is the OTEL default env var - specified as milliseconds
88+
89+
reporter-queue-size = 4096
90+
reporter-queue-size = ${?DITTO_TRACING_REPORTER_QUEUE_SIZE}
91+
reporter-queue-size = ${?OTEL_BSP_MAX_QUEUE_SIZE} # this is the OTEL default env var
92+
8593
# disable reporting by default
8694
# - always: report all traces.
8795
# - never: don't report any trace.
@@ -99,6 +107,11 @@ kamon {
99107

100108
# must be double for w3c trace context
101109
identifier-scheme = double
110+
111+
span-metric-tags {
112+
upstream-service = no
113+
parent-operation = no
114+
}
102115
}
103116

104117
propagation {

0 commit comments

Comments
 (0)