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

chore(*): Revert "fix: update otel version to match Kong Gateway version" #13324

Merged
merged 1 commit into from
Jul 2, 2024

Conversation

samugi
Copy link
Member

@samugi samugi commented Jul 2, 2024

Summary

This reverts commit 1afd6c6. (#13321)

The reason is that this still causes https://konghq.atlassian.net/browse/KAG-1410 we'll probably want to wait for the next major before syncing this with EE's version again.

Checklist

  • The Pull Request has tests
  • A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

KAG-4850

This reverts commit 1afd6c6.

The reason is that this still causes https://konghq.atlassian.net/browse/KAG-1410
we'll probably want to wait for the next major before syncing this with
EE's version again.
@github-actions github-actions bot added plugins/opentelemetry cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels Jul 2, 2024
@samugi samugi changed the title Revert "fix: update otel version to match Kong Gateway version" chore(*): Revert "fix: update otel version to match Kong Gateway version" Jul 2, 2024
@samugi samugi merged commit 25bcc8e into master Jul 2, 2024
41 of 43 checks passed
@samugi samugi deleted the revert/13321 branch July 2, 2024 12:53
@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-13324-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13324-to-master-to-upstream
git checkout -b cherry-pick-13324-to-master-to-upstream
ancref=$(git merge-base 1afd6c637a98bf9567dd7e829a6c8d8c6d5c734a e1d13e92c9295bd28cefdc9437ef333e722f631d)
git cherry-pick -x $ancref..e1d13e92c9295bd28cefdc9437ef333e722f631d

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Jul 2, 2024
@AndyZhang0707 AndyZhang0707 removed cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention labels Jul 12, 2024
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.

5 participants