Skip to content

Commit d8aab5d

Browse files
Copilottarekgh
andcommitted
Fix DebuggerProxy to show property names and move TagObjects to top
Co-authored-by: tarekgh <10833894+tarekgh@users.noreply.github.com>
1 parent f6db096 commit d8aab5d

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2189,23 +2189,8 @@ public ActivityDebuggerProxy(Activity activity)
21892189
public string? Id => _activity.Id;
21902190
public string OperationName => _activity.OperationName;
21912191
public string DisplayName => _activity.DisplayName;
2192-
public ActivitySource Source => _activity.Source;
2193-
public Activity? Parent => _activity.Parent;
2194-
public string? ParentId => _activity.ParentId;
2195-
public ActivityKind Kind => _activity.Kind;
2196-
public DateTime StartTimeUtc => _activity.StartTimeUtc;
2197-
public TimeSpan Duration => _activity.Duration;
2198-
public ActivityTraceId TraceId => _activity.TraceId;
2199-
public ActivitySpanId SpanId => _activity.SpanId;
2200-
public ActivitySpanId ParentSpanId => _activity.ParentSpanId;
2201-
public string? TraceStateString => _activity.TraceStateString;
2202-
public ActivityTraceFlags ActivityTraceFlags => _activity.ActivityTraceFlags;
2203-
public bool HasRemoteParent => _activity.HasRemoteParent;
2204-
public ActivityStatusCode Status => _activity.Status;
2205-
public string? StatusDescription => _activity.StatusDescription;
22062192

2207-
[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
2208-
public KeyValuePair<string, object?>[] Tags
2193+
public KeyValuePair<string, object?>[] TagObjects
22092194
{
22102195
get
22112196
{
@@ -2218,7 +2203,6 @@ public ActivityDebuggerProxy(Activity activity)
22182203
}
22192204
}
22202205

2221-
[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
22222206
public KeyValuePair<string, string?>[] Baggage
22232207
{
22242208
get
@@ -2232,7 +2216,6 @@ public ActivityDebuggerProxy(Activity activity)
22322216
}
22332217
}
22342218

2235-
[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
22362219
public ActivityEvent[] Events
22372220
{
22382221
get
@@ -2246,7 +2229,6 @@ public ActivityEvent[] Events
22462229
}
22472230
}
22482231

2249-
[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
22502232
public ActivityLink[] Links
22512233
{
22522234
get
@@ -2259,5 +2241,21 @@ public ActivityLink[] Links
22592241
return links.ToArray();
22602242
}
22612243
}
2244+
2245+
public ActivityContext Context => _activity.Context;
2246+
public ActivitySource Source => _activity.Source;
2247+
public Activity? Parent => _activity.Parent;
2248+
public string? ParentId => _activity.ParentId;
2249+
public ActivityKind Kind => _activity.Kind;
2250+
public DateTime StartTimeUtc => _activity.StartTimeUtc;
2251+
public TimeSpan Duration => _activity.Duration;
2252+
public ActivityTraceId TraceId => _activity.TraceId;
2253+
public ActivitySpanId SpanId => _activity.SpanId;
2254+
public ActivitySpanId ParentSpanId => _activity.ParentSpanId;
2255+
public string? TraceStateString => _activity.TraceStateString;
2256+
public ActivityTraceFlags ActivityTraceFlags => _activity.ActivityTraceFlags;
2257+
public bool HasRemoteParent => _activity.HasRemoteParent;
2258+
public ActivityStatusCode Status => _activity.Status;
2259+
public string? StatusDescription => _activity.StatusDescription;
22622260
}
22632261
}

src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2580,7 +2580,7 @@ public void TestActivityDebuggerProxy()
25802580
Assert.NotNull(operationNameProp);
25812581
Assert.Equal("TestOperation", operationNameProp.GetValue(proxy));
25822582

2583-
PropertyInfo? tagsProp = proxyType.GetProperty("Tags");
2583+
PropertyInfo? tagsProp = proxyType.GetProperty("TagObjects");
25842584
Assert.NotNull(tagsProp);
25852585
object? tags = tagsProp.GetValue(proxy);
25862586
Assert.NotNull(tags);

0 commit comments

Comments
 (0)