Skip to content

Conversation

@Frefreak
Copy link
Contributor

add_label can add attributes to logs data (Resource attributes instead of LogRecord's attributes) after this PR: fluent/fluent-bit#7029

@Frefreak Frefreak changed the title adjust add_label description out_opentelemetry: adjust add_label description May 5, 2023
@patrick-stephens
Copy link
Contributor

Ah, DCO checks are failing

@Frefreak
Copy link
Contributor Author

yep, I forget to sign. Will force push in a moment. Sorry

@Frefreak Frefreak force-pushed the opentelemtry_add_label_doc branch 2 times, most recently from 3662364 to 134c016 Compare May 16, 2023 11:28
@Frefreak
Copy link
Contributor Author

updated

@Frefreak Frefreak force-pushed the opentelemtry_add_label_doc branch from 134c016 to 6bdcd26 Compare June 26, 2023 09:24
Signed-off-by: Frefreak <frefreak.zxy@gmail.com>
@Frefreak Frefreak force-pushed the opentelemtry_add_label_doc branch from 6bdcd26 to 581cbda Compare June 26, 2023 09:28
@lecaros lecaros added the conflict Waiting on conflict to be resolved by contributor label Nov 9, 2024
@lecaros lecaros requested review from a team as code owners March 25, 2025 14:34
@eschabell eschabell added waiting-for-user Waiting for user/contributors feedback or requested changes and removed waiting-on-code-merge labels Oct 21, 2025
@eschabell
Copy link
Collaborator

@Frefreak if you can resolve the conflicts here I can merge this for you?

@eschabell eschabell self-assigned this Oct 21, 2025
Signed-off-by: Lynette  Miles <6818907+esmerel@users.noreply.github.com>
@esmerel
Copy link
Contributor

esmerel commented Oct 21, 2025

Stylistic changes caused the conflict, I corrected it so this can keep moving.

Signed-off-by: Lynette  Miles <6818907+esmerel@users.noreply.github.com>
Signed-off-by: Lynette  Miles <6818907+esmerel@users.noreply.github.com>
@esmerel
Copy link
Contributor

esmerel commented Oct 21, 2025

Corrected the conflict incorrectly, then hopefully I fixed it with the updated description and kept the style correct.

Signed-off-by: Lynette  Miles <6818907+esmerel@users.noreply.github.com>
@patrick-stephens patrick-stephens merged commit 145f8cd into fluent:master Oct 21, 2025
7 checks passed
@Frefreak
Copy link
Contributor Author

Sorry for missing the notification, thank you for the fix!

TomlinfreeGit pushed a commit to TomlinfreeGit/fluent-bit-docs that referenced this pull request Oct 28, 2025
* out_opentelemetry: adjust `add_label` description

Signed-off-by: Frefreak <frefreak.zxy@gmail.com>

* Update opentelemetry.md

Signed-off-by: Lynette  Miles <6818907+esmerel@users.noreply.github.com>

* Apply suggestions from code review

Signed-off-by: Lynette  Miles <6818907+esmerel@users.noreply.github.com>

* Update pipeline/outputs/opentelemetry.md

Signed-off-by: Lynette  Miles <6818907+esmerel@users.noreply.github.com>

---------

Signed-off-by: Frefreak <frefreak.zxy@gmail.com>
Signed-off-by: Lynette  Miles <6818907+esmerel@users.noreply.github.com>
Co-authored-by: Lynette  Miles <6818907+esmerel@users.noreply.github.com>
Signed-off-by: Tom <yao.lin@siemens.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflict Waiting on conflict to be resolved by contributor waiting-for-user Waiting for user/contributors feedback or requested changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants