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

HPCC-33191 Simplify roxie span names #19426

Merged
merged 1 commit into from
Jan 23, 2025
Merged

HPCC-33191 Simplify roxie span names #19426

merged 1 commit into from
Jan 23, 2025

Conversation

rpastrana
Copy link
Member

@rpastrana rpastrana commented Jan 16, 2025 •
edited
Loading

  • Removes roxie span name prefix
  • Anotates roxie spans with queryset name

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:

@rpastrana
Copy link
Member Author

Roxie spans are no longer prefixed with the queryset name, preventing premature classification
image
Querysetname is now a span attribute
image

@rpastrana rpastrana requested a review from jakesmith January 16, 2025 22:45
@github-actions GitHub Actions
Copy link

Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-33191

Jirabot Action Result:
Workflow Transition To: Merge Pending
Updated PR

@rpastrana
Copy link
Member Author

@jakesmith please review.
For background, the current approach of prefixing the queryset name produced inconvenient groups on the back end:
image
This fix was discussed and approved by @ghalliday

jakesmith
jakesmith reviewed Jan 20, 2025
View reviewed changes
roxie/ccd/ccdlistener.cpp Outdated
spanName.append('/');
spanName.append(spanQueryName);
requestSpan.setown(queryTraceManager().createServerSpan(spanName, allHeaders, flags));
requestSpan.setown(queryTraceManager().createServerSpan(!isEmptyString(queryName) ? queryName : "run_queryX", allHeaders, flags));
Copy link
Member

Choose a reason for hiding this comment

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

I presume intentional that if queryName undefined it is now "run_queryX" (extra X) vs previously "run_query" ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Great catch @jakesmith . No that was used in testing. I'll revert.

jakesmith
jakesmith approved these changes Jan 20, 2025
View reviewed changes
Copy link
Member

@jakesmith jakesmith left a comment

Choose a reason for hiding this comment

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

@rpastrana - 1 trivial question, but approving anyway as probably intentional and of little consequence.

@rpastrana
HPCC-33191 Simplify roxie span names
a491637 
- Removes roxie span name prefix
- Anotates roxie spans with queryset name

Signed-off-by: Rodrigo Pastrana <rodrigo.pastrana@lexisnexisrisk.com>
@rpastrana rpastrana force-pushed the HPCC-33191-NormalizeRoxieSpanNames branch from 38f324c to a491637 Compare January 21, 2025 14:24
@rpastrana
Copy link
Member Author

Minor issue fixed and squashed. Ready for merge.

@jakesmith jakesmith merged commit d5ea104 into hpcc-systems:candidate-9.8.x Jan 23, 2025
51 checks passed
@github-actions GitHub Actions
Copy link

Jirabot Action Result:
Added fix version: 9.8.54
Workflow Transition: 'Resolve issue'

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

@jakesmith jakesmith jakesmith approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rpastrana @jakesmith