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.

Sign up for GitHub

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

Jump to bottom

fix: update otel version to match Kong Gateway version #13325

Merged
merged 1 commit into from
Jul 2, 2024
Merged

fix: update otel version to match Kong Gateway version #13325

merged 1 commit into from
Jul 2, 2024

Conversation

hanshuebner
Copy link
Contributor

@hanshuebner hanshuebner commented Jul 2, 2024 •
edited
Loading

Summary

To make this fix work, we're adding a hack that prevents the normal plugin compatibility checks to be done for the opentelemetry plugin if the version of the plugin reported by the DP is 0.1.0.

Tested using https://github.com/Kong/otel-hybrid-mode-hack-test

Cherry-pick to kong-ee is not needed as the problem does not exist there, the plugin's version is already in sync with Kong Gateway itself.

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-1410

@github-actions github-actions bot added core/clustering plugins/opentelemetry cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels Jul 2, 2024
mikefero
mikefero approved these changes Jul 2, 2024
View reviewed changes
Copy link
Contributor

@mikefero mikefero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice yeah this LGTM!

@hanshuebner hanshuebner marked this pull request as ready for review July 2, 2024 16:12
@hanshuebner
fix: update otel version to match Kong Gateway version
c7e99ba 
To make this fix work, we're adding a hack that prevents the normal
plugin compatibility checks to be done for the opentelemetry plugin if
the version of the plugin reported by the DP is 0.1.0.
@hanshuebner hanshuebner force-pushed the otel-hybrid-mode-version-hack branch from 9b8deb8 to c7e99ba Compare July 2, 2024 16:29
@hanshuebner hanshuebner merged commit 3eeb9c9 into master Jul 2, 2024
25 checks passed
@hanshuebner hanshuebner deleted the otel-hybrid-mode-version-hack branch July 2, 2024 16:46
@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Jul 2, 2024
@hanshuebner
Copy link
Contributor Author

@Hayk-S Can you please test this change?

@hanshuebner hanshuebner 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 2, 2024
@Kong Kong deleted a comment from team-gateway-bot Jul 2, 2024
@Hayk-S
Copy link
Contributor

Hayk-S commented Jul 2, 2024

@Hayk-S Can you please test this change?

@hanshuebner our e2e OTEL tests pass against this image: https://github.com/Kong/kong/actions/runs/9764898907/job/26954598846#step:7:58

@hanshuebner
Copy link
Contributor Author

@Hayk-S Can you please test this change?

@hanshuebner our e2e OTEL tests pass against this image: https://github.com/Kong/kong/actions/runs/9764898907/job/26954598846#step:7:58

Can you also test whether green/blue upgrades still work? The change really only does something in mixed version hybrid mode situations.

@Hayk-S
Copy link
Contributor

Hayk-S commented Jul 2, 2024

@Hayk-S Can you please test this change?

@hanshuebner our e2e OTEL tests pass against this image: https://github.com/Kong/kong/actions/runs/9764898907/job/26954598846#step:7:58

Can you also test whether green/blue upgrades still work? The change really only does something in mixed version hybrid mode situations.

@hanshuebner I ran our Plugin CP<>DP Version Compatibility tests with CP (including this fix) and DP (3.7.1) and these tests also passed for the OTEL plugin, no configuration issues were noticed https://github.com/Kong/kong-test-automation/actions/runs/9767950727/job/26964387736#step:7:184

@AndyZhang0707
Copy link
Collaborator

Hi @hanshuebner , shall we cherry-pick this PR to EE?

@hanshuebner
Copy link
Contributor Author

@AndyZhang0707 EE does not have the issue, so cherry picking is not needed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikefero mikefero mikefero approved these changes

@samugi samugi samugi approved these changes

Assignees

@hanshuebner hanshuebner

Labels
core/clustering plugins/opentelemetry size/S skip-changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@hanshuebner @Hayk-S @AndyZhang0707 @samugi @mikefero