Skip to content
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.

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

fix(opentelemetry): avoid storing inmemory if logs are disabled #8373

Merged
merged 9 commits into from
May 19, 2024

Conversation

v1v
Copy link
Contributor

@v1v v1v commented May 15, 2024

SUMMARY

Workaround for #8353

Let's skip storing large datasets if the logs are disabled. This should help with the existing memory issues, so users can disable the logs. While we can figure out how to fix the underlying issue with storing large datasets.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

plugins/callback/opentelemetry

ADDITIONAL INFORMATION

@ansibullbot ansibullbot added WIP Work in progress bug This issue/PR relates to a bug callback callback plugin plugins plugin (any type) labels May 15, 2024
@ansibullbot

This comment was marked as outdated.

@v1v v1v marked this pull request as ready for review May 15, 2024 18:31
@ansibullbot ansibullbot removed the WIP Work in progress label May 15, 2024
@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-7 Automatically create a backport for the stable-7 branch backport-8 Automatically create a backport for the stable-8 branch labels May 15, 2024
@ansibullbot
Copy link
Collaborator

@v1v this PR contains the following merge commits:

Please rebase your branch to remove these commits.

click here for bot help

@ansibullbot ansibullbot added merge_commit This PR contains at least one merge commit. Please resolve! needs_ci This PR requires CI testing to be performed. Please close and re-open this PR to trigger CI needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR labels May 15, 2024
@ansibullbot ansibullbot removed the needs_ci This PR requires CI testing to be performed. Please close and re-open this PR to trigger CI label May 15, 2024
@ansibullbot ansibullbot removed the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR label May 15, 2024
@felixfontein
Copy link
Collaborator

Looks good to me! If nobody objects, I'll merge this this weekend.

@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label May 19, 2024
@felixfontein felixfontein merged commit d87b9fe into ansible-collections:main May 19, 2024
132 of 133 checks passed
Copy link

patchback bot commented May 19, 2024

Backport to stable-7: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply d87b9fe on top of patchback/backports/stable-7/d87b9fe0dce577aad2e58f56626a5df50839a884/pr-8373

Backporting merged PR #8373 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.general.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-7/d87b9fe0dce577aad2e58f56626a5df50839a884/pr-8373 upstream/stable-7
  4. Now, cherry-pick PR fix(opentelemetry): avoid storing inmemory if logs are disabled #8373 contents into that branch:
    $ git cherry-pick -x d87b9fe0dce577aad2e58f56626a5df50839a884
    If it'll yell at you with something like fatal: Commit d87b9fe0dce577aad2e58f56626a5df50839a884 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x d87b9fe0dce577aad2e58f56626a5df50839a884
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR fix(opentelemetry): avoid storing inmemory if logs are disabled #8373 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-7/d87b9fe0dce577aad2e58f56626a5df50839a884/pr-8373
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein
Copy link
Collaborator

@v1v thanks for your contribution!

Copy link

patchback bot commented May 19, 2024

Backport to stable-8: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply d87b9fe on top of patchback/backports/stable-8/d87b9fe0dce577aad2e58f56626a5df50839a884/pr-8373

Backporting merged PR #8373 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.general.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-8/d87b9fe0dce577aad2e58f56626a5df50839a884/pr-8373 upstream/stable-8
  4. Now, cherry-pick PR fix(opentelemetry): avoid storing inmemory if logs are disabled #8373 contents into that branch:
    $ git cherry-pick -x d87b9fe0dce577aad2e58f56626a5df50839a884
    If it'll yell at you with something like fatal: Commit d87b9fe0dce577aad2e58f56626a5df50839a884 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x d87b9fe0dce577aad2e58f56626a5df50839a884
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR fix(opentelemetry): avoid storing inmemory if logs are disabled #8373 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-8/d87b9fe0dce577aad2e58f56626a5df50839a884/pr-8373
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

felixfontein pushed a commit to felixfontein/community.general that referenced this pull request May 19, 2024
…ble-collections#8373)

* fix(opentelemetry): avoid storing inmemory if logs are disabled

* changelog

* fix syntax

* refactor

* chore

* chore

* chore

* fix

(cherry picked from commit d87b9fe)
felixfontein pushed a commit to felixfontein/community.general that referenced this pull request May 19, 2024
…ble-collections#8373)

* fix(opentelemetry): avoid storing inmemory if logs are disabled

* changelog

* fix syntax

* refactor

* chore

* chore

* chore

* fix

(cherry picked from commit d87b9fe)
felixfontein added a commit that referenced this pull request May 19, 2024
…bled (#8373) (#8390)

fix(opentelemetry): avoid storing inmemory if logs are disabled (#8373)

* fix(opentelemetry): avoid storing inmemory if logs are disabled

* changelog

* fix syntax

* refactor

* chore

* chore

* chore

* fix

(cherry picked from commit d87b9fe)

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
felixfontein added a commit that referenced this pull request May 19, 2024
…abled (#8373) (#8391)

fix(opentelemetry): avoid storing inmemory if logs are disabled (#8373)

* fix(opentelemetry): avoid storing inmemory if logs are disabled

* changelog

* fix syntax

* refactor

* chore

* chore

* chore

* fix

(cherry picked from commit d87b9fe)

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
@felixfontein
Copy link
Collaborator

Manually backported in #8390 and #8391.

austinlucaslake pushed a commit to austinlucaslake/community.general that referenced this pull request May 25, 2024
…ble-collections#8373)

* fix(opentelemetry): avoid storing inmemory if logs are disabled

* changelog

* fix syntax

* refactor

* chore

* chore

* chore

* fix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-7 Automatically create a backport for the stable-7 branch backport-8 Automatically create a backport for the stable-8 branch bug This issue/PR relates to a bug callback callback plugin merge_commit This PR contains at least one merge commit. Please resolve! needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html plugins plugin (any type)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants