New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add an otelcol.processor.attributes component #3349

Merged

mattdurham merged 12 commits into main from 2294-flow-otelcolprocessorattributes-component-3

Apr 18, 2023

Contributor

ptodev commented Mar 23, 2023 •

edited

Loading

Adding an otelcol.processor.attributes component.

Fixes #2294

I left some comments in the PR about things I was not sure about.

Tests, docs, and changelog have been updated.

ptodev linked an issue

that may be closed by this pull request

Flow: otelcol.processor.attributes component #2294

Closed

ptodev mentioned this pull request

Flow: otelcol.processor.attributes component #2294

Closed

ptodev force-pushed the 2294-flow-otelcolprocessorattributes-component-3 branch 5 times, most recently from 76acd34 to 08f66a8 Compare

March 31, 2023 09:49

ptodev commented

View reviewed changes

component/otelcol/config_filter.go Show resolved Hide resolved

component/otelcol/config_filter.go Show resolved Hide resolved

component/otelcol/config_filter.go Outdated Show resolved Hide resolved

component/otelcol/config_filter.go

+              	// Attributes specifies the list of attributes to match against.
+              	// All of these attributes must match exactly for a match to occur.
+              	// Only match_type=strict is allowed if "attributes" are specified.
+              	Attributes []Attribute `river:"attribute,block,optional"`

Contributor Author

ptodev Mar 31, 2023

In the Otel code this used to be a slice of pointers ([]*Attribute), but I'm not sure why. I changed it to values instead of pointers to avoid shallow copy issues.

component/otelcol/config_attraction.go Outdated Show resolved Hide resolved

docs/sources/flow/reference/components/otelcol.processor.attributes.md

