Skip to content

Commit 4802c93

Browse files
CodeBlanchCodeBlanch
committed
Removed EnrichmentScopeTarget.
1 parent e5ae882 commit 4802c93

File tree

10 files changed

+19
-155
lines changed

10 files changed

+19
-155
lines changed

‎ClassLibraries/Macross.OpenTelemetry.Extensions/Code/ActivityEnrichmentScope/ActionActivityEnrichmentScope.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ namespace Macross.OpenTelemetry.Extensions
55
{
66
internal sealed class ActionActivityEnrichmentScope : ActivityEnrichmentScopeBase
77
{
8-
public Action<Activity> EnrichmentAction { get; private set; }
8+
public Action<Activity>? EnrichmentAction { get; private set; }
99

10-
public ActionActivityEnrichmentScope(Action<Activity> enrichmentAction, EnrichmentScopeTarget target)
11-
: base(target)
10+
public ActionActivityEnrichmentScope(Action<Activity> enrichmentAction)
1211
{
1312
EnrichmentAction = enrichmentAction ?? throw new ArgumentNullException(nameof(enrichmentAction));
1413
}
@@ -18,7 +17,7 @@ public override void Enrich(Activity activity)
1817

1918
protected override void Dispose(bool isDisposing)
2019
{
21-
EnrichmentAction = null!;
20+
EnrichmentAction = null;
2221

2322
base.Dispose(isDisposing);
2423
}

‎ClassLibraries/Macross.OpenTelemetry.Extensions/Code/ActivityEnrichmentScope/ActivityEnrichmentScope.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,18 @@ public static class ActivityEnrichmentScope
1111
/// Registers an action that will be called to enrich the next <see cref="Activity"/> processed under the current scope if it has been sampled.
1212
/// </summary>
1313
/// <param name="enrichmentAction">Action to be called.</param>
14-
/// <param name="target">The target for the enrichment scope.</param>
1514
/// <returns><see cref="IDisposable"/> to cancel the enrichment scope.</returns>
16-
public static IDisposable Begin(Action<Activity> enrichmentAction, EnrichmentScopeTarget target = EnrichmentScopeTarget.AllChildren)
17-
=> new ActionActivityEnrichmentScope(enrichmentAction, target);
15+
public static IDisposable Begin(Action<Activity> enrichmentAction)
16+
=> new ActionActivityEnrichmentScope(enrichmentAction);
1817

1918
/// <summary>
2019
/// Registers an <see cref="ActivityEnricher{TState}"/> that will be called to enrich the next <see cref="Activity"/> processed under the current scope if it has been sampled.
2120
/// </summary>
2221
/// <typeparam name="TState">State type.</typeparam>
2322
/// <param name="activityEnricher"><see cref="ActivityEnricher{TState}"/> to be called.</param>
2423
/// <param name="state">The state to pass to the <see cref="ActivityEnricher{TState}"/>.</param>
25-
/// <param name="target">The target for the enrichment scope.</param>
2624
/// <returns><see cref="IDisposable"/> to cancel the enrichment scope.</returns>
27-
public static IDisposable Begin<TState>(ActivityEnricher<TState> activityEnricher, TState state, EnrichmentScopeTarget target = EnrichmentScopeTarget.AllChildren)
28-
=> new GenericActivityEnrichmentScope<TState>(activityEnricher, state, target);
25+
public static IDisposable Begin<TState>(ActivityEnricher<TState> activityEnricher, TState state)
26+
=> new GenericActivityEnrichmentScope<TState>(activityEnricher, state);
2927
}
3028
}

‎ClassLibraries/Macross.OpenTelemetry.Extensions/Code/ActivityEnrichmentScope/ActivityEnrichmentScopeBase.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@ internal abstract class ActivityEnrichmentScopeBase : IDisposable
1717

1818
public ActivityEnrichmentScopeBase? Child { get; private set; }
1919

