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

remove redundant instrumentations != null checks #6091

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+17 −30
Open

remove redundant instrumentations != null checks #6091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90acf4b
remove redundant instrumentations != null checks
SimonCropp Jan 23, 2025
53a2791
Merge branch 'main' into remove-redundant-instrumentations-!=-null-ch…
SimonCropp Jan 24, 2025
220a6e5
Merge branch 'main' into remove-redundant-instrumentations-!=-null-ch…
SimonCropp Jan 25, 2025
4b34dbb
Merge branch 'main' into remove-redundant-instrumentations-!=-null-ch…
SimonCropp Jan 31, 2025
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
11 changes: 4 additions & 7 deletions src/OpenTelemetry/Logs/LoggerProviderSdk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,13 @@ protected override void Dispose(bool disposing)
{
if (disposing)
{
if (this.instrumentations != null)
foreach (var item in this.instrumentations)
{
foreach (var item in this.instrumentations)
{
(item as IDisposable)?.Dispose();
}

this.instrumentations.Clear();
(item as IDisposable)?.Dispose();
}

this.instrumentations.Clear();

// Wait for up to 5 seconds grace period
this.Processor?.Shutdown(5000);
this.Processor?.Dispose();
Expand Down
11 changes: 4 additions & 7 deletions src/OpenTelemetry/Metrics/MeterProviderSdk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,16 +451,13 @@ protected override void Dispose(bool disposing)
{
if (disposing)
{
if (this.instrumentations != null)
foreach (var item in this.instrumentations)
{
foreach (var item in this.instrumentations)
{
(item as IDisposable)?.Dispose();
}

this.instrumentations.Clear();
(item as IDisposable)?.Dispose();
}

this.instrumentations.Clear();

// Wait for up to 5 seconds grace period
this.reader?.Shutdown(5000);
this.reader?.Dispose();
Expand Down
25 changes: 9 additions & 16 deletions src/OpenTelemetry/Trace/TracerProviderSdk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,18 +352,14 @@ internal bool OnForceFlush(int timeoutMilliseconds)
internal bool OnShutdown(int timeoutMilliseconds)
{
// TO DO Put OnShutdown logic in a task to run within the user provider timeOutMilliseconds
bool? result;
if (this.instrumentations != null)
foreach (var item in this.instrumentations)
{
foreach (var item in this.instrumentations)
{
(item as IDisposable)?.Dispose();
}

this.instrumentations.Clear();
(item as IDisposable)?.Dispose();
}

result = this.processor?.Shutdown(timeoutMilliseconds);
this.instrumentations.Clear();

bool? result = this.processor?.Shutdown(timeoutMilliseconds);
this.listener?.Dispose();
return result ?? true;
}
Expand All @@ -374,16 +370,13 @@ protected override void Dispose(bool disposing)
{
if (disposing)
{
if (this.instrumentations != null)
foreach (var item in this.instrumentations)
{
foreach (var item in this.instrumentations)
{
(item as IDisposable)?.Dispose();
}

this.instrumentations.Clear();
(item as IDisposable)?.Dispose();
}

this.instrumentations.Clear();

(this.sampler as IDisposable)?.Dispose();

// Wait for up to 5 seconds grace period
Expand Down
Loading