hide more classes as internal (#91)

SergeyKanzhelev · web-flow · commit a0ad25563f89 · 2019-01-11T16:28:16.000-08:00
* Hide BlankSpan and StarEndHandler implementations

* moved spanbase to the implementation package

* AttributeValue generic implementation is hidden now
diff --git a/src/OpenCensus.Abstractions/Trace/IStartEndHandler.cs b/src/OpenCensus.Abstractions/Trace/IStartEndHandler.cs
@@ -25,12 +25,12 @@ public interface IStartEndHandler
         /// Called when span is being started.
         /// </summary>
         /// <param name="span">Span that just started.</param>
-        void OnStart(SpanBase span);
+        void OnStart(ISpan span);
 
         /// <summary>
         /// Called when span is just ended.
         /// </summary>
         /// <param name="span">Span that was just ended.</param>
-        void OnEnd(SpanBase span);
+        void OnEnd(ISpan span);
     }
 }
diff --git a/src/OpenCensus.Abstractions/Trace/Internal/AttributeValue{T}.cs b/src/OpenCensus.Abstractions/Trace/Internal/AttributeValue{T}.cs
@@ -22,7 +22,7 @@ namespace OpenCensus.Trace
     /// Generic attribute value.
     /// </summary>
     /// <typeparam name="T">Type of the value carried by this attribute value.</typeparam>