+                }
+              }
+              otelcol.processor.attributes "default" {

Contributor Author

ptodev Mar 31, 2023

Add an example for from_context?

docs/sources/flow/reference/components/otelcol.processor.attributes.md Show resolved Hide resolved

component/otelcol/config_attraction.go

		@@ -0,0 +1,103 @@
		package otelcol

		type AttrActionKeyValueSlice []AttrActionKeyValue

Contributor Author

ptodev Mar 31, 2023

This pattern is something I made up myself, since it makes sense to use actions as a slice and to have the convert function in config_atraction.go. If you think this pattern doesn't make senes though, let me know

docs/sources/flow/reference/components/otelcol.processor.attributes.md Outdated Show resolved Hide resolved

docs/sources/flow/reference/components/otelcol.processor.attributes.md Show resolved Hide resolved

ptodev requested review from rfratto and erikbaranowski

March 31, 2023 10:09

ptodev changed the title ~~WIP: Add an otelcol.processor.attributes component~~ Add an otelcol.processor.attributes component

rfratto reviewed

View reviewed changes

component/otelcol/config_attraction.go Show resolved Hide resolved

component/otelcol/config_attraction.go Outdated Show resolved Hide resolved

component/otelcol/config_filter.go Show resolved Hide resolved

component/otelcol/config_filter.go Show resolved Hide resolved

component/otelcol/config_filter.go Show resolved Hide resolved

docs/sources/flow/reference/components/otelcol.processor.attributes.md Show resolved Hide resolved

docs/sources/flow/reference/components/otelcol.processor.attributes.md Outdated Show resolved Hide resolved

docs/sources/flow/reference/components/otelcol.processor.attributes.md Outdated Show resolved Hide resolved

docs/sources/flow/reference/components/otelcol.processor.attributes.md Show resolved Hide resolved

docs/sources/flow/reference/components/otelcol.processor.attributes.md Outdated Show resolved Hide resolved

ptodev mentioned this pull request

Update attribute processor's readme open-telemetry/opentelemetry-collector-contrib#20855

Merged

ptodev force-pushed the 2294-flow-otelcolprocessorattributes-component-3 branch from 341cd03 to cdc0e01 Compare

April 11, 2023 14:46

ptodev commented

View reviewed changes

docs/sources/flow/reference/components/otelcol.processor.attributes.md Outdated Show resolved Hide resolved

ptodev and others added 5 commits

April 18, 2023 14:01


          Add a otelcol.processor.attributes component


          Update changelog

eefaa9d


          Fix linter errors

b6c3ab3


          Update docs/sources/flow/reference/components/otelcol.processor.attri…

…butes.md

Co-authored-by: Robert Fratto <robertfratto@gmail.com>


          PR review fixes

bfea751

ptodev force-pushed the 2294-flow-otelcolprocessorattributes-component-3 branch from bee70c9 to 257b9a1 Compare

April 18, 2023 13:01


          PR review fixes

ptodev force-pushed the 2294-flow-otelcolprocessorattributes-component-3 branch from 257b9a1 to 6776869 Compare

April 18, 2023 15:06

ptodev added 3 commits

April 18, 2023 17:10


          Update documentation

5bb4a5b

Rename log_severity_number to log_severity


          Update docs

32364eb


          Fix tests

e48a409

mattdurham reviewed

View reviewed changes

docs/sources/flow/reference/components/otelcol.processor.attributes.md Outdated Show resolved Hide resolved

ptodev commented

View reviewed changes

docs/sources/flow/reference/components/otelcol.processor.attributes.md Show resolved Hide resolved

docs/sources/flow/reference/components/otelcol.processor.attributes.md

+              The severities supported by Otel are listed in the table below.
+              The value for `min` should be one of the values in the "Log Severity" column.
+              Log Severity | Severity number

Contributor Author

ptodev Apr 18, 2023

This is quite a tall table, but I think that listing all 5 types of each severity kind is worth it?
I.e. I think it's better to have all of TRACE, TRACE2, TRACE3, TRACE4 instead of just listing TRACE.

Collaborator

mattdurham Apr 18, 2023

This feels a bit strange but assuming its a straight mapping from otel right?

component/otelcol/config_filter.go Show resolved Hide resolved

ptodev and others added 2 commits

April 18, 2023 19:15


          Rename "cacheenabled" and "cachemaxnumentries" with "_"

8a6951b


          Merge branch 'main' into 2294-flow-otelcolprocessorattributes-compone…

da675a6

…nt-3

mattdurham approved these changes

View reviewed changes

Collaborator

mattdurham left a comment

LGTM

mattdurham enabled auto-merge (squash)

April 18, 2023 19:17


          Merge branch 'main' into 2294-flow-otelcolprocessorattributes-compone…

0bf1649

…nt-3

mattdurham merged commit 84a6494 into main

mattdurham deleted the 2294-flow-otelcolprocessorattributes-component-3 branch

April 18, 2023 19:29

ptodev added a commit that referenced this pull request


          Revert "Add an otelcol.processor.attributes component (#3349)"

7d03ffe

This reverts commit 84a6494.

mattdurham pushed a commit that referenced this pull request


          Revert "Add an otelcol.processor.attributes component (#3349)" (#3589)

fc17c56

* Revert "Add an otelcol.processor.attributes component (#3349)"

This reverts commit 84a6494.

* Update docs/sources/flow/reference/components/discovery.kubernetes.md

Co-authored-by: Mischa Thompson <mischabear@gmail.com>

* Update docs/sources/flow/reference/components/mimir.rules.kubernetes.md

Co-authored-by: Mischa Thompson <mischabear@gmail.com>

* Update docs/sources/flow/reference/components/otelcol.processor.batch.md

---------

Co-authored-by: Mischa Thompson <mischabear@gmail.com>

spartan0x117 added a commit that referenced this pull request


          Revert "Add an otelcol.processor.attributes component (#3349)" (#3589)

3791b00

* Revert "Add an otelcol.processor.attributes component (#3349)"

This reverts commit 84a6494.

* Update docs/sources/flow/reference/components/discovery.kubernetes.md

Co-authored-by: Mischa Thompson <mischabear@gmail.com>

* Update docs/sources/flow/reference/components/mimir.rules.kubernetes.md

Co-authored-by: Mischa Thompson <mischabear@gmail.com>

* Update docs/sources/flow/reference/components/otelcol.processor.batch.md

---------

Co-authored-by: Mischa Thompson <mischabear@gmail.com>

captncraig pushed a commit that referenced this pull request


          Revert "Add an otelcol.processor.attributes component (#3349)" (#3589) (

8c4d685

#3593)

* Revert "Add an otelcol.processor.attributes component (#3349)"

This reverts commit 84a6494.

* Update docs/sources/flow/reference/components/discovery.kubernetes.md



* Update docs/sources/flow/reference/components/mimir.rules.kubernetes.md



* Update docs/sources/flow/reference/components/otelcol.processor.batch.md

---------

Co-authored-by: Paulin Todev <paulin.todev@gmail.com>

ptodev added a commit that referenced this pull request


          Revert "Revert "Add an otelcol.processor.attributes component (#3349)" (

13710e9

#3589)"

This reverts commit fc17c56.

ptodev added a commit that referenced this pull request


          Revert "Revert "Add an otelcol.processor.attributes component (#3349)" (

1d7c94f

#3589)"

This reverts commit fc17c56.

ptodev mentioned this pull request

Restore attributes processor #3822

Merged

3 tasks

ptodev added a commit that referenced this pull request


          Revert "Revert "Add an otelcol.processor.attributes component (#3349)" (

7f6d0cb

#3589)"

This reverts commit fc17c56.

ptodev added a commit that referenced this pull request


          Revert "Revert "Add an otelcol.processor.attributes component (#3349)" (

98b974a

#3589)"

This reverts commit fc17c56.

ptodev added a commit that referenced this pull request


          Revert "Revert "Add an otelcol.processor.attributes component (#3349)" (

85fb951

#3589)"

This reverts commit fc17c56.

ptodev added a commit that referenced this pull request


          Restore attributes processor (#3822)

* Revert "Revert "Add an otelcol.processor.attributes component (#3349)" (#3589)"

This reverts commit fc17c56.

* Add runner tests for the attributes processor

* Update docs/sources/flow/reference/components/otelcol.processor.attributes.md

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

* Remove a panic, fix comments and docs

* Update changelog

---------

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

clayton-cornell pushed a commit that referenced this pull request


          Add an otelcol.processor.attributes component (#3349)

f9875ef

* Add a otelcol.processor.attributes component

* Update changelog

* Fix linter errors

* Update docs/sources/flow/reference/components/otelcol.processor.attributes.md

Co-authored-by: Robert Fratto <robertfratto@gmail.com>

* PR review fixes

* PR review fixes

* Update documentation
Rename log_severity_number to log_severity

* Update docs

* Fix tests

* Rename "cacheenabled" and "cachemaxnumentries" with "_"

---------

Co-authored-by: Robert Fratto <robertfratto@gmail.com>
Co-authored-by: mattdurham <mattdurham@ppog.org>

clayton-cornell pushed a commit that referenced this pull request


          Revert "Add an otelcol.processor.attributes component (#3349)" (#3589)

74923e5

* Revert "Add an otelcol.processor.attributes component (#3349)"

This reverts commit 84a6494.

* Update docs/sources/flow/reference/components/discovery.kubernetes.md

Co-authored-by: Mischa Thompson <mischabear@gmail.com>

* Update docs/sources/flow/reference/components/mimir.rules.kubernetes.md

Co-authored-by: Mischa Thompson <mischabear@gmail.com>

* Update docs/sources/flow/reference/components/otelcol.processor.batch.md

---------

Co-authored-by: Mischa Thompson <mischabear@gmail.com>

clayton-cornell added a commit that referenced this pull request


          Restore attributes processor (#3822)

a404496

* Revert "Revert "Add an otelcol.processor.attributes component (#3349)" (#3589)"

This reverts commit fc17c56.

* Add runner tests for the attributes processor

* Update docs/sources/flow/reference/components/otelcol.processor.attributes.md

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

* Remove a panic, fix comments and docs

* Update changelog

---------

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

clayton-cornell pushed a commit that referenced this pull request


          Add an otelcol.processor.attributes component (#3349)

86829e9

* Add a otelcol.processor.attributes component

* Update changelog

* Fix linter errors

* Update docs/sources/flow/reference/components/otelcol.processor.attributes.md

Co-authored-by: Robert Fratto <robertfratto@gmail.com>

* PR review fixes

* PR review fixes

* Update documentation
Rename log_severity_number to log_severity

* Update docs

* Fix tests

* Rename "cacheenabled" and "cachemaxnumentries" with "_"

---------

Co-authored-by: Robert Fratto <robertfratto@gmail.com>
Co-authored-by: mattdurham <mattdurham@ppog.org>

clayton-cornell pushed a commit that referenced this pull request


          Revert "Add an otelcol.processor.attributes component (#3349)" (#3589)

7327ece

* Revert "Add an otelcol.processor.attributes component (#3349)"

This reverts commit 84a6494.

* Update docs/sources/flow/reference/components/discovery.kubernetes.md

Co-authored-by: Mischa Thompson <mischabear@gmail.com>

* Update docs/sources/flow/reference/components/mimir.rules.kubernetes.md

Co-authored-by: Mischa Thompson <mischabear@gmail.com>

* Update docs/sources/flow/reference/components/otelcol.processor.batch.md

---------

Co-authored-by: Mischa Thompson <mischabear@gmail.com>

clayton-cornell added a commit that referenced this pull request


          Restore attributes processor (#3822)

c65cfb7

* Revert "Revert "Add an otelcol.processor.attributes component (#3349)" (#3589)"

This reverts commit fc17c56.

* Add runner tests for the attributes processor

* Update docs/sources/flow/reference/components/otelcol.processor.attributes.md

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

* Remove a panic, fix comments and docs

* Update changelog

---------

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

github-actions bot added the frozen-due-to-age label

github-actions bot locked as resolved and limited conversation to collaborators

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

frozen-due-to-age