diff --git a/test/Benchmarks/Exporter/JaegerExporterBenchmarks.cs b/test/Benchmarks/Exporter/JaegerExporterBenchmarks.cs index d67ead0de..b474536c9 100644 --- a/test/Benchmarks/Exporter/JaegerExporterBenchmarks.cs +++ b/test/Benchmarks/Exporter/JaegerExporterBenchmarks.cs @@ -14,17 +14,15 @@ // limitations under the License. // -using System; using System.Diagnostics; -using System.Threading; -using System.Threading.Tasks; using BenchmarkDotNet.Attributes; -using OpenTelemetry.Benchmarks; +using Benchmarks.Helper; +using OpenTelemetry; using OpenTelemetry.Exporter.Jaeger; using OpenTelemetry.Internal; using Thrift.Transport; -namespace OpenTelemetry.Exporter.Benchmarks +namespace Benchmarks.Exporter { [MemoryDiagnoser] public class JaegerExporterBenchmarks @@ -52,7 +50,7 @@ namespace OpenTelemetry.Exporter.Benchmarks new JaegerExporterOptions(), new BlackHoleTransport()) { - Process = new Jaeger.Process("TestService"), + Process = new OpenTelemetry.Exporter.Jaeger.Process("TestService"), }; for (int i = 0; i < this.NumberOfBatches; i++) diff --git a/test/Benchmarks/Exporter/OtlpExporterBenchmarks.cs b/test/Benchmarks/Exporter/OtlpExporterBenchmarks.cs index 20e3f3120..641d3fb51 100644 --- a/test/Benchmarks/Exporter/OtlpExporterBenchmarks.cs +++ b/test/Benchmarks/Exporter/OtlpExporterBenchmarks.cs @@ -18,13 +18,14 @@ using System; using System.Diagnostics; using System.Threading; using BenchmarkDotNet.Attributes; +using Benchmarks.Helper; using Grpc.Core; -using OpenTelemetry.Benchmarks; +using OpenTelemetry; using OpenTelemetry.Exporter.OpenTelemetryProtocol; using OpenTelemetry.Internal; using OtlpCollector = Opentelemetry.Proto.Collector.Trace.V1; -namespace OpenTelemetry.Exporter.Benchmarks +namespace Benchmarks.Exporter { [MemoryDiagnoser] public class OtlpExporterBenchmarks diff --git a/test/Benchmarks/Exporter/ZipkinExporterBenchmarks.cs b/test/Benchmarks/Exporter/ZipkinExporterBenchmarks.cs index 4d185a715..a17def6f8 100644 --- a/test/Benchmarks/Exporter/ZipkinExporterBenchmarks.cs +++ b/test/Benchmarks/Exporter/ZipkinExporterBenchmarks.cs @@ -18,12 +18,14 @@ using System; using System.Diagnostics; using System.IO; using BenchmarkDotNet.Attributes; +using Benchmarks.Helper; +using OpenTelemetry; using OpenTelemetry.Benchmarks; using OpenTelemetry.Exporter.Zipkin; using OpenTelemetry.Internal; using OpenTelemetry.Tests; -namespace OpenTelemetry.Exporter.Benchmarks +namespace Benchmarks.Exporter { [MemoryDiagnoser] #if !NET462 diff --git a/test/Benchmarks/Trace/ActivityCreationScenarios.cs b/test/Benchmarks/Helper/ActivityCreationScenarios.cs similarity index 96% rename from test/Benchmarks/Trace/ActivityCreationScenarios.cs rename to test/Benchmarks/Helper/ActivityCreationScenarios.cs index ce6e3b153..b1683e5a0 100644 --- a/test/Benchmarks/Trace/ActivityCreationScenarios.cs +++ b/test/Benchmarks/Helper/ActivityCreationScenarios.cs @@ -16,9 +16,9 @@ using System.Diagnostics; -namespace OpenTelemetry.Trace.Benchmarks +namespace Benchmarks.Helper { - internal class ActivityCreationScenarios + internal static class ActivityCreationScenarios { public static void CreateActivity(ActivitySource source) { diff --git a/test/Benchmarks/ActivityHelper.cs b/test/Benchmarks/Helper/ActivityHelper.cs similarity index 97% rename from test/Benchmarks/ActivityHelper.cs rename to test/Benchmarks/Helper/ActivityHelper.cs index db168e913..17bab186d 100644 --- a/test/Benchmarks/ActivityHelper.cs +++ b/test/Benchmarks/Helper/ActivityHelper.cs @@ -19,9 +19,9 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; -namespace OpenTelemetry.Benchmarks +namespace Benchmarks.Helper { - public static class ActivityHelper + internal static class ActivityHelper { public static Activity CreateTestActivity() { diff --git a/test/Benchmarks/Trace/SpanCreationScenarios.cs b/test/Benchmarks/Helper/SpanCreationScenarios.cs similarity index 95% rename from test/Benchmarks/Trace/SpanCreationScenarios.cs rename to test/Benchmarks/Helper/SpanCreationScenarios.cs index e4cea2e95..c9dbae42b 100644 --- a/test/Benchmarks/Trace/SpanCreationScenarios.cs +++ b/test/Benchmarks/Helper/SpanCreationScenarios.cs @@ -15,10 +15,11 @@ // using System.Diagnostics; +using OpenTelemetry.Trace; -namespace OpenTelemetry.Trace.Benchmarks +namespace Benchmarks.Helper { - internal class SpanCreationScenarios + internal static class SpanCreationScenarios { public static void CreateSpan(Tracer tracer) { diff --git a/test/Benchmarks/Logs/LogBenchmarks.cs b/test/Benchmarks/Logs/LogBenchmarks.cs index feb06a53d..002737626 100644 --- a/test/Benchmarks/Logs/LogBenchmarks.cs +++ b/test/Benchmarks/Logs/LogBenchmarks.cs @@ -17,8 +17,10 @@ #if NETCOREAPP3_1 using BenchmarkDotNet.Attributes; using Microsoft.Extensions.Logging; +using OpenTelemetry; +using OpenTelemetry.Logs; -namespace OpenTelemetry.Logs.Benchmarks +namespace Benchmarks.Logs { [MemoryDiagnoser] public class LogBenchmarks diff --git a/test/Benchmarks/Trace/ActivitySourceAdapterBenchmark.cs b/test/Benchmarks/Trace/ActivitySourceAdapterBenchmark.cs index 57762371c..91d91026f 100644 --- a/test/Benchmarks/Trace/ActivitySourceAdapterBenchmark.cs +++ b/test/Benchmarks/Trace/ActivitySourceAdapterBenchmark.cs @@ -16,8 +16,10 @@ using System.Diagnostics; using BenchmarkDotNet.Attributes; +using OpenTelemetry; +using OpenTelemetry.Trace; -namespace OpenTelemetry.Trace.Benchmarks +namespace Benchmarks.Trace { [MemoryDiagnoser] public class ActivitySourceAdapterBenchmark diff --git a/test/Benchmarks/Trace/OpenTelemetrySdkBenchmarks.cs b/test/Benchmarks/Trace/OpenTelemetrySdkBenchmarks.cs index a55838eef..e338005e1 100644 --- a/test/Benchmarks/Trace/OpenTelemetrySdkBenchmarks.cs +++ b/test/Benchmarks/Trace/OpenTelemetrySdkBenchmarks.cs @@ -15,8 +15,11 @@ // using BenchmarkDotNet.Attributes; +using Benchmarks.Helper; +using OpenTelemetry; +using OpenTelemetry.Trace; -namespace OpenTelemetry.Trace.Benchmarks +namespace Benchmarks.Trace { [MemoryDiagnoser] public class OpenTelemetrySdkBenchmarks diff --git a/test/Benchmarks/Trace/OpenTelemetrySdkBenchmarksActivity.cs b/test/Benchmarks/Trace/OpenTelemetrySdkBenchmarksActivity.cs index a65fa01c8..5cea9e559 100644 --- a/test/Benchmarks/Trace/OpenTelemetrySdkBenchmarksActivity.cs +++ b/test/Benchmarks/Trace/OpenTelemetrySdkBenchmarksActivity.cs @@ -16,8 +16,11 @@ using System.Diagnostics; using BenchmarkDotNet.Attributes; +using Benchmarks.Helper; +using OpenTelemetry; +using OpenTelemetry.Trace; -namespace OpenTelemetry.Trace.Benchmarks +namespace Benchmarks.Trace { [MemoryDiagnoser] public class OpenTelemetrySdkBenchmarksActivity diff --git a/test/Benchmarks/Trace/TraceBenchmarks.cs b/test/Benchmarks/Trace/TraceBenchmarks.cs index 72c4b2e82..fa79c98d5 100644 --- a/test/Benchmarks/Trace/TraceBenchmarks.cs +++ b/test/Benchmarks/Trace/TraceBenchmarks.cs @@ -16,8 +16,10 @@ using System.Diagnostics; using BenchmarkDotNet.Attributes; +using OpenTelemetry; +using OpenTelemetry.Trace; -namespace OpenTelemetry.Trace.Benchmarks +namespace Benchmarks.Trace { [MemoryDiagnoser] public class TraceBenchmarks diff --git a/test/Benchmarks/Trace/TraceShimBenchmarks.cs b/test/Benchmarks/Trace/TraceShimBenchmarks.cs index 3e8df28af..5eb74cec1 100644 --- a/test/Benchmarks/Trace/TraceShimBenchmarks.cs +++ b/test/Benchmarks/Trace/TraceShimBenchmarks.cs @@ -16,8 +16,10 @@ using System.Diagnostics; using BenchmarkDotNet.Attributes; +using OpenTelemetry; +using OpenTelemetry.Trace; -namespace OpenTelemetry.Trace.Benchmarks +namespace Benchmarks.Trace { [MemoryDiagnoser] public class TraceShimBenchmarks