20-
public EnrichmentScopeTarget EnrichmentTarget { get; private set; }
21-
22-
protected ActivityEnrichmentScopeBase(EnrichmentScopeTarget target)
20+
protected ActivityEnrichmentScopeBase()
2321
{
24-
EnrichmentTarget = target;
25-
2622
Parent = Current;
2723
if (Parent != null)
2824
{

‎ClassLibraries/Macross.OpenTelemetry.Extensions/Code/ActivityEnrichmentScope/ActivityEnrichmentScopeProcessor.cs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,7 @@ public override void OnEnd(Activity activity)
2424
OpenTelemetryExtensionsEventSource.Log.SpanProcessorException(nameof(ActivityEnrichmentScopeProcessor), ex);
2525
}
2626

27-
ActivityEnrichmentScopeBase? nextParent = scope.Parent;
28-
29-
if (scope.EnrichmentTarget == EnrichmentScopeTarget.FirstChild)
30-
{
31-
scope.Dispose();
32-
}
33-
34-
scope = nextParent;
27+
scope = scope.Parent;
3528
}
3629
}
3730
}

‎ClassLibraries/Macross.OpenTelemetry.Extensions/Code/ActivityEnrichmentScope/EnrichmentScopeTarget.cs‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎ClassLibraries/Macross.OpenTelemetry.Extensions/Code/ActivityEnrichmentScope/GenericActivityEnrichmentScope{TState}.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ internal sealed class GenericActivityEnrichmentScope<TState> : ActivityEnrichmen
77
{
88
private readonly TState _State;
99

10-
public ActivityEnricher<TState> ActivityEnricher { get; private set; }
10+
public ActivityEnricher<TState>? ActivityEnricher { get; private set; }
1111

12-
public GenericActivityEnrichmentScope(ActivityEnricher<TState> activityEnricher, TState state, EnrichmentScopeTarget target)
13-
: base(target)
12+
public GenericActivityEnrichmentScope(ActivityEnricher<TState> activityEnricher, TState state)
1413
{
1514
ActivityEnricher = activityEnricher ?? throw new ArgumentNullException(nameof(activityEnricher));
1615
_State = state;
@@ -21,7 +20,7 @@ public override void Enrich(Activity activity)
2120

2221
protected override void Dispose(bool isDisposing)
2322
{
24-
ActivityEnricher = null!;
23+
ActivityEnricher = null;
2524

2625
base.Dispose(isDisposing);
2726
}

‎ClassLibraries/Macross.OpenTelemetry.Extensions/Code/Macross.OpenTelemetry.Extensions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
2323
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
2424
<VersionPrefix>1.0.0</VersionPrefix>
25-
<VersionSuffix>beta3</VersionSuffix>
25+
<VersionSuffix>beta4</VersionSuffix>
2626
<FileVersion>$(VersionPrefix)</FileVersion>
2727
<PackageProjectUrl>https://github.com/Macross-Software/core/tree/develop/ClassLibraries/Macross.OpenTelemetry.Extensions</PackageProjectUrl>
2828
</PropertyGroup>

‎ClassLibraries/Macross.OpenTelemetry.Extensions/Code/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010

1111
[assembly: InternalsVisibleTo("Macross.OpenTelemetry.Extensions.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1a4dad5605af5f97a39e67571c3a03a6762442db77512795feb38f00db953d7ec222951dd58cd511610c902b73577beb10f1bc868b539a3d1593ae2037524dbb116e7f137a3bfc8d0c9ad7c2e6ea5bb68a86b5fed17516d6678fd9b899e371a14ea4daca38722b8ca030480c69a418b92f5704b1e2a925e213ef9039b2420e7")]
1212

13-
[assembly: AssemblyVersion("1.0.0.21087")]
13+
[assembly: AssemblyVersion("1.0.0.21090")]

‎ClassLibraries/Macross.OpenTelemetry.Extensions/Test/ActivityEnrichmentScopeProcessorTests.cs‎

Lines changed: 4 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -50,65 +50,13 @@ public void SpanNotEnrichedTest()
5050
}
5151

5252
[TestMethod]
53-
public void NextSpanEnrichedActionMethodTest()
53+
public void SpansEnrichedActionMethodTest()
5454
{
5555
using IDisposable reset = _TestActivityProcessor.ResetWhenDone();
5656

5757
Activity activity;
5858

59-
using (ActivityEnrichmentScope.Begin(s_EnrichmentAction, EnrichmentScopeTarget.FirstChild))
60-
{
61-
activity = _ActivitySource.StartActivity("Test1", ActivityKind.Internal)!;
62-
activity.Stop();
63-
64-
activity = _ActivitySource.StartActivity("Test2", ActivityKind.Internal)!;
65-
activity.Stop();
66-
}
67-
68-
activity = _ActivitySource.StartActivity("Test3", ActivityKind.Internal)!;
69-
activity.Stop();
70-
71-
Assert.IsNull(ActivityEnrichmentScopeBase.Current);
72-
Assert.AreEqual(3, _TestActivityProcessor.EndedActivityObjects.Count);
73-
Assert.IsTrue(_TestActivityProcessor.EndedActivityObjects[0].TagObjects.Any(i => i.Key == "enriched" && (i.Value as bool?) == true));
74-
Assert.IsFalse(_TestActivityProcessor.EndedActivityObjects[1].TagObjects.Any());
75-
Assert.IsFalse(_TestActivityProcessor.EndedActivityObjects[2].TagObjects.Any());
76-
}
77-
78-
[TestMethod]
79-
public void NextSpanEnrichedGenricMethodTest()
80-
{
81-
using IDisposable reset = _TestActivityProcessor.ResetWhenDone();
82-
83-
Activity activity;
84-
85-
using (ActivityEnrichmentScope.Begin(s_Enricher, "enrichment_state", EnrichmentScopeTarget.FirstChild))
86-
{
87-
activity = _ActivitySource.StartActivity("Test1", ActivityKind.Internal)!;
88-
activity.Stop();
89-
90-
activity = _ActivitySource.StartActivity("Test2", ActivityKind.Internal)!;
91-
activity.Stop();
92-
}
93-
94-
activity = _ActivitySource.StartActivity("Test3", ActivityKind.Internal)!;
95-
activity.Stop();
96-
97-
Assert.IsNull(ActivityEnrichmentScopeBase.Current);
98-
Assert.AreEqual(3, _TestActivityProcessor.EndedActivityObjects.Count);
99-
Assert.IsTrue(_TestActivityProcessor.EndedActivityObjects[0].TagObjects.Any(i => i.Key == "enrichment_state" && (i.Value as bool?) == true));
100-
Assert.IsFalse(_TestActivityProcessor.EndedActivityObjects[1].TagObjects.Any());
101-
Assert.IsFalse(_TestActivityProcessor.EndedActivityObjects[2].TagObjects.Any());
102-
}
103-
104-
[TestMethod]
105-
public void ChildSpansEnrichedActionMethodTest()
106-
{
107-
using IDisposable reset = _TestActivityProcessor.ResetWhenDone();
108-
109-
Activity activity;
110-
111-
using (ActivityEnrichmentScope.Begin(s_EnrichmentAction, EnrichmentScopeTarget.AllChildren))
59+
using (ActivityEnrichmentScope.Begin(s_EnrichmentAction))
11260
{
11361
activity = _ActivitySource.StartActivity("Test1", ActivityKind.Internal)!;
11462
activity.Stop();
@@ -128,13 +76,13 @@ public void ChildSpansEnrichedActionMethodTest()
12876
}
12977

13078
[TestMethod]
131-
public void ChildSpansEnrichedGenericMethodTest()
79+
public void SpansEnrichedGenericMethodTest()
13280
{
13381
using IDisposable reset = _TestActivityProcessor.ResetWhenDone();
13482

13583
Activity activity;
13684

137-
using (ActivityEnrichmentScope.Begin(s_Enricher, "enrichment_state", EnrichmentScopeTarget.AllChildren))
85+
using (ActivityEnrichmentScope.Begin(s_Enricher, "enrichment_state"))
13886
{
13987
activity = _ActivitySource.StartActivity("Test1", ActivityKind.Internal)!;
14088
activity.Stop();
@@ -153,57 +101,6 @@ public void ChildSpansEnrichedGenericMethodTest()
153101
Assert.IsFalse(_TestActivityProcessor.EndedActivityObjects[2].TagObjects.Any());
154102
}
155103

156-
[TestMethod]
157-
public void MixedTargetEnrichedTest()
158-
{
159-
using IDisposable reset = _TestActivityProcessor.ResetWhenDone();
160-
161-
Activity activity;
162-
163-
using (ActivityEnrichmentScope.Begin((a) => a.AddTag("enrichment.top", true), EnrichmentScopeTarget.AllChildren))
164-
{
165-
activity = _ActivitySource.StartActivity("Test1", ActivityKind.Internal)!; // Test1 <- enrichment.top
166-
activity.Stop();
167-
168-
using (ActivityEnrichmentScope.Begin((a) => a.AddTag("enrichment.next", 1), EnrichmentScopeTarget.FirstChild))
169-
{
170-
activity = _ActivitySource.StartActivity("Test2", ActivityKind.Internal)!; // Test2 <- enrichment.top, enrichment.next=1
171-
activity.Stop();
172-
}
173-
174-
using (ActivityEnrichmentScope.Begin((a) => a.AddTag("enrichment.next", 2), EnrichmentScopeTarget.FirstChild))
175-
{
176-
using (ActivityEnrichmentScope.Begin((a) => a.AddTag("enrichment.inner", true), EnrichmentScopeTarget.AllChildren))
177-
{
178-
activity = _ActivitySource.StartActivity("Test3", ActivityKind.Internal)!; // Test3 <- enrichment.top, enrichment.next=2, enrichment.inner
179-
activity.Stop();
180-
181-
activity = _ActivitySource.StartActivity("Test4", ActivityKind.Internal)!; // Test4 <- enrichment.top, enrichment.inner
182-
activity.Stop();
183-
}
184-
}
185-
186-
activity = _ActivitySource.StartActivity("Test5", ActivityKind.Internal)!; // Test5 <- enrichment.top
187-
activity.Stop();
188-
}
189-
190-
activity = _ActivitySource.StartActivity("Test6", ActivityKind.Internal)!;
191-
activity.Stop();
192-
193-
Assert.IsNull(ActivityEnrichmentScopeBase.Current);
194-
195-
Assert.AreEqual(6, _TestActivityProcessor.EndedActivityObjects.Count);
196-
197-
List<Activity> activities = _TestActivityProcessor.EndedActivityObjects;
198-
199-
EnsureActivityMatchesTags(activities[0], new KeyValuePair<string, object>("enrichment.top", true));
200-
EnsureActivityMatchesTags(activities[1], new KeyValuePair<string, object>("enrichment.top", true), new KeyValuePair<string, object>("enrichment.next", 1));
201-
EnsureActivityMatchesTags(activities[2], new KeyValuePair<string, object>("enrichment.top", true), new KeyValuePair<string, object>("enrichment.next", 2), new KeyValuePair<string, object>("enrichment.inner", true));
202-
EnsureActivityMatchesTags(activities[3], new KeyValuePair<string, object>("enrichment.top", true), new KeyValuePair<string, object>("enrichment.inner", true));
203-
EnsureActivityMatchesTags(activities[4], new KeyValuePair<string, object>("enrichment.top", true));
204-
Assert.IsFalse(activities[5].TagObjects.Any());
205-
}
206-
207104
[TestMethod]
208105
public void DisposeOutOfOrderTest1()
209106
{

‎ClassLibraries/Macross.OpenTelemetry.Extensions/Test/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
[assembly: Guid("beb815de-41a4-4cfe-80eb-a5a1d64559c5")]
99

10-
[assembly: AssemblyVersion("0.0.0.21087")]
10+
[assembly: AssemblyVersion("0.0.0.21090")]

0 commit comments

Comments
 (0)