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

Removed IsOk property from Status and fixed StatusCode enum values #1414

Merged
merged 3 commits into from
Oct 28, 2020
Merged

Removed IsOk property from Status and fixed StatusCode enum values #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc5ace0
Removing IsOk property
eddynaka Oct 28, 2020
55a1c43
updating changelog
eddynaka Oct 28, 2020
437548d
Updating StatusCode enum and tests
eddynaka Oct 28, 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
3 changes: 3 additions & 0 deletions src/OpenTelemetry.Api/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* Removed `IsOk` property from `Status` and fixed `StatusCode` enum values
([#1414](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1414))

## 0.7.0-beta.1

Released 2020-Oct-16
Expand Down
5 changes: 0 additions & 5 deletions src/OpenTelemetry.Api/Trace/Status.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@ internal Status(StatusCode statusCode, string description = null)
/// </summary>
public string Description { get; }

/// <summary>
/// Gets a value indicating whether span completed successfully.
/// </summary>
public bool IsOk => this.StatusCode == StatusCode.Ok;

/// <summary>
/// Compare two <see cref="Status"/> for equality.
/// </summary>
Expand Down
8 changes: 4 additions & 4 deletions src/OpenTelemetry.Api/Trace/StatusCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ public enum StatusCode
Unset = 0,

/// <summary>
/// The operation contains an error.
/// The operation completed successfully.
/// </summary>
Error = 1,
Ok = 1,

/// <summary>
/// The operation completed successfully.
/// The operation contains an error.
/// </summary>
Ok = 2,
Error = 2,
}
}
1 change: 0 additions & 1 deletion test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ void ConfigureTestServices(IServiceCollection services)

var status = activity.GetStatus();
Assert.Equal(status, Status.Unset);
Assert.False(status.IsOk);
}

[Theory]
Expand Down
4 changes: 2 additions & 2 deletions test/OpenTelemetry.Tests/Trace/ActivityExtensionsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void SetStatus()
activity.SetStatus(Status.Ok);
activity?.Stop();

Assert.True(activity.GetStatus().IsOk);
Assert.Equal(Status.Ok, activity.GetStatus());
}

[Fact]
Expand Down Expand Up @@ -101,7 +101,7 @@ public void LastSetStatusWins()
activity.SetStatus(Status.Ok);
activity?.Stop();

Assert.True(activity.GetStatus().IsOk);
Assert.Equal(Status.Ok, activity.GetStatus());
}

[Fact]
Expand Down
2 changes: 0 additions & 2 deletions test/OpenTelemetry.Tests/Trace/StatusTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public void Status_Ok()
{
Assert.Equal(StatusCode.Ok, Status.Ok.StatusCode);
Assert.Null(Status.Ok.Description);
Assert.True(Status.Ok.IsOk);
}

[Fact]
Expand All @@ -33,7 +32,6 @@ public void CreateStatus_WithDescription()
var status = Status.Error.WithDescription("This is an error.");
Assert.Equal(StatusCode.Error, status.StatusCode);
Assert.Equal("This is an error.", status.Description);
Assert.False(status.IsOk);
}

[Fact]
Expand Down