Skip to content

Commit 0eeff00

Browse files
authored
Update ActivityExtensions mark failed after review (Azure#49759)
* Update ActivityExtensions.MarkFailed name from review * export api and fix samples
1 parent 95e7843 commit 0eeff00

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

sdk/core/System.ClientModel/api/System.ClientModel.net6.0.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ namespace System.ClientModel.Primitives
6464
{
6565
public static partial class ActivityExtensions
6666
{
67-
public static System.Diagnostics.Activity MarkFailed(this System.Diagnostics.Activity activity, System.Exception? exception) { throw null; }
67+
public static System.Diagnostics.Activity MarkClientActivityFailed(this System.Diagnostics.Activity activity, System.Exception? exception) { throw null; }
6868
public static System.Diagnostics.Activity? StartClientActivity(this System.Diagnostics.ActivitySource activitySource, System.ClientModel.Primitives.ClientPipelineOptions options, string name, System.Diagnostics.ActivityKind kind = System.Diagnostics.ActivityKind.Internal, System.Diagnostics.ActivityContext parentContext = default(System.Diagnostics.ActivityContext), System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object?>>? tags = null) { throw null; }
6969
}
7070
public partial class ApiKeyAuthenticationPolicy : System.ClientModel.Primitives.PipelinePolicy

sdk/core/System.ClientModel/api/System.ClientModel.net8.0.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ namespace System.ClientModel.Primitives
6464
{
6565
public static partial class ActivityExtensions
6666
{
67-
public static System.Diagnostics.Activity MarkFailed(this System.Diagnostics.Activity activity, System.Exception? exception) { throw null; }
67+
public static System.Diagnostics.Activity MarkClientActivityFailed(this System.Diagnostics.Activity activity, System.Exception? exception) { throw null; }
6868
public static System.Diagnostics.Activity? StartClientActivity(this System.Diagnostics.ActivitySource activitySource, System.ClientModel.Primitives.ClientPipelineOptions options, string name, System.Diagnostics.ActivityKind kind = System.Diagnostics.ActivityKind.Internal, System.Diagnostics.ActivityContext parentContext = default(System.Diagnostics.ActivityContext), System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object?>>? tags = null) { throw null; }
6969
}
7070
public partial class ApiKeyAuthenticationPolicy : System.ClientModel.Primitives.PipelinePolicy

sdk/core/System.ClientModel/api/System.ClientModel.netstandard2.0.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ namespace System.ClientModel.Primitives
6464
{
6565
public static partial class ActivityExtensions
6666
{
67-
public static System.Diagnostics.Activity MarkFailed(this System.Diagnostics.Activity activity, System.Exception? exception) { throw null; }
67+
public static System.Diagnostics.Activity MarkClientActivityFailed(this System.Diagnostics.Activity activity, System.Exception? exception) { throw null; }
6868
public static System.Diagnostics.Activity? StartClientActivity(this System.Diagnostics.ActivitySource activitySource, System.ClientModel.Primitives.ClientPipelineOptions options, string name, System.Diagnostics.ActivityKind kind = System.Diagnostics.ActivityKind.Internal, System.Diagnostics.ActivityContext parentContext = default(System.Diagnostics.ActivityContext), System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object?>>? tags = null) { throw null; }
6969
}
7070
public partial class ApiKeyAuthenticationPolicy : System.ClientModel.Primitives.PipelinePolicy

sdk/core/System.ClientModel/samples/Diagnostics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public class SampleClient
8080
catch (Exception ex)
8181
{
8282
// Catch any exceptions and update the activity. Then re-throw the exception.
83-
activity?.MarkFailed(ex);
83+
activity?.MarkClientActivityFailed(ex);
8484
throw;
8585
}
8686
}

sdk/core/System.ClientModel/src/Convenience/ActivityExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static class ActivityExtensions
6969
/// to implement distributed tracing.</remarks>
7070
/// <param name="activity">The activity to mark as failed.</param>
7171
/// <param name="exception">The <see cref="Exception"/> encountered during the operation.</param>
72-
public static Activity MarkFailed(this Activity activity, Exception? exception)
72+
public static Activity MarkClientActivityFailed(this Activity activity, Exception? exception)
7373
{
7474
// See: https://opentelemetry.io/docs/specs/semconv/general/recording-errors/
7575

sdk/core/System.ClientModel/tests/Convenience/ActivityExtensionsTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public void FailureIsMarkedWithStatus()
168168
MockPipelineResponse response = new(500, "Internal Server error");
169169
ClientResultException exception = new(message, response);
170170

171-
activity?.MarkFailed(exception);
171+
activity?.MarkClientActivityFailed(exception);
172172

173173
Assert.NotNull(activity);
174174
Assert.AreEqual(message, activity!.StatusDescription);
@@ -191,7 +191,7 @@ public void FailureIsMarkedWithExceptionType()
191191
string message = "Value cannot be null. (Parameter 'parameter')";
192192
#endif
193193

194-
activity?.MarkFailed(exception);
194+
activity?.MarkClientActivityFailed(exception);
195195

196196
Assert.NotNull(activity);
197197
Assert.AreEqual(message, activity!.StatusDescription);
@@ -207,7 +207,7 @@ public void FailureIsMarkedWithOther()
207207

208208
using Activity? activity = activitySource.StartClientActivity(options, "Client.Method");
209209

210-
activity?.MarkFailed(null);
210+
activity?.MarkClientActivityFailed(null);
211211

212212
Assert.NotNull(activity);
213213
Assert.AreEqual(null, activity!.StatusDescription);

sdk/core/System.ClientModel/tests/Samples/DiagnosticsSamples.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public ClientResult<SampleResource> UpdateResource(SampleResource resource)
7070
catch (Exception ex)
7171
{
7272
// Catch any exceptions and update the activity. Then re-throw the exception.
73-
activity?.MarkFailed(ex);
73+
activity?.MarkClientActivityFailed(ex);
7474
throw;
7575
}
7676
}

0 commit comments

Comments
 (0)