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

Update Request and Dependency Success criteria to use Activity.Status #31024

Merged
merged 3 commits into from
Sep 9, 2022
Merged

Update Request and Dependency Success criteria to use Activity.Status #31024

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3cd074e
update Success criteria to use Activity.Status
Sep 8, 2022
99adc46
update changelog
Sep 8, 2022
984e78c
clean up test
Sep 9, 2022
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 sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@

### Breaking Changes

* [Request and Dependency Success criteria will now be decided based on
`Activity.Status`](https://github.com/Azure/azure-sdk-for-net/pull/31024)

### Bugs Fixed

* [Remove populating _MS.AggregationIntervalMs to all metrics](https://github.com/Azure/azure-sdk-for-net/pull/29473)
Expand Down
2 changes: 1 addition & 1 deletion ...or/Azure.Monitor.OpenTelemetry.Exporter/src/Customizations/Models/RemoteDependencyData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public RemoteDependencyData(int version, Activity activity, ref TagEnumerationSt
Duration = activity.Duration < SchemaConstants.RemoteDependencyData_Duration_LessThanDays
? activity.Duration.ToString("c", CultureInfo.InvariantCulture)
: SchemaConstants.Duration_MaxValue;
Success = activity.GetStatus().StatusCode != StatusCode.Error;
Success = activity.Status != ActivityStatusCode.Error;

switch (monitorTags.activityType)
{
Expand Down
2 changes: 1 addition & 1 deletion sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter/src/Customizations/Models/RequestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public RequestData(int version, Activity activity, ref TagEnumerationState monit
Duration = activity.Duration < SchemaConstants.RequestData_Duration_LessThanDays
? activity.Duration.ToString("c", CultureInfo.InvariantCulture)
: SchemaConstants.Duration_MaxValue;
Success = activity.GetStatus().StatusCode != StatusCode.Error;
Success = activity.Status != ActivityStatusCode.Error;
ResponseCode = AzMonList.GetTagValue(ref monitorTags.MappedTags, SemanticConventions.AttributeHttpStatusCode)
?.ToString().Truncate(SchemaConstants.RequestData_ResponseCode_MaxLength)
?? "0";
Expand Down
20 changes: 7 additions & 13 deletions ...or.OpenTelemetry.Exporter/tests/Azure.Monitor.OpenTelemetry.Exporter.Tests/StatusTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
using Azure.Monitor.OpenTelemetry.Exporter.Internals;
using Azure.Monitor.OpenTelemetry.Exporter.Models;

using OpenTelemetry.Trace;

using Xunit;

namespace Azure.Monitor.OpenTelemetry.Exporter.Tests
Expand All @@ -33,13 +31,10 @@ static StatusTests()
}

[Theory]
[InlineData("Ok", null)]
[InlineData("Error", null)]
[InlineData("Unset", null)]
[InlineData("Ok", "statusdescription")]
[InlineData("Error", "statusdescription")]
[InlineData("Unset", "statusdescription")]
public void ValidateStatusForAzureMonitorTrace(string activityStatusCode, string activityStatusDescription)
[InlineData(ActivityStatusCode.Ok, "statusdescription")]
[InlineData(ActivityStatusCode.Error, "statusdescription")]
[InlineData(ActivityStatusCode.Unset, "statusdescription")]
public void ValidateStatusForAzureMonitorTrace(ActivityStatusCode activityStatusCode, string activityStatusDescription)
{
using ActivitySource activitySource = new ActivitySource(ActivitySourceName);
using var activity = activitySource.StartActivity(
Expand All @@ -48,8 +43,7 @@ public void ValidateStatusForAzureMonitorTrace(string activityStatusCode, string
parentContext: new ActivityContext(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom(), ActivityTraceFlags.Recorded),
startTime: DateTime.UtcNow);

activity.SetTag("otel.status_code", activityStatusCode);
activity.SetTag("otel.status_description", activityStatusDescription);
activity.SetStatus(activityStatusCode, activityStatusDescription);
vishweshbankwar marked this conversation as resolved.
Show resolved Hide resolved

activity.SetTag(SemanticConventions.AttributeHttpUrl, "https://www.foo.bar/search");

Expand All @@ -58,8 +52,8 @@ public void ValidateStatusForAzureMonitorTrace(string activityStatusCode, string
var requestData = new RequestData(2, activity, ref monitorTags);
var remoteDependencyData = new RemoteDependencyData(2, activity, ref monitorTags);

Assert.Equal(activity.GetStatus().StatusCode != StatusCode.Error, requestData.Success);
Assert.Equal(activity.GetStatus().StatusCode != StatusCode.Error, remoteDependencyData.Success);
Assert.Equal(activity.Status != ActivityStatusCode.Error, requestData.Success);
Assert.Equal(activity.Status != ActivityStatusCode.Error, remoteDependencyData.Success);
}
}
}