Tests namespace rearrange/consolidate (#1053)

* Move out of implememtationfolder

* move our of implementation folder

* rename namespace

* renamiongs

* more

* metric refactory

test/Benchmarks/Benchmarks.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Implementation\Internal\TestHttpServer.cs" Link="TestHttpServer.cs" />
+    <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Internal\TestHttpServer.cs" Link="TestHttpServer.cs" />
   </ItemGroup>
 
   <ItemGroup>

test/OpenTelemetry.Exporter.Zipkin.Tests/OpenTelemetry.Exporter.Zipkin.Tests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Implementation\Internal\TestHttpServer.cs" Link="TestHttpServer.cs" />
+    <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Internal\TestHttpServer.cs" Link="TestHttpServer.cs" />
     <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\BaseEventSourceTest.cs" Link="BaseEventSourceTest.cs" />
     <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\TestEventListener.cs" Link="TestEventListener.cs" />
   </ItemGroup>

test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj

@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Implementation\Internal\SkipUnlessEnvVarFoundTheoryAttribute.cs" Link="SkipUnlessEnvVarFoundTheoryAttribute.cs" />
-    <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Implementation\Internal\TestHttpServer.cs" Link="TestHttpServer.cs" />
+    <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Internal\SkipUnlessEnvVarFoundTheoryAttribute.cs" Link="SkipUnlessEnvVarFoundTheoryAttribute.cs" />
+    <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Internal\TestHttpServer.cs" Link="TestHttpServer.cs" />
     <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\BaseEventSourceTest.cs" Link="BaseEventSourceTest.cs" />
     <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\TestEventListener.cs" Link="TestEventListener.cs" />
   </ItemGroup>

test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Implementation\Internal\SkipUnlessEnvVarFoundTheoryAttribute.cs" Link="SkipUnlessEnvVarFoundTheoryAttribute.cs" />
+    <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Internal\SkipUnlessEnvVarFoundTheoryAttribute.cs" Link="SkipUnlessEnvVarFoundTheoryAttribute.cs" />
     <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\BaseEventSourceTest.cs" Link="BaseEventSourceTest.cs" />
     <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\TestEventListener.cs" Link="TestEventListener.cs" />
   </ItemGroup>

test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Implementation\Internal\SkipUnlessEnvVarFoundTheoryAttribute.cs" Link="Implementation\SkipUnlessEnvVarFoundTheoryAttribute.cs" />
+    <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Internal\SkipUnlessEnvVarFoundTheoryAttribute.cs" Link="Implementation\SkipUnlessEnvVarFoundTheoryAttribute.cs" />
   </ItemGroup>
 
   <ItemGroup>

test/OpenTelemetry.Tests/Context/CorrelationContextBuilderTest.cs

@@ -17,7 +17,7 @@
 using System.Collections.Generic;
 using Xunit;
 
-namespace OpenTelemetry.Context.Test
+namespace OpenTelemetry.Context.Tests
 {
     public class CorrelationContextBuilderTest
     {

test/OpenTelemetry.Tests/Context/CorrelationContextEntryTest.cs

@@ -15,7 +15,7 @@
 // </copyright>
 using Xunit;
 
-namespace OpenTelemetry.Context.Test
+namespace OpenTelemetry.Context.Tests
 {
     public class CorrelationContextEntryTest
     {

test/OpenTelemetry.Tests/Context/CorrelationContextTest.cs

@@ -16,7 +16,7 @@
 using System.Collections.Generic;
 using Xunit;
 
-namespace OpenTelemetry.Context.Test
+namespace OpenTelemetry.Context.Tests
 {
     public class CorrelationContextTest
     {

test/OpenTelemetry.Tests/Context/DistributedContextsScopeTest.cs

@@ -17,7 +17,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace OpenTelemetry.Context.Test
+namespace OpenTelemetry.Context.Tests
 {
     public class DistributedContextsScopeTest
     {

test/OpenTelemetry.Tests/Context/Propagation/DistributedContextDeserializationTest.cs

@@ -20,7 +20,7 @@ using System.Text;
 using OpenTelemetry.Internal;
 using Xunit;
 
-namespace OpenTelemetry.Context.Propagation.Test
+namespace OpenTelemetry.Context.Propagation.Tests
 {
     public class DistributedContextDeserializationTest
     {

test/OpenTelemetry.Tests/Context/Propagation/DistributedContextRoundtripTest.cs

@@ -17,7 +17,7 @@
 using System.Collections.Generic;
 using Xunit;
 
-namespace OpenTelemetry.Context.Propagation.Test
+namespace OpenTelemetry.Context.Propagation.Tests
 {
     public class DistributedContextRoundtripTest
     {

test/OpenTelemetry.Tests/Context/Propagation/DistributedContextSerializationTest.cs

@@ -21,7 +21,7 @@ using System.Text;
 using OpenTelemetry.Internal;
 using Xunit;
 
-namespace OpenTelemetry.Context.Propagation.Test
+namespace OpenTelemetry.Context.Propagation.Tests
 {
     public class DistributedContextSerializationTest
     {

test/OpenTelemetry.Tests/Implementation/Internal/TimestampConverterTest.cs

@@ -1,28 +0,0 @@
-// <copyright file="TimestampConverterTest.cs" company="OpenTelemetry Authors">
-// Copyright The OpenTelemetry Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// </copyright>
-using Xunit;
-
-namespace OpenTelemetry.Internal.Test
-{
-    public class TimestampConverterTest
-    {
-        [Fact]
-        public void SimpleTest()
-        {
-            Assert.True(true);
-        }
-    }
-}

test/OpenTelemetry.Tests/Metrics/Aggregators/CounterAggregatorTest.cs

@@ -18,7 +18,7 @@ using OpenTelemetry.Metrics.Aggregators;
 using OpenTelemetry.Metrics.Export;
 using Xunit;
 
-namespace OpenTelemetry.Metrics.Test
+namespace OpenTelemetry.Metrics.Tests
 {
     public class CounterAggregatorTest
     {

test/OpenTelemetry.Tests/Metrics/Aggregators/LastValueAggregatorTest.cs

@@ -17,7 +17,7 @@ using OpenTelemetry.Metrics.Aggregators;
 using OpenTelemetry.Metrics.Export;
 using Xunit;
 
-namespace OpenTelemetry.Metrics.Test
+namespace OpenTelemetry.Metrics.Tests
 {
     public class LastValueAggregatorTest
     {

test/OpenTelemetry.Tests/Metrics/Aggregators/MinMaxSumCountAggregatorTest.cs

@@ -18,7 +18,7 @@ using OpenTelemetry.Metrics.Aggregators;
 using OpenTelemetry.Metrics.Export;
 using Xunit;
 
-namespace OpenTelemetry.Metrics.Test
+namespace OpenTelemetry.Metrics.Tests
 {
     public class MinMaxSumCountAggregatorTest
     {

test/OpenTelemetry.Tests/Metrics/CounterCleanUpTests.cs

@@ -22,7 +22,7 @@ using OpenTelemetry.Trace;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace OpenTelemetry.Metrics.Test
+namespace OpenTelemetry.Metrics.Tests
 {
     public class CounterCleanUpTests
     {

test/OpenTelemetry.Tests/Metrics/LabelSetTest.cs

@@ -17,7 +17,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
-namespace OpenTelemetry.Metrics.Test
+namespace OpenTelemetry.Metrics.Tests
 {
     public class LabelSetTest
     {

test/OpenTelemetry.Tests/Metrics/MeterFactoryTests.cs

@@ -16,13 +16,11 @@
 
 using System.Diagnostics;
 using System.Linq;
-using OpenTelemetry.Metrics;
 using OpenTelemetry.Metrics.Export;
-using OpenTelemetry.Metrics.Test;
 using OpenTelemetry.Trace;
 using Xunit;
 
-namespace OpenTelemetry.Configuration.Tests
+namespace OpenTelemetry.Metrics.Tests
 {
     public class MeterFactoryTests
     {

test/OpenTelemetry.Tests/Metrics/MeterProviderTests.cs

@@ -17,7 +17,7 @@
 using System;
 using Xunit;
 
-namespace OpenTelemetry.Metrics.Config.Test
+namespace OpenTelemetry.Metrics.Tests
 {
     public class MeterProviderTests : IDisposable
     {

test/OpenTelemetry.Tests/Metrics/MetricsTest.cs

@@ -20,7 +20,7 @@ using OpenTelemetry.Metrics.Export;
 using OpenTelemetry.Trace;
 using Xunit;
 
-namespace OpenTelemetry.Metrics.Test
+namespace OpenTelemetry.Metrics.Tests
 {
     public class MetricsTest
     {

test/OpenTelemetry.Tests/Metrics/PushControllerTest.cs

@@ -22,7 +22,7 @@ using OpenTelemetry.Metrics.Export;
 using Xunit;
 using static OpenTelemetry.Metrics.MeterProviderSdk;
 
-namespace OpenTelemetry.Metrics.Test
+namespace OpenTelemetry.Metrics.Tests
 {
     public class PushControllerTest
     {

test/OpenTelemetry.Tests/Metrics/TestMeter.cs

@@ -17,7 +17,7 @@
 using System;
 using OpenTelemetry.Metrics.Export;
 
-namespace OpenTelemetry.Metrics.Test
+namespace OpenTelemetry.Metrics.Tests
 {
     internal class TestMeter : MeterSdk
     {

test/OpenTelemetry.Tests/Metrics/TestMetricExporter.cs

@@ -20,7 +20,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using OpenTelemetry.Metrics.Export;
 
-namespace OpenTelemetry.Metrics.Test
+namespace OpenTelemetry.Metrics.Tests
 {
     internal class TestMetricExporter : MetricExporter
     {

test/OpenTelemetry.Tests/Metrics/TestMetricProcessor.cs

@@ -17,7 +17,7 @@
 using System.Collections.Generic;
 using OpenTelemetry.Metrics.Export;
 
-namespace OpenTelemetry.Metrics.Test
+namespace OpenTelemetry.Metrics.Tests
 {
     internal class TestMetricProcessor : MetricProcessor
     {

test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj

@@ -4,6 +4,11 @@
     <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net46;net452</TargetFrameworks>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Implementation\**" />
+    <EmbeddedResource Remove="Implementation\**" />
+    <None Remove="Implementation\**" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry\OpenTelemetry.csproj" />
@@ -19,4 +24,8 @@
     </PackageReference>
     <DotNetCliToolReference Include="dotnet-xunit" Version="$(DotNetXUnitCliVer)" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Testing\Export\" />
+  </ItemGroup>
 </Project>

test/OpenTelemetry.Tests/Resources/ResourceTest.cs

@@ -19,7 +19,7 @@ using System.Linq;
 using OpenTelemetry.Resources;
 using Xunit;
 
-namespace OpenTelemetry.Impl.Resources
+namespace OpenTelemetry.Resources.Tests
 {
     public class ResourceTest
     {

test/OpenTelemetry.Tests/Resources/ResourcesTests.cs

@@ -20,7 +20,7 @@ using System.Linq;
 using OpenTelemetry.Resources;
 using Xunit;
 
-namespace OpenTelemetry.Tests.Impl.Resources
+namespace OpenTelemetry.Resources.Tests
 {
     public class ResourcesTests
     {

test/OpenTelemetry.Tests/Shared/TestActivityExporter.cs

@@ -21,7 +21,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using OpenTelemetry.Trace;
 
-namespace OpenTelemetry.Testing.Export
+namespace OpenTelemetry.Tests.Shared
 {
     public class TestActivityExporter : ActivityExporter
     {

test/OpenTelemetry.Tests/Shared/TestActivityProcessor.cs

@@ -20,7 +20,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using OpenTelemetry.Trace;
 
-namespace OpenTelemetry.Tests.Implementation.Testing.Export
+namespace OpenTelemetry.Tests.Shared
 {
     public class TestActivityProcessor : ActivityProcessor
     {

test/OpenTelemetry.Tests/Trace/ActivityExtensionsTest.cs

@@ -17,7 +17,7 @@
 using System.Diagnostics;
 using Xunit;
 
-namespace OpenTelemetry.Trace.Test
+namespace OpenTelemetry.Trace.Tests
 {
     public class ActivityExtensionsTest
     {

test/OpenTelemetry.Tests/Trace/ActivitySourceAdapterTest.cs

@@ -17,11 +17,10 @@
 using System;
 using System.Diagnostics;
 using OpenTelemetry.Resources;
-using OpenTelemetry.Tests.Implementation.Testing.Export;
-using OpenTelemetry.Trace;
+using OpenTelemetry.Tests.Shared;
 using Xunit;
 
-namespace OpenTelemetry.Tests.Implementation.Trace
+namespace OpenTelemetry.Trace.Tests
 {
     public class ActivitySourceAdapterTest : IDisposable
     {

test/OpenTelemetry.Tests/Trace/AttributesExtensions.cs

@@ -18,7 +18,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
-namespace OpenTelemetry.Tests
+namespace OpenTelemetry.Trace.Tests
 {
     internal static class AttributesExtensions
     {

test/OpenTelemetry.Tests/Trace/BatchingActivityProcessorTests.cs

@@ -20,12 +20,11 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using OpenTelemetry.Testing.Export;
 using OpenTelemetry.Tests;
-using OpenTelemetry.Tests.Implementation.Trace;
+using OpenTelemetry.Tests.Shared;
 using Xunit;
 
-namespace OpenTelemetry.Trace.Test
+namespace OpenTelemetry.Trace.Tests
 {
     public class BatchingActivityProcessorTests : IDisposable
     {

test/OpenTelemetry.Tests/Trace/CurrentSpanTests.cs

@@ -18,7 +18,7 @@ using System;
 using System.Diagnostics;
 using Xunit;
 
-namespace OpenTelemetry.Trace.Test
+namespace OpenTelemetry.Trace.Tests
 {
     public class CurrentSpanTests : IDisposable
     {

test/OpenTelemetry.Tests/Trace/FanOutActivityProcessorTests.cs

@@ -16,12 +16,11 @@
 
 using System;
 using System.Diagnostics;
-using OpenTelemetry.Tests.Implementation.Testing.Export;
-using OpenTelemetry.Trace;
+using OpenTelemetry.Tests.Shared;
 using OpenTelemetry.Trace.Internal;
 using Xunit;
 
-namespace OpenTelemetry.Tests.Impl.Trace.Config
+namespace OpenTelemetry.Trace.Tests
 {
     public class FanOutActivityProcessorTests
     {

test/OpenTelemetry.Tests/Trace/LinkTest.cs

@@ -18,7 +18,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using Xunit;
 
-namespace OpenTelemetry.Trace.Test
+namespace OpenTelemetry.Trace.Tests
 {
     public class LinkTest : IDisposable
     {

test/OpenTelemetry.Tests/Trace/OpenTelemetrySdkTest.cs

@@ -19,7 +19,7 @@ using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
 using Xunit;
 
-namespace OpenTelemetry.Tests.Implementation.Trace
+namespace OpenTelemetry.Trace.Tests
 {
     public class OpenTelemetrySdkTest
     {

test/OpenTelemetry.Tests/Trace/ParentOrElseSamplerTests.cs

@@ -16,7 +16,7 @@
 using System.Diagnostics;
 using Xunit;
 
-namespace OpenTelemetry.Trace.Samplers.Test
+namespace OpenTelemetry.Trace.Tests
 {
     public class ParentOrElseSamplerTests
     {

test/OpenTelemetry.Tests/Trace/ProbabilitySamplerTest.cs

@@ -17,7 +17,7 @@ using System;
 using System.Diagnostics;
 using Xunit;
 
-namespace OpenTelemetry.Trace.Samplers.Test
+namespace OpenTelemetry.Trace.Tests
 {
     public class ProbabilitySamplerTest
     {

test/OpenTelemetry.Tests/Trace/Propagation/B3FormatTest.cs

@@ -19,7 +19,7 @@ using System.Diagnostics;
 using Xunit;
 using Xunit.Abstractions;
 
-namespace OpenTelemetry.Context.Propagation.Test
+namespace OpenTelemetry.Context.Propagation.Tests
 {
     public class B3FormatTest
     {

test/OpenTelemetry.Tests/Trace/Propagation/CompositePropagatorTest.cs

@@ -21,7 +21,7 @@ using System.Linq;
 using OpenTelemetry.Context.Propagation;
 using Xunit;
 
-namespace OpenTelemetry.Tests.Implementation.Trace.Propagation
+namespace OpenTelemetry.Context.Propagation.Tests
 {
     public class CompositePropagatorTest
     {

test/OpenTelemetry.Tests/Trace/Propagation/TestPropagator.cs

@@ -20,7 +20,7 @@ using System.Diagnostics;
 using System.Linq;
 using OpenTelemetry.Context.Propagation;
 
-namespace OpenTelemetry.Tests.Implementation.Trace.Propagation
+namespace OpenTelemetry.Context.Propagation.Tests
 {
     public class TestPropagator : ITextFormat
     {

test/OpenTelemetry.Tests/Trace/Propagation/TraceContextTest.cs

@@ -19,7 +19,7 @@ using System.Diagnostics;
 using OpenTelemetry.Context.Propagation;
 using Xunit;
 
-namespace OpenTelemetry.Impl.Trace.Propagation
+namespace OpenTelemetry.Context.Propagation.Tests
 {
     public class TraceContextTest
     {

test/OpenTelemetry.Tests/Trace/Propagation/TracestateUtilsTests.cs

@@ -19,7 +19,7 @@ using System.Linq;
 using OpenTelemetry.Context.Propagation;
 using Xunit;
 
-namespace OpenTelemetry.Tests.Impl.Trace.Propagation
+namespace OpenTelemetry.Context.Propagation.Tests
 {
     public class TracestateUtilsTests
     {

test/OpenTelemetry.Tests/Trace/SamplersTest.cs

@@ -17,7 +17,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using Xunit;
 
-namespace OpenTelemetry.Trace.Samplers.Test
+namespace OpenTelemetry.Trace.Tests
 {
     public class SamplersTest
     {

test/OpenTelemetry.Tests/Trace/SimpleActivityProcessorTest.cs

@@ -18,11 +18,12 @@ using System;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
-using OpenTelemetry.Testing.Export;
-using OpenTelemetry.Tests.Implementation.Trace;
+using OpenTelemetry.Tests.Shared;
+using OpenTelemetry.Trace;
+using OpenTelemetry.Trace.Tests;
 using Xunit;
 
-namespace OpenTelemetry.Trace.Test
+namespace OpenTelemetry.Resources.Tests
 {
     public class SimpleActivityProcessorTest : IDisposable
     {

test/OpenTelemetry.Tests/Trace/SpanAttributesTest.cs

@@ -18,7 +18,7 @@ using System;
 using System.Collections.Generic;
 using Xunit;
 
-namespace OpenTelemetry.Trace.Test
+namespace OpenTelemetry.Trace.Tests
 {
     public class SpanAttributesTest
     {

test/OpenTelemetry.Tests/Trace/SpanContextTest.cs

@@ -18,7 +18,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using Xunit;
 
-namespace OpenTelemetry.Trace.Test
+namespace OpenTelemetry.Trace.Tests
 {
     public class SpanContextTest
     {

test/OpenTelemetry.Tests/Trace/StatusTest.cs

@@ -15,7 +15,7 @@
 // </copyright>
 using Xunit;
 
-namespace OpenTelemetry.Trace.Test
+namespace OpenTelemetry.Trace.Tests
 {
     public class StatusTest
     {

test/OpenTelemetry.Tests/Trace/TestSampler.cs

@@ -17,7 +17,7 @@
 using System;
 using OpenTelemetry.Trace;
 
-namespace OpenTelemetry.Tests.Implementation.Trace
+namespace OpenTelemetry.Trace.Tests
 {
     internal class TestSampler : Sampler
     {

test/OpenTelemetry.Tests/Trace/TraceSdkTest.cs

@@ -15,11 +15,10 @@
 // </copyright>
 
 using System.Diagnostics;
-using OpenTelemetry.Tests.Implementation.Testing.Export;
-using OpenTelemetry.Trace;
+using OpenTelemetry.Tests.Shared;
 using Xunit;
 
-namespace OpenTelemetry.Tests.Implementation.Trace
+namespace OpenTelemetry.Trace.Tests
 {
     public class TraceSdkTest
     {

test/OpenTelemetry.Tests/Trace/TracerTest.cs

@@ -18,7 +18,7 @@ using System;
 using System.Diagnostics;
 using Xunit;
 
-namespace OpenTelemetry.Trace.Test
+namespace OpenTelemetry.Trace.Tests
 {
     public class TracerTest : IDisposable
     {