From 1758e322225dbfbb72cec5085dc1ff460c12c22c Mon Sep 17 00:00:00 2001 From: Eddy Nakamura Date: Wed, 5 Aug 2020 19:08:30 -0300 Subject: [PATCH] Renaming BroadcastActivity (#1015) * Renaming BroadcastActivity * updating issue number Co-authored-by: Mikel Blanchard --- src/OpenTelemetry/CHANGELOG.md | 1 + src/OpenTelemetry/Sdk.cs | 2 +- ...tyProcessor.cs => FanOutActivityProcessor.cs} | 10 +++++----- ...rTests.cs => FanOutActivityProcessorTests.cs} | 16 ++++++++-------- 4 files changed, 15 insertions(+), 14 deletions(-) rename src/OpenTelemetry/Trace/Internal/{BroadcastActivityProcessor.cs => FanOutActivityProcessor.cs} (90%) rename test/OpenTelemetry.Tests/Implementation/Trace/Config/{BroadcastActivityProcessorTests.cs => FanOutActivityProcessorTests.cs} (87%) diff --git a/src/OpenTelemetry/CHANGELOG.md b/src/OpenTelemetry/CHANGELOG.md index d780fc4d852..6b820f988e0 100644 --- a/src/OpenTelemetry/CHANGELOG.md +++ b/src/OpenTelemetry/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased +* Renaming `BroadcastActivityProcessor` to `FanOutActivityProcessor` (#1015) * Introduce `SuppressInstrumentationScope` API (#988). * `ActivityProcessor` implements `IDisposable`. * When `Dispose` occurs, it calls `ShutdownAsync`. diff --git a/src/OpenTelemetry/Sdk.cs b/src/OpenTelemetry/Sdk.cs index 2ac5d4f1414..fda490cd529 100644 --- a/src/OpenTelemetry/Sdk.cs +++ b/src/OpenTelemetry/Sdk.cs @@ -110,7 +110,7 @@ public static TracerProvider CreateTracerProvider(Action processors[i] = tracerProviderBuilder.ProcessingPipelines[i].Build(); } - activityProcessor = new BroadcastActivityProcessor(processors); + activityProcessor = new FanOutActivityProcessor(processors); } tracerProviderSdk.Resource = tracerProviderBuilder.Resource; diff --git a/src/OpenTelemetry/Trace/Internal/BroadcastActivityProcessor.cs b/src/OpenTelemetry/Trace/Internal/FanOutActivityProcessor.cs similarity index 90% rename from src/OpenTelemetry/Trace/Internal/BroadcastActivityProcessor.cs rename to src/OpenTelemetry/Trace/Internal/FanOutActivityProcessor.cs index a6e201a40e2..55db1d314e1 100644 --- a/src/OpenTelemetry/Trace/Internal/BroadcastActivityProcessor.cs +++ b/src/OpenTelemetry/Trace/Internal/FanOutActivityProcessor.cs @@ -1,4 +1,4 @@ -// +// // Copyright The OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,12 +24,12 @@ namespace OpenTelemetry.Trace.Internal { - internal class BroadcastActivityProcessor : ActivityProcessor + internal class FanOutActivityProcessor : ActivityProcessor { - private readonly IEnumerable processors; + private readonly List processors; private bool disposed; - public BroadcastActivityProcessor(IEnumerable processors) + public FanOutActivityProcessor(IEnumerable processors) { if (processors == null) { @@ -41,7 +41,7 @@ public BroadcastActivityProcessor(IEnumerable processors) throw new ArgumentException($"{nameof(processors)} collection is empty"); } - this.processors = processors; + this.processors = new List(processors); } public override void OnEnd(Activity activity) diff --git a/test/OpenTelemetry.Tests/Implementation/Trace/Config/BroadcastActivityProcessorTests.cs b/test/OpenTelemetry.Tests/Implementation/Trace/Config/FanOutActivityProcessorTests.cs similarity index 87% rename from test/OpenTelemetry.Tests/Implementation/Trace/Config/BroadcastActivityProcessorTests.cs rename to test/OpenTelemetry.Tests/Implementation/Trace/Config/FanOutActivityProcessorTests.cs index 56c6617409f..472d818569f 100644 --- a/test/OpenTelemetry.Tests/Implementation/Trace/Config/BroadcastActivityProcessorTests.cs +++ b/test/OpenTelemetry.Tests/Implementation/Trace/Config/FanOutActivityProcessorTests.cs @@ -1,4 +1,4 @@ -// +// // Copyright The OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,13 +23,13 @@ namespace OpenTelemetry.Tests.Impl.Trace.Config { - public class BroadcastActivityProcessorTests + public class FanOutActivityProcessorTests { [Fact] public void BroadcastProcessor_BadArgs() { - Assert.Throws(() => new BroadcastActivityProcessor(null)); - Assert.Throws(() => new BroadcastActivityProcessor(new SimpleActivityProcessor[0])); + Assert.Throws(() => new FanOutActivityProcessor(null)); + Assert.Throws(() => new FanOutActivityProcessor(new SimpleActivityProcessor[0])); } [Fact] @@ -68,7 +68,7 @@ public void BroadcastProcessor_CallsAllProcessorSequentially() Assert.True(end1Called); }); - var broadcastProcessor = new BroadcastActivityProcessor(new[] { processor1, processor2 }); + var broadcastProcessor = new FanOutActivityProcessor(new[] { processor1, processor2 }); var activity = new Activity("somename"); broadcastProcessor.OnStart(activity); @@ -120,7 +120,7 @@ public void BroadcastProcessor_OneProcessorThrows() Assert.True(end1Called); }); - var broadcastProcessor = new BroadcastActivityProcessor(new[] { processor1, processor2 }); + var broadcastProcessor = new FanOutActivityProcessor(new[] { processor1, processor2 }); var activity = new Activity("somename"); broadcastProcessor.OnStart(activity); @@ -138,7 +138,7 @@ public void BroadcastProcessor_ShutsDownAll() var processor1 = new TestActivityProcessor(null, null); var processor2 = new TestActivityProcessor(null, null); - var broadcastProcessor = new BroadcastActivityProcessor(new[] { processor1, processor2 }); + var broadcastProcessor = new FanOutActivityProcessor(new[] { processor1, processor2 }); broadcastProcessor.ShutdownAsync(default); Assert.True(processor1.ShutdownCalled); @@ -155,7 +155,7 @@ public void BroadcastProcessor_ForceFlush() var processor1 = new TestActivityProcessor(null, null); var processor2 = new TestActivityProcessor(null, null); - var broadcastProcessor = new BroadcastActivityProcessor(new[] { processor1, processor2 }); + var broadcastProcessor = new FanOutActivityProcessor(new[] { processor1, processor2 }); broadcastProcessor.ForceFlushAsync(default); Assert.True(processor1.ForceFlushCalled);