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

Support transaction waiting for children to finish. #1535

Merged
merged 12 commits into from
Jun 23, 2021
Merged

Support transaction waiting for children to finish. #1535

merged 12 commits into from
Jun 23, 2021

Conversation

maciejwalkowiak
Copy link
Contributor

@maciejwalkowiak maciejwalkowiak commented Jun 16, 2021

📜 Description

Adds an option to create transaction that finishes only when it is itself finished and all its children are finished.

💡 Motivation and Context

Fixes #1523

💚 How did you test it?

Unit tests.

📝 Checklist

  • I reviewed the submitted code
  • I added tests to verify the changes
  • I updated the docs if needed
  • No breaking changes

🔮 Next steps

Reference docs.

@maciejwalkowiak
Copy link
Contributor Author

@marandaneto as we do not want to make it a part of public API, but rather use it for Android integration, what API method on the IHub would you expect?

@marandaneto
Copy link
Contributor

@maciejwalkowiak we probably still need a timeout feature, for spans that never finish or such other corner cases, iOS right now does not do it either, @philipphofmann @brustolin do you recall if we've decided to add on iOS too?

@marandaneto
Copy link
Contributor

@marandaneto as we do not want to make it a part of public API, but rather use it for Android integration, what API method on the IHub would you expect?

to be honest, I think this would be an issue for Java Desktop Apps too, don't you? we can start exposing it to Hub with @ApiStatus.Internal, I'm not sure how we could do it otherwise, even if using SentryAndroid, looks like we still need something available in the Hub

@maciejwalkowiak
Copy link
Contributor Author

Sure for desktop too, but you I thought you have exact use case in mind. Then I'll just add another variant of startTransaction.

@maciejwalkowiak maciejwalkowiak marked this pull request as ready for review June 16, 2021 08:30
@philipphofmann
Copy link
Member

@maciejwalkowiak we probably still need a timeout feature, for spans that never finish or such other corner cases, iOS right now does not do it either, @philipphofmann @brustolin do you recall if we've decided to add on iOS too?

We didn't add it yet on iOS. I created an issue to discuss this today at grooming getsentry/sentry-cocoa#1173.

@marandaneto
Copy link
Contributor

marandaneto commented Jun 16, 2021

I have the impression that there's a bug.

val tr = startTranasction(x)
val span tr.startChild(x)
span.finish()
// at this point, tr has a single child and its finished, tr is gonna be finished automatically, it should not.
// `tr` should only auto finish once all children are finished and once somebody called `tr.finish(x)`

can you confirm my use case? thanks

@marandaneto
Copy link
Contributor

@brustolin and @philipphofmann please review since this is done on iOS too

Copy link
Member

@philipphofmann philipphofmann left a comment

Choose a reason for hiding this comment

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

I currently only have one comment to add.

@codecov-commenter
Copy link

codecov-commenter commented Jun 16, 2021

Codecov Report

Merging #1535 (f4d2a2c) into main (1cdf98b) will increase coverage by 0.00%.
The diff coverage is 80.95%.

Impacted file tree graph

@@            Coverage Diff            @@
##               main    #1535   +/-   ##
=========================================
  Coverage     76.01%   76.01%           
- Complexity     1944     1953    +9     
=========================================
  Files           192      192           
  Lines          6725     6759   +34     
  Branches        670      676    +6     
=========================================
+ Hits           5112     5138   +26     
- Misses         1287     1294    +7     
- Partials        326      327    +1     
Impacted Files Coverage Δ
sentry/src/main/java/io/sentry/HubAdapter.java 5.08% <0.00%> (-0.09%) ⬇️
sentry/src/main/java/io/sentry/IHub.java 90.47% <ø> (ø)
sentry/src/main/java/io/sentry/NoOpHub.java 47.50% <0.00%> (-1.22%) ⬇️
sentry/src/main/java/io/sentry/Sentry.java 41.49% <0.00%> (-0.58%) ⬇️
sentry/src/main/java/io/sentry/Hub.java 73.00% <66.66%> (-0.21%) ⬇️
sentry/src/main/java/io/sentry/SentryTracer.java 92.66% <89.65%> (-1.39%) ⬇️
sentry/src/main/java/io/sentry/Span.java 91.22% <100.00%> (+0.66%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1cdf98b...f4d2a2c. Read the comment docs.

Co-authored-by: Manoel Aranda Neto <5731772+marandaneto@users.noreply.github.com>
@maciejwalkowiak
Copy link
Contributor Author

@marandaneto @bruno-garcia is there anything more do you think we should change here?

CHANGELOG.md Outdated Show resolved Hide resolved
@marandaneto
Copy link
Contributor

@marandaneto @bruno-garcia is there anything more do you think we should change here?

probably #1535 (comment) and #1528 (comment)

I'll discuss both this afternoon with the team, maybe the later could be already done

@bruno-garcia
Copy link
Member

@maciejwalkowiak we probably still need a timeout feature, for spans that never finish or such other corner cases, iOS right now does not do it either, @philipphofmann @brustolin do you recall if we've decided to add on iOS too?

We could merge as-is and add the timeout later? It would unblock Android.

@maciejwalkowiak I am branched from your branch gh-1523, can we make an easy overload for such option? that allows name, op and waitForChildren, with or without startTimestamp

Could the overload be added to the other branch instead and we just merge this?

CHANGELOG.md Outdated Show resolved Hide resolved
@marandaneto marandaneto merged commit 802f79c into main Jun 23, 2021
@marandaneto marandaneto deleted the gh-1523 branch June 23, 2021 12:48
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.

Support transaction finishing automatically with 'idle timeout'
6 participants