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

Remove functional tests for opentelemetry instrumentation #5962

Merged
merged 1 commit into from
Oct 31, 2024

Conversation

lubosmj
Copy link
Member

@lubosmj lubosmj commented Oct 31, 2024

This commit is fixing the failing CI after we merged pulp/pulp-oci-images#690. The goal is to remove the functional tests for opentelemetry instrumentation and replace them with unit tests. Refer to #5943 for more.

@lubosmj lubosmj marked this pull request as draft October 31, 2024 14:48
@lubosmj lubosmj force-pushed the 5943-use-custom-otel-middleware branch from 59ab3c2 to 88a67cb Compare October 31, 2024 14:48
@lubosmj lubosmj force-pushed the 5943-use-custom-otel-middleware branch 3 times, most recently from b4b3e39 to dc52640 Compare October 31, 2024 15:24
@lubosmj lubosmj changed the title Replace built-in metrics by custom instrumentation middleware Remove functional tests for opentelemetry instrumentation Oct 31, 2024
@lubosmj
Copy link
Member Author

lubosmj commented Oct 31, 2024

@lubosmj lubosmj force-pushed the 5943-use-custom-otel-middleware branch 9 times, most recently from 6672826 to 9241699 Compare October 31, 2024 18:43
@lubosmj lubosmj force-pushed the 5943-use-custom-otel-middleware branch from 9241699 to 1237f37 Compare October 31, 2024 18:57
@lubosmj lubosmj marked this pull request as ready for review October 31, 2024 18:59
@ggainey ggainey merged commit 981af2e into pulp:main Oct 31, 2024
12 checks passed
Copy link

patchback bot commented Nov 7, 2024

Backport to 3.49: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 981af2e on top of patchback/backports/3.49/981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7/pr-5962

Backporting merged PR #5962 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/pulp/pulpcore.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/3.49/981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7/pr-5962 upstream/3.49
  4. Now, cherry-pick PR Remove functional tests for opentelemetry instrumentation #5962 contents into that branch:
    $ git cherry-pick -x 981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7
    If it'll yell at you with something like fatal: Commit 981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Remove functional tests for opentelemetry instrumentation #5962 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.49/981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7/pr-5962
  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.

Copy link

patchback bot commented Nov 7, 2024

Backport to 3.63: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 981af2e on top of patchback/backports/3.63/981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7/pr-5962

Backporting merged PR #5962 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/pulp/pulpcore.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/3.63/981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7/pr-5962 upstream/3.63
  4. Now, cherry-pick PR Remove functional tests for opentelemetry instrumentation #5962 contents into that branch:
    $ git cherry-pick -x 981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7
    If it'll yell at you with something like fatal: Commit 981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Remove functional tests for opentelemetry instrumentation #5962 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.63/981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7/pr-5962
  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.

Copy link

patchback bot commented Nov 7, 2024

Backport to 3.67: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 981af2e on top of patchback/backports/3.67/981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7/pr-5962

Backporting merged PR #5962 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/pulp/pulpcore.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/3.67/981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7/pr-5962 upstream/3.67
  4. Now, cherry-pick PR Remove functional tests for opentelemetry instrumentation #5962 contents into that branch:
    $ git cherry-pick -x 981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7
    If it'll yell at you with something like fatal: Commit 981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Remove functional tests for opentelemetry instrumentation #5962 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.67/981af2ef7b01d19b6b40b2c3c1a5dcbbc0bdf7a7/pr-5962
  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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants