From cc41648685ca5e7d4db905e463398d5050b2fc5a Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Mon, 14 Oct 2019 21:48:00 -0700 Subject: [PATCH] Move TracerBuilderExtensions to the same namespace (#280) --- .../TracerBuilderExtensions.cs | 7 ++++--- .../TracerBuilderExtensions.cs | 7 ++++--- .../TracerBuilderExtensions.cs | 5 +++-- .../TracerBuilderExtensions.cs | 7 ++++--- .../OpenTelemetry.Collector.AspNetCore.Tests/BasicTests.cs | 3 ++- .../BasicTests.cs | 3 ++- .../TracerBuilderConfigurationTests.cs | 3 ++- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/OpenTelemetry.Collector.AspNetCore/TracerBuilderExtensions.cs b/src/OpenTelemetry.Collector.AspNetCore/TracerBuilderExtensions.cs index d29291d66..57b2606e6 100644 --- a/src/OpenTelemetry.Collector.AspNetCore/TracerBuilderExtensions.cs +++ b/src/OpenTelemetry.Collector.AspNetCore/TracerBuilderExtensions.cs @@ -13,10 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // -using System; -using OpenTelemetry.Trace.Configuration; -namespace OpenTelemetry.Collector.AspNetCore +using System; +using OpenTelemetry.Collector.AspNetCore; + +namespace OpenTelemetry.Trace.Configuration { public static class TracerBuilderExtensions { diff --git a/src/OpenTelemetry.Collector.Dependencies/TracerBuilderExtensions.cs b/src/OpenTelemetry.Collector.Dependencies/TracerBuilderExtensions.cs index 113e70c47..3970cb9af 100644 --- a/src/OpenTelemetry.Collector.Dependencies/TracerBuilderExtensions.cs +++ b/src/OpenTelemetry.Collector.Dependencies/TracerBuilderExtensions.cs @@ -13,10 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // -using System; -using OpenTelemetry.Trace.Configuration; -namespace OpenTelemetry.Collector.Dependencies +using System; +using OpenTelemetry.Collector.Dependencies; + +namespace OpenTelemetry.Trace.Configuration { public static class TracerBuilderExtensions { diff --git a/src/OpenTelemetry.Exporter.ApplicationInsights/TracerBuilderExtensions.cs b/src/OpenTelemetry.Exporter.ApplicationInsights/TracerBuilderExtensions.cs index b2d97ac93..520830335 100644 --- a/src/OpenTelemetry.Exporter.ApplicationInsights/TracerBuilderExtensions.cs +++ b/src/OpenTelemetry.Exporter.ApplicationInsights/TracerBuilderExtensions.cs @@ -13,11 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. // + using System; using Microsoft.ApplicationInsights.Extensibility; -using OpenTelemetry.Trace.Configuration; +using OpenTelemetry.Exporter.ApplicationInsights; -namespace OpenTelemetry.Exporter.ApplicationInsights +namespace OpenTelemetry.Trace.Configuration { public static class TracerBuilderExtensions { diff --git a/src/OpenTelemetry.Exporter.Zipkin/TracerBuilderExtensions.cs b/src/OpenTelemetry.Exporter.Zipkin/TracerBuilderExtensions.cs index 03b316eb4..6a593c529 100644 --- a/src/OpenTelemetry.Exporter.Zipkin/TracerBuilderExtensions.cs +++ b/src/OpenTelemetry.Exporter.Zipkin/TracerBuilderExtensions.cs @@ -13,10 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // -using System; -using OpenTelemetry.Trace.Configuration; -namespace OpenTelemetry.Exporter.Zipkin +using System; +using OpenTelemetry.Exporter.Zipkin; + +namespace OpenTelemetry.Trace.Configuration { public static class TracerBuilderExtensions { diff --git a/test/OpenTelemetry.Collector.AspNetCore.Tests/BasicTests.cs b/test/OpenTelemetry.Collector.AspNetCore.Tests/BasicTests.cs index a773a025a..7aca9a631 100644 --- a/test/OpenTelemetry.Collector.AspNetCore.Tests/BasicTests.cs +++ b/test/OpenTelemetry.Collector.AspNetCore.Tests/BasicTests.cs @@ -48,7 +48,8 @@ namespace OpenTelemetry.Collector.AspNetCore.Tests [Fact] public void AddRequestCollector_BadArgs() { - Assert.Throws(() => TracerBuilderExtensions.AddRequestCollector(null)); + TracerBuilder builder = null; + Assert.Throws(() => builder.AddRequestCollector()); Assert.Throws(() => TracerFactory.Create(b => b.AddRequestCollector(null))); } diff --git a/test/OpenTelemetry.Collector.Dependencies.Tests/BasicTests.cs b/test/OpenTelemetry.Collector.Dependencies.Tests/BasicTests.cs index cfaaa365a..d3750f78d 100644 --- a/test/OpenTelemetry.Collector.Dependencies.Tests/BasicTests.cs +++ b/test/OpenTelemetry.Collector.Dependencies.Tests/BasicTests.cs @@ -50,7 +50,8 @@ namespace OpenTelemetry.Collector.Dependencies.Tests [Fact] public void AddDependencyCollector_BadArgs() { - Assert.Throws(() => TracerBuilderExtensions.AddDependencyCollector(null)); + TracerBuilder builder = null; + Assert.Throws(() => builder.AddDependencyCollector()); Assert.Throws(() => TracerFactory.Create(b => b.AddDependencyCollector(null))); } diff --git a/test/OpenTelemetry.Exporter.ApplicationInsights.Tests/TracerBuilderConfigurationTests.cs b/test/OpenTelemetry.Exporter.ApplicationInsights.Tests/TracerBuilderConfigurationTests.cs index b9740f0aa..48556be1f 100644 --- a/test/OpenTelemetry.Exporter.ApplicationInsights.Tests/TracerBuilderConfigurationTests.cs +++ b/test/OpenTelemetry.Exporter.ApplicationInsights.Tests/TracerBuilderConfigurationTests.cs @@ -51,7 +51,8 @@ namespace OpenTelemetry.Exporter.ApplicationInsights.Tests [Fact] public void UseApplicationInsights_BadArgs() { - Assert.Throws(() => TracerBuilderExtensions.UseApplicationInsights(null, _ => { })); + TracerBuilder builder = null; + Assert.Throws(() => builder.UseApplicationInsights(_ => { })); Assert.Throws(() => TracerFactory.Create(b => b.UseApplicationInsights(null))); } }