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-32961 OwnedSpanScope assignment causes early span end #19288

Merged
merged 1 commit into from
Dec 5, 2024

Conversation

jpmcmu
Copy link
Contributor

@jpmcmu jpmcmu commented Nov 8, 2024

  • Added OwnedSpanScope assignment operator for ISpan*
  • Deleted OwnedSpanScope copy constructor and assignment operator

Signed-off-by: James McMullan [email protected]

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:

Copy link

github-actions bot commented Nov 8, 2024

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

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

@jpmcmu jpmcmu requested a review from ghalliday November 8, 2024 19:59
@ghalliday
Copy link
Member

@jpmcmu I think this is a good change, but I cannot reproduce your symptoms.
I added tracing into the destructor for OwnedSpanScope, and tested a simple call of

OwnedSpanScope scope = queryTraceManager().createServerSpan("hello", nullptr);

and it only output the tracing once. I will merge this change anyway, because it is cleaner, but what is the example code you were hitting a problem on?

system/jlib/jtrace.hpp Outdated Show resolved Hide resolved
@jpmcmu
Copy link
Contributor Author

jpmcmu commented Nov 11, 2024

@ghalliday I was expecting OwnedSpanScope scope = queryTraceManager().createServerSpan("MySpan"); to also reproduce the issue, but it appears it only occurs in the following scenario:
OwnedSpanScope scope; scope = queryTraceManager().createServerSpan("MySpan");

I will remove the operator=(ISpan*) in favor of the move assignment operator

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.

@jpmcmu see comments

~OwnedSpanScope();

inline ISpan * operator -> () const { return span; }
inline operator ISpan *() const { return span; }

inline OwnedSpanScope& operator=(ISpan * ptr) = delete;
inline OwnedSpanScope& operator=(const OwnedSpanScope& rhs) = delete;
inline OwnedSpanScope& operator=(OwnedSpanScope&& rhs)
Copy link
Member

Choose a reason for hiding this comment

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

Given thoughts on HPCC-32982 I think this should probably be deleted. I'm not sure it makes sense because of the additional semantics of setting the thread active span - the user should only use set/setown.

- Deleted operators that could potentially cause issues

Signed-off-by: James McMullan [email protected]
@jpmcmu
Copy link
Contributor Author

jpmcmu commented Dec 5, 2024

@ghalliday Pushed up changes for deleted move assignment operator

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.

The change looks good.

@ghalliday
Copy link
Member

@jpmcmu for the future, please try avoiding pushing a new commit, squashing and rebasing at the same time - it makes it hard to track what has changed.

@ghalliday ghalliday merged commit 277538e into hpcc-systems:candidate-9.8.x Dec 5, 2024
50 of 51 checks passed
Copy link

github-actions bot commented Dec 5, 2024

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

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