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-32455 Upgrade WsSQL instrumentation #19009

Merged
merged 1 commit into from
Oct 4, 2024
Merged

HPCC-32455 Upgrade WsSQL instrumentation #19009

merged 1 commit into from
Oct 4, 2024

Conversation

timothyklemm
Copy link
Contributor

@timothyklemm timothyklemm commented Aug 19, 2024 •
edited
Loading

Replace eight pairs of trace summary timestamps with eight internal spans.

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:

@timothyklemm timothyklemm marked this pull request as draft August 19, 2024 13:12
@timothyklemm timothyklemm requested a review from rpastrana August 19, 2024 13:12
@github-actions GitHub Actions
Copy link

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

Jirabot Action Result:
Workflow Transition: Merge Pending
Updated PR

rpastrana
rpastrana reviewed Aug 27, 2024
View reviewed changes
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.

@timothyklemm looks good, there's some basic info we could add to the new spans.

esp/services/ws_sql/ws_sqlService.cpp
try
{
WsWuHelpers::submitWsWorkunit(context, compiledwuid.str(), cluster, nullptr, 0, 0, true, false, false, nullptr, nullptr, nullptr, nullptr);
waitForWorkUnitToCompile(compiledwuid.str(), req.getWait());
Copy link
Member

Choose a reason for hiding this comment

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

it might help to annotate the span w/ the wuid

esp/services/ws_sql/ws_sqlService.cpp
OwnedSpanScope wuCloneSpanScope(queryThreadedActiveSpan()->createInternalSpan("clone_and_execute_wu"));
try
{
cloneAndExecuteWU(context, compiledwuid.str(), runningwuid, xmlparams.str(), NULL, NULL, cluster);
Copy link
Member

Choose a reason for hiding this comment

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

annotate span w/ both wuids, also cluster might be important to add

esp/services/ws_sql/ws_sqlService.cpp Show resolved Hide resolved
@timothyklemm timothyklemm marked this pull request as ready for review September 12, 2024 20:25
rpastrana
rpastrana approved these changes Sep 27, 2024
View reviewed changes
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.

@timothyklemm approved

HPCC-32455 Upgrade WsSQL instrumentation
6c748d6 
Replace eight pairs of trace summary timestamps with eight internal spans.

Signed-off-by: Tim Klemm <[email protected]>
@timothyklemm
Copy link
Contributor Author

@ghalliday please merge.

ghalliday
ghalliday approved these changes Sep 30, 2024
View reviewed changes
Copy link
Member

@ghalliday ghalliday left a comment

Choose a reason for hiding this comment

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

Any reason why this should go in 9.8.x rather than 9.10.x? If not I will re-target and merge to master.

@timothyklemm
Copy link
Contributor Author

Any reason why this should go in 9.8.x rather than 9.10.x? If not I will re-target and merge to master.

I know it started on 9.8.x before 9.10.x. I'm not aware of any reason it needs to stay there.

@ghalliday ghalliday changed the base branch from candidate-9.8.x to master October 4, 2024 10:30
@ghalliday ghalliday merged commit de8b4d8 into hpcc-systems:master Oct 4, 2024
47 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rpastrana rpastrana rpastrana approved these changes

@ghalliday ghalliday ghalliday 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.
3 participants
@timothyklemm @ghalliday @rpastrana