-    public sealed class AttributeValue<T> : AttributeValue, IAttributeValue<T>
+    internal sealed class AttributeValue<T> : AttributeValue, IAttributeValue<T>
     {
         internal AttributeValue(T value)
         {
diff --git a/src/OpenCensus.Exporter.Stackdriver/Implementation/StackdriverTraceExporter.cs b/src/OpenCensus.Exporter.Stackdriver/Implementation/StackdriverTraceExporter.cs
@@ -109,30 +109,12 @@ public static Span.Types.Link ToLink(this ILink link)
 
         public static Google.Cloud.Trace.V2.AttributeValue ToAttributeValue(this IAttributeValue av)
         {
-            var ret = new Google.Cloud.Trace.V2.AttributeValue();
-            var attributeType = av.GetType();
-
-            // Handle all primitive types
-            if (attributeType == typeof(AttributeValue<bool>))
-            {
-                ret.BoolValue = ((AttributeValue<bool>)av).Value;
-            }
-            else if (attributeType == typeof(AttributeValue<long>))
-            {
-                ret.IntValue = ((AttributeValue<long>)av).Value;
-            }
-            else // String or anything else is written as string
-            {
-                ret.StringValue = new TruncatableString()
-                {
-                    Value = av.Match(
-                        s => s,
-                        b => b.ToString(),
-                        l => l.ToString(),
-                        d => d.ToString(),
-                        o => o.ToString())
-                };
-            }
+            var ret = av.Match(
+                (s) => new Google.Cloud.Trace.V2.AttributeValue() { StringValue = new TruncatableString() { Value = s } },
+                (b) => new Google.Cloud.Trace.V2.AttributeValue() { BoolValue = b },
+                (l) => new Google.Cloud.Trace.V2.AttributeValue() { IntValue = l },
+                (d) => new Google.Cloud.Trace.V2.AttributeValue() { StringValue = new TruncatableString() { Value = d.ToString() } },
+                (obj) => new Google.Cloud.Trace.V2.AttributeValue() { StringValue = new TruncatableString() { Value = obj.ToString() } });
 
             return ret;
         }
diff --git a/src/OpenCensus/Trace/Export/InProcessRunningSpanStore.cs b/src/OpenCensus/Trace/Export/InProcessRunningSpanStore.cs
@@ -17,6 +17,7 @@
 namespace OpenCensus.Trace.Export
 {
     using System.Collections.Generic;
+    using Internal;
     using OpenCensus.Utils;
 
     public sealed class InProcessRunningSpanStore : RunningSpanStoreBase
diff --git a/src/OpenCensus/Trace/Internal/BlankSpan.cs b/src/OpenCensus/Trace/Internal/BlankSpan.cs
@@ -14,13 +14,13 @@
 // limitations under the License.
 // </copyright>
 
-namespace OpenCensus.Trace
+namespace OpenCensus.Trace.Internal
 {
     using System;
     using System.Collections.Generic;
     using OpenCensus.Trace.Export;
 
-    public sealed class BlankSpan : SpanBase
+    internal sealed class BlankSpan : SpanBase
     {
         public static readonly BlankSpan Instance = new BlankSpan();
 
diff --git a/src/OpenCensus/Trace/Internal/StartEndHandler.cs b/src/OpenCensus/Trace/Internal/StartEndHandler.cs
@@ -14,12 +14,12 @@
 // limitations under the License.
 // </copyright>
 
-namespace OpenCensus.Trace
+namespace OpenCensus.Trace.Internal
 {
     using OpenCensus.Internal;
     using OpenCensus.Trace.Export;
 
-    public sealed class StartEndHandler : IStartEndHandler
+    internal sealed class StartEndHandler : IStartEndHandler
     {
         private readonly ISpanExporter spanExporter;
         private readonly IRunningSpanStore runningSpanStore;
@@ -39,7 +39,7 @@ public StartEndHandler(ISpanExporter spanExporter, IRunningSpanStore runningSpan
             this.eventQueue = eventQueue;
         }
 
-        public void OnEnd(SpanBase span)
+        public void OnEnd(ISpan span)
         {
             if ((span.Options.HasFlag(SpanOptions.RecordEvents) && this.enqueueEventForNonSampledSpans)
                 || span.Context.TraceOptions.IsSampled)
@@ -48,7 +48,7 @@ public void OnEnd(SpanBase span)
             }
         }
 
-        public void OnStart(SpanBase span)
+        public void OnStart(ISpan span)
         {
             if (span.Options.HasFlag(SpanOptions.RecordEvents) && this.enqueueEventForNonSampledSpans)
             {
@@ -58,10 +58,10 @@ public void OnStart(SpanBase span)
 
         private sealed class SpanStartEvent : IEventQueueEntry
         {
-            private readonly SpanBase span;
+            private readonly ISpan span;
             private readonly IRunningSpanStore activeSpansExporter;
 
-            public SpanStartEvent(SpanBase span, IRunningSpanStore activeSpansExporter)
+            public SpanStartEvent(ISpan span, IRunningSpanStore activeSpansExporter)
             {
                 this.span = span;
                 this.activeSpansExporter = activeSpansExporter;
@@ -78,13 +78,13 @@ public void Process()
 
         private sealed class SpanEndEvent : IEventQueueEntry
         {
-            private readonly SpanBase span;
+            private readonly ISpan span;
             private readonly IRunningSpanStore runningSpanStore;
             private readonly ISpanExporter spanExporter;
             private readonly ISampledSpanStore sampledSpanStore;
 
             public SpanEndEvent(
-                    SpanBase span,
+                    ISpan span,
                     ISpanExporter spanExporter,
                     IRunningSpanStore runningSpanStore,
                     ISampledSpanStore sampledSpanStore)
diff --git a/src/OpenCensus/Trace/NoopSpanBuilder.cs b/src/OpenCensus/Trace/NoopSpanBuilder.cs
@@ -18,6 +18,7 @@ namespace OpenCensus.Trace
 {
     using System;
     using System.Collections.Generic;
+    using Internal;
 
     public class NoopSpanBuilder : SpanBuilderBase
     {
diff --git a/src/OpenCensus/Trace/Span.cs b/src/OpenCensus/Trace/Span.cs
@@ -19,6 +19,7 @@ namespace OpenCensus.Trace
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using Internal;
     using OpenCensus.Common;
     using OpenCensus.Internal;
     using OpenCensus.Trace.Config;
diff --git a/src/OpenCensus/Trace/SpanBase.cs b/src/OpenCensus/Trace/SpanBase.cs
diff --git a/src/OpenCensus/Trace/TracerBase.cs b/src/OpenCensus/Trace/TracerBase.cs
@@ -17,6 +17,7 @@
 namespace OpenCensus.Trace
 {
     using System;
+    using Internal;
     using OpenCensus.Common;
 
     public abstract class TracerBase : ITracer
diff --git a/test/OpenCensus.Tests/Impl/Trace/BlankSpanTest.cs b/test/OpenCensus.Tests/Impl/Trace/BlankSpanTest.cs
@@ -17,6 +17,7 @@
 namespace OpenCensus.Trace.Test
 {
     using System.Collections.Generic;
+    using Internal;
     using Xunit;
 
     public class BlankSpanTest
diff --git a/test/OpenCensus.Tests/Impl/Trace/Export/InProcessSampledSpanStoreTest.cs b/test/OpenCensus.Tests/Impl/Trace/Export/InProcessSampledSpanStoreTest.cs
@@ -379,12 +379,12 @@ public TestStartEndHandler(InProcessSampledSpanStore store)
                 sampleStore = store;
             }
 
-            public void OnStart(SpanBase span)
+            public void OnStart(ISpan span)
             {
                 // Do nothing.
             }
 
-            public void OnEnd(SpanBase span)
+            public void OnEnd(ISpan span)
             {
                 sampleStore.ConsiderForSampling(span);
             }
diff --git a/test/OpenCensus.Tests/Impl/Trace/SpanBuilderBaseTest.cs b/test/OpenCensus.Tests/Impl/Trace/SpanBuilderBaseTest.cs
@@ -17,6 +17,7 @@
 namespace OpenCensus.Trace.Test
 {
     using Moq;
+    using Internal;
     using OpenCensus.Common;
     using Xunit;
 
diff --git a/test/OpenCensus.Tests/Impl/Trace/TracerBaseTest.cs b/test/OpenCensus.Tests/Impl/Trace/TracerBaseTest.cs
@@ -17,6 +17,7 @@
 namespace OpenCensus.Trace.Test
 {
     using System;
+    using Internal;
     using Moq;
     using OpenCensus.Common;
     using Xunit;

Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,12 @@ public interface IStartEndHandler`
`25`	`25`	`/// Called when span is being started.`
`26`	`26`	`/// </summary>`
`27`	`27`	`/// <param name="span">Span that just started.</param>`
`28`		`- void OnStart(SpanBase span);`
	`28`	`+ void OnStart(ISpan span);`
`29`	`29`
`30`	`30`	`/// <summary>`
`31`	`31`	`/// Called when span is just ended.`
`32`	`32`	`/// </summary>`
`33`	`33`	`/// <param name="span">Span that was just ended.</param>`
`34`		`- void OnEnd(SpanBase span);`
	`34`	`+ void OnEnd(ISpan span);`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ namespace OpenCensus.Trace`
`22`	`22`	`/// Generic attribute value.`
`23`	`23`	`/// </summary>`
`24`	`24`	`/// <typeparam name="T">Type of the value carried by this attribute value.</typeparam>`
`25`		`- public sealed class AttributeValue<T> : AttributeValue, IAttributeValue<T>`
	`25`	`+ internal sealed class AttributeValue<T> : AttributeValue, IAttributeValue<T>`
`26`	`26`	`{`
`27`	`27`	`internal AttributeValue(T value)`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`namespace OpenCensus.Trace.Export`
`18`	`18`	`{`
`19`	`19`	`using System.Collections.Generic;`
	`20`	`+ using Internal;`
`20`	`21`	`using OpenCensus.Utils;`
`21`	`22`
`22`	`23`	`public sealed class InProcessRunningSpanStore : RunningSpanStoreBase`
Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,13 @@`
`14`	`14`	`// limitations under the License.`
`15`	`15`	`// </copyright>`
`16`	`16`
`17`		`-namespace OpenCensus.Trace`
	`17`	`+namespace OpenCensus.Trace.Internal`
`18`	`18`	`{`
`19`	`19`	`using System;`
`20`	`20`	`using System.Collections.Generic;`
`21`	`21`	`using OpenCensus.Trace.Export;`
`22`	`22`
`23`		`- public sealed class BlankSpan : SpanBase`
	`23`	`+ internal sealed class BlankSpan : SpanBase`
`24`	`24`	`{`
`25`	`25`	`public static readonly BlankSpan Instance = new BlankSpan();`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,12 @@`
`14`	`14`	`// limitations under the License.`
`15`	`15`	`// </copyright>`
`16`	`16`
`17`		`-namespace OpenCensus.Trace`
	`17`	`+namespace OpenCensus.Trace.Internal`
`18`	`18`	`{`
`19`	`19`	`using OpenCensus.Internal;`
`20`	`20`	`using OpenCensus.Trace.Export;`
`21`	`21`
`22`		`- public sealed class StartEndHandler : IStartEndHandler`
	`22`	`+ internal sealed class StartEndHandler : IStartEndHandler`
`23`	`23`	`{`
`24`	`24`	`private readonly ISpanExporter spanExporter;`
`25`	`25`	`private readonly IRunningSpanStore runningSpanStore;`
`@@ -39,7 +39,7 @@ public StartEndHandler(ISpanExporter spanExporter, IRunningSpanStore runningSpan`
`39`	`39`	`this.eventQueue = eventQueue;`
`40`	`40`	`}`
`41`	`41`
`42`		`- public void OnEnd(SpanBase span)`
	`42`	`+ public void OnEnd(ISpan span)`
`43`	`43`	`{`
`44`	`44`	`if ((span.Options.HasFlag(SpanOptions.RecordEvents) && this.enqueueEventForNonSampledSpans)`
`45`	`45`	`\|\| span.Context.TraceOptions.IsSampled)`
`@@ -48,7 +48,7 @@ public void OnEnd(SpanBase span)`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- public void OnStart(SpanBase span)`
	`51`	`+ public void OnStart(ISpan span)`
`52`	`52`	`{`
`53`	`53`	`if (span.Options.HasFlag(SpanOptions.RecordEvents) && this.enqueueEventForNonSampledSpans)`
`54`	`54`	`{`
`@@ -58,10 +58,10 @@ public void OnStart(SpanBase span)`
`58`	`58`
`59`	`59`	`private sealed class SpanStartEvent : IEventQueueEntry`
`60`	`60`	`{`
`61`		`- private readonly SpanBase span;`
	`61`	`+ private readonly ISpan span;`
`62`	`62`	`private readonly IRunningSpanStore activeSpansExporter;`
`63`	`63`
`64`		`- public SpanStartEvent(SpanBase span, IRunningSpanStore activeSpansExporter)`
	`64`	`+ public SpanStartEvent(ISpan span, IRunningSpanStore activeSpansExporter)`
`65`	`65`	`{`
`66`	`66`	`this.span = span;`
`67`	`67`	`this.activeSpansExporter = activeSpansExporter;`
`@@ -78,13 +78,13 @@ public void Process()`
`78`	`78`
`79`	`79`	`private sealed class SpanEndEvent : IEventQueueEntry`
`80`	`80`	`{`
`81`		`- private readonly SpanBase span;`
	`81`	`+ private readonly ISpan span;`
`82`	`82`	`private readonly IRunningSpanStore runningSpanStore;`
`83`	`83`	`private readonly ISpanExporter spanExporter;`
`84`	`84`	`private readonly ISampledSpanStore sampledSpanStore;`
`85`	`85`
`86`	`86`	`public SpanEndEvent(`
`87`		`- SpanBase span,`
	`87`	`+ ISpan span,`
`88`	`88`	`ISpanExporter spanExporter,`
`89`	`89`	`IRunningSpanStore runningSpanStore,`
`90`	`90`	`ISampledSpanStore sampledSpanStore)`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ namespace OpenCensus.Trace`
`18`	`18`	`{`
`19`	`19`	`using System;`
`20`	`20`	`using System.Collections.Generic;`
	`21`	`+ using Internal;`
`21`	`22`
`22`	`23`	`public class NoopSpanBuilder : SpanBuilderBase`
`23`	`24`	`{`