From b12eb4f10134632b4cff89c1591a946c7baa46fa Mon Sep 17 00:00:00 2001 From: Dani Louca <59848726+dloucasfx@users.noreply.github.com> Date: Fri, 10 Jan 2025 16:36:26 -0500 Subject: [PATCH] SWAT-8663 gateway - add signalfx exporter to traces pipeline to enable correlation (#1607) Signed-off-by: Dani Louca --- .chloggen/gw-apm-correlation.yaml | 12 ++++++++++++ .../rendered_manifests/configmap-gateway.yaml | 1 + .../rendered_manifests/deployment-gateway.yaml | 2 +- .../rendered_manifests/configmap-gateway.yaml | 1 + .../rendered_manifests/deployment-gateway.yaml | 2 +- .../rendered_manifests/configmap-gateway.yaml | 1 + .../rendered_manifests/deployment-gateway.yaml | 2 +- .../templates/config/_otel-collector.tpl | 1 + 8 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 .chloggen/gw-apm-correlation.yaml diff --git a/.chloggen/gw-apm-correlation.yaml b/.chloggen/gw-apm-correlation.yaml new file mode 100644 index 0000000000..c46f9c296e --- /dev/null +++ b/.chloggen/gw-apm-correlation.yaml @@ -0,0 +1,12 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix +# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other) +component: gateway +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: add signalfx exporter to the gateway traces pipeline to enable APM correlation +# One or more tracking issues related to the change +issues: [1607] +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: diff --git a/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml b/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml index 82551808e2..fd9592869e 100644 --- a/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml +++ b/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml @@ -205,6 +205,7 @@ data: traces: exporters: - otlphttp + - signalfx processors: - memory_limiter - k8sattributes diff --git a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml index 2462e87188..c4b183e39d 100644 --- a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: 9a18e1abec41b07245232e29f2462870e5bda91ddb7df7775e434c1d393f5c7f + checksum/config: a4f6cdac19856ea507be247f9656711d130956dc6e895c1a8c16512745ff68b5 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml index 82551808e2..fd9592869e 100644 --- a/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml +++ b/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml @@ -205,6 +205,7 @@ data: traces: exporters: - otlphttp + - signalfx processors: - memory_limiter - k8sattributes diff --git a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml index 218ddf2e42..a5930aa12c 100644 --- a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: 9a18e1abec41b07245232e29f2462870e5bda91ddb7df7775e434c1d393f5c7f + checksum/config: a4f6cdac19856ea507be247f9656711d130956dc6e895c1a8c16512745ff68b5 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml b/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml index 710017fe85..a59b90aa2d 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml @@ -207,6 +207,7 @@ data: traces: exporters: - otlphttp + - signalfx processors: - memory_limiter - k8sattributes diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml index 2f4a506a51..75c867568c 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml @@ -31,7 +31,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: e3a492daf843c7412ff52604bb5ad1197601fe57b94f27527f030b9671000ecd + checksum/config: 40e24931c5e5d4fc49d32dc1e9bc073fcedd41116956babf3fdc8b4f0846881a spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl index 16a31b00c6..59f4270b56 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl @@ -176,6 +176,7 @@ service: exporters: {{- if (eq (include "splunk-otel-collector.o11yTracesEnabled" .) "true") }} - otlphttp + - signalfx {{- end }} {{- if (eq (include "splunk-otel-collector.platformTracesEnabled" .) "true") }} - splunk_hec/platform_traces