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: update otel version to match Kong Gateway version #13321

Merged
merged 1 commit into from
Jul 2, 2024

Conversation

mikefero
Copy link
Contributor

@mikefero mikefero commented Jul 1, 2024

Summary

Update opentelemetry plugin version to match Kong Gateway version.

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

Fix #[issue number]

@github-actions github-actions bot added plugins/opentelemetry cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels Jul 1, 2024
@hanshuebner hanshuebner merged commit 1afd6c6 into master Jul 2, 2024
35 of 37 checks passed
@hanshuebner hanshuebner deleted the fix/otel-version branch July 2, 2024 06:50
@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-13321-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13321-to-master-to-upstream
git checkout -b cherry-pick-13321-to-master-to-upstream
ancref=$(git merge-base 4bd17e1afbff7e2de0243fad6b49d2e7a16a59dc 3aa8a12e8e8e39048ebb40ed8a46ff288fc7ecb2)
git cherry-pick -x $ancref..3aa8a12e8e8e39048ebb40ed8a46ff288fc7ecb2

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Jul 2, 2024
@samugi
Copy link
Member

samugi commented Jul 2, 2024

just checking: will this cause https://konghq.atlassian.net/browse/KAG-1410 to happen again?

Edit: cherry pick label removed, this is already in EE
Edit II: I verified that the problem still occurs, originating here:

if cp_plugin.major ~= dp_plugin.major or
cp_plugin.minor < dp_plugin.minor then
local msg = "configured data plane " .. name .. " plugin version " .. dp_plugin.version ..
" is different to control plane plugin version " .. cp_plugin.version
return nil, msg, CLUSTERING_SYNC_STATUS.PLUGIN_VERSION_INCOMPATIBLE
end
we'll probably want to wait for the next major before syncing this again. For now I think it's better to revert.

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

6 participants