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

HPCC-31425 Add support for tracking the active span in the thread context #18394

Merged
merged 1 commit into from
Mar 14, 2024

Conversation

ghalliday
Copy link
Member

@ghalliday ghalliday commented Mar 8, 2024

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

@ghalliday ghalliday requested a review from rpastrana March 8, 2024 15:38
Copy link

github-actions bot commented Mar 8, 2024

@ghalliday
Copy link
Member Author

@rpastrana this is the next logical step for managing the spans.

This is a draft because it it pushed to check it runs, and also there are still some potential issues.

At the moment I have combined the functionality into OwnedSpanScope, but there may be problems with that - it implies the spanscope will be destroyed on the same thread that it was set. That needs more thought. Possibly splitting the class in two, or having one derived from the other.

There should also be comments about why ISpan is not linked in the saved context (and there should be a discussion).

Assuming this is merged in some form, your code to report the span ids in the logging should become trivial - by linking the span object, and then accessing fields from it to log.

span.set(_span);
assertex(_span);
//The span may well have been initialised with queryNullSpan(), so clean that dummy span up first.
clear();
Copy link
Member

Choose a reason for hiding this comment

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

this seems fine, but I wish there was a version of clear that doesn't setThreadedActiveSpan(prevSpan); since we're about the call setThreadedActiveSpan(_span)

@ghalliday ghalliday marked this pull request as ready for review March 14, 2024 13:50
@ghalliday ghalliday force-pushed the issue31425 branch 2 times, most recently from 5e350e9 to d6d3027 Compare March 14, 2024 14:36
Copy link
Member

@rpastrana rpastrana left a comment

Choose a reason for hiding this comment

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

@ghalliday seems fine. I didn't see the comments you wanted to add regarding not linked span

@ghalliday ghalliday changed the base branch from master to candidate-9.6.x March 14, 2024 16:37
…text

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
@ghalliday
Copy link
Member Author

@ghalliday seems fine. I didn't see the comments you wanted to add regarding not linked span

Now added.

@ghalliday ghalliday merged commit 6d541df into hpcc-systems:candidate-9.6.x Mar 14, 2024
14 of 20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants