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(tracing/propagation): set parent span correctly #11468

Merged
merged 1 commit into from
Sep 5, 2023

Conversation

samugi
Copy link
Member

@samugi samugi commented Aug 28, 2023

Summary

Fix an issue where the parent span was set incorrectly when the balancer instrumentation was disabled (the parent span ID was set to a temporary balancer span that was never reported).

Checklist

Full changelog

  • [Implement ...]

Issue reference

https://konghq.atlassian.net/browse/KAG-2281
closes #11294

* fix an issue where the parent span was set incorrectly when the
  balancer instrumentation was disabled (the parent span was set to
  a temporary balancer span that was never reported)
@samugi samugi merged commit a6659ed into master Sep 5, 2023
23 checks passed
@samugi samugi deleted the fix/tracing-parent-span-id branch September 5, 2023 07:28
team-gateway-bot pushed a commit that referenced this pull request Sep 19, 2023
* fix an issue where the parent span was set incorrectly when the
  balancer instrumentation was disabled (the parent span was set to
  a temporary balancer span that was never reported)

(cherry picked from commit a6659ed)
kikito pushed a commit that referenced this pull request Sep 25, 2023
* fix an issue where the parent span was set incorrectly when the
  balancer instrumentation was disabled (the parent span was set to
  a temporary balancer span that was never reported)

(cherry picked from commit a6659ed)
@team-gateway-bot
Copy link
Collaborator

The backport to release/3.3.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.3.x release/3.3.x
# Navigate to the new working tree
cd .worktrees/backport-release/3.3.x
# Create a new branch
git switch --create backport-11468-to-release/3.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a6659edb925ba07306eb2be212df06dbcc5f2a9f
# Push it to GitHub
git push --set-upstream origin backport-11468-to-release/3.3.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.3.x

Then, create a pull request where the base branch is release/3.3.x and the compare/head branch is backport-11468-to-release/3.3.x.

samugi added a commit that referenced this pull request Sep 25, 2023
* fix an issue where the parent span was set incorrectly when the
  balancer instrumentation was disabled (the parent span was set to
  a temporary balancer span that was never reported)
samugi added a commit that referenced this pull request Sep 25, 2023
* fix an issue where the parent span was set incorrectly when the
  balancer instrumentation was disabled (the parent span was set to
  a temporary balancer span that was never reported)

(cherry picked from commit a6659ed)

Co-authored-by: Samuele <samuele@konghq.com>
kikito pushed a commit that referenced this pull request Sep 26, 2023
* fix an issue where the parent span was set incorrectly when the
  balancer instrumentation was disabled (the parent span was set to
  a temporary balancer span that was never reported)
samugi added a commit that referenced this pull request Sep 27, 2023
* fix an issue where the parent span was set incorrectly when the
  balancer instrumentation was disabled (the parent span was set to
  a temporary balancer span that was never reported)
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.

Broken trace trees with tracing_instrumentations=request
3 participants