Skip to content

Commit

Permalink
fix: Swap custom and transform processors in pipeline
Browse files Browse the repository at this point in the history
The reason is that the custom processor might edit the log body in-place
and the transform processor will copy parts of the body over to the
facets. Since the transform processor is more flexible, we want to edit
things first and eventually add them as facets once they are modified.

Example: secrets obfuscation. We want to redact the secrets' values that
can show up in the annotations. The transform processor blindly copies
the annotations to facets. So we don't want the secrets to show up in
the facets un-redacted.
  • Loading branch information
obs-gh-enricogiorio committed Nov 1, 2024
1 parent 933b3d6 commit e3aa214
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion charts/agent/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: agent
description: Chart to install K8s collection stack based on Observe Agent
type: application
version: 0.27.1
version: 0.27.2
appVersion: "1.1.0"
dependencies:
- name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/agent/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# agent

![Version: 0.27.1](https://img.shields.io/badge/Version-0.27.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.0](https://img.shields.io/badge/AppVersion-1.1.0-informational?style=flat-square)
![Version: 0.27.2](https://img.shields.io/badge/Version-0.27.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.0](https://img.shields.io/badge/AppVersion-1.1.0-informational?style=flat-square)

> [!CAUTION]
> This chart is under active development and is not meant to be installed yet.
Expand Down
4 changes: 2 additions & 2 deletions charts/agent/templates/_cluster-events-config.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ service:
pipelines:
logs/objects:
receivers: [k8sobjects/objects]
processors: [memory_limiter, batch, resource/observe_common, transform/object, observek8sattributes]
processors: [memory_limiter, batch, resource/observe_common, observek8sattributes, transform/object]
exporters: [otlphttp/observe/base, debug/override]
logs/cluster:
receivers: [k8sobjects/cluster]
Expand All @@ -441,7 +441,7 @@ service:
{{ if .Values.observe.entityToken.use -}}
logs/entity:
receivers: [k8sobjects/objects]
processors: [memory_limiter, batch, resource/observe_common, transform/object, observek8sattributes]
processors: [memory_limiter, batch, resource/observe_common, observek8sattributes, transform/object]
exporters: [otlphttp/observe/entity, debug/override]
logs/cluster/entity:
receivers: [k8sobjects/cluster]
Expand Down

0 comments on commit e3aa214

Please sign in to comment.