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

Updating ActivityProcessor #975

Merged
merged 19 commits into from
Aug 4, 2020
Merged

Updating ActivityProcessor #975

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1283315
Updating ActivityProcessor
eddynaka Aug 2, 2020
95412d5
updating to inRange
eddynaka Aug 2, 2020
4609d92
following docs.microsoft
eddynaka Aug 2, 2020
bfce11e
updating tests and changelog
eddynaka Aug 3, 2020
8989bb8
Adding in changelog custom behavior
eddynaka Aug 3, 2020
75e7516
Removing duplicated IDisposable
eddynaka Aug 3, 2020
a568d33
forcing dispose
eddynaka Aug 3, 2020
6726a49
updating tests
eddynaka Aug 3, 2020
d050af8
moving to single instead of equal one
eddynaka Aug 3, 2020
49567fc
returning to default
eddynaka Aug 3, 2020
1716c04
setting more time to pass tests
eddynaka Aug 3, 2020
4b6b181
forcing dispose
eddynaka Aug 3, 2020
ad135e6
Merge branch 'master' into feature/updating-activity-processor
eddynaka Aug 3, 2020
6541ac9
reiley's suggestions
eddynaka Aug 3, 2020
e1e975b
Merge branch 'feature/updating-activity-processor' of https://github.…
eddynaka Aug 3, 2020
af7ce79
reverting order
eddynaka Aug 3, 2020
100ffa2
Merge branch 'master' into feature/updating-activity-processor
cijothomas Aug 4, 2020
7aafbc4
Merge branch 'master' into feature/updating-activity-processor
eddynaka Aug 4, 2020
cf3b1a1
Merge branch 'master' into feature/updating-activity-processor
eddynaka Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/OpenTelemetry/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

## Unreleased

* `ActivityProcessor` implements IDisposable
* `ActivityProcessor` implements IDisposable.
* When `Dispose` occurs, it calls `ShutdownAsync`.
Copy link
Member

Choose a reason for hiding this comment

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

Need to highlight that user should override their Dispose method, if they want to achieve custom behavior.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just updated

* `BatchingActivityProcessor`/`SimpleActivityProcessor` is disposable and it
disposes the containing exporter.
* `BroadcastActivityProcessor`is disposable and it disposes the processors.

## 0.3.0-beta

Expand Down
8 changes: 5 additions & 3 deletions test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlEventSourceTests.netfx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ public void EventSourceFakeTests(
int compositeState = successFlag | isSqlExceptionFlag | synchronousFlag;

fakeSqlEventSource.WriteEndExecuteEvent(objectId, compositeState, sqlExceptionNumber);

Assert.InRange(activityProcessor.Invocations.Count, 2, 3);
shutdownSignal.Dispose();
Assert.Equal(3, activityProcessor.Invocations.Count);

var activity = (Activity)activityProcessor.Invocations[1].Arguments[0];

Expand All @@ -153,7 +153,9 @@ public void EventSourceFakeUnknownEventWithNullPayloadTest()

fakeSqlEventSource.WriteUnknownEventWithNullPayload();

Assert.InRange(activityProcessor.Invocations.Count, 0, 1);
shutdownSignal.Dispose();

Assert.Single(activityProcessor.Invocations);
}

[Fact]
Expand Down