Skip to content
This repository was archived by the owner on Dec 18, 2023. It is now read-only.

Commit 7d8a676

Browse files
SergeyKanzhelevSergeyKanzhelev
authored
Make an Abstraction package (#41)
* simply move code around for now * only one error left * removed unnecessary folders * removed duplicated utils * now it should compile * Make exporters use abstractions package
1 parent 39adfd0 commit 7d8a676

280 files changed

Lines changed: 223 additions & 13 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎OpenCensus.sln‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.27703.2042
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCensus", "src\OpenCensus\OpenCensus.csproj", "{AE3E3DF5-4083-4C6E-A840-8271B0ACDE7E}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenCensus", "src\OpenCensus\OpenCensus.csproj", "{AE3E3DF5-4083-4C6E-A840-8271B0ACDE7E}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCensus.Tests", "test\OpenCensus.Tests\OpenCensus.Tests.csproj", "{CC62B3C1-5875-4986-A7F6-C4B26E42B0A1}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenCensus.Tests", "test\OpenCensus.Tests\OpenCensus.Tests.csproj", "{CC62B3C1-5875-4986-A7F6-C4B26E42B0A1}"
99
EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B7408D66-487A-40E1-BDB7-BC17BD28F721}"
1111
ProjectSection(SolutionItems) = preProject
@@ -26,18 +26,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7CB2F02E
2626
build\stylecop.json = build\stylecop.json
2727
EndProjectSection
2828
EndProject
29-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCensus.Exporter.Zipkin", "src\OpenCensus.Exporter.Zipkin\OpenCensus.Exporter.Zipkin.csproj", "{7EDAE7FA-B44E-42CA-80FA-7DF2FAA2C5DD}"
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenCensus.Exporter.Zipkin", "src\OpenCensus.Exporter.Zipkin\OpenCensus.Exporter.Zipkin.csproj", "{7EDAE7FA-B44E-42CA-80FA-7DF2FAA2C5DD}"
3030
EndProject
3131
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".vsts", ".vsts", "{61188153-47FB-4567-AC9B-79B2435853EB}"
3232
ProjectSection(SolutionItems) = preProject
3333
.vsts\ci-build.yml = .vsts\ci-build.yml
3434
.vsts\ci-myget-update.yml = .vsts\ci-myget-update.yml
3535
EndProjectSection
3636
EndProject
37-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCensus.Exporter.ApplicationInsights", "src\OpenCensus.Exporter.ApplicationInsights\OpenCensus.Exporter.ApplicationInsights.csproj", "{4493F5D9-874E-4FBF-B2F3-37890BD910E0}"
37+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenCensus.Exporter.ApplicationInsights", "src\OpenCensus.Exporter.ApplicationInsights\OpenCensus.Exporter.ApplicationInsights.csproj", "{4493F5D9-874E-4FBF-B2F3-37890BD910E0}"
3838
EndProject
3939
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples", "src\Samples\Samples.csproj", "{C58393EB-32E2-4AC6-9170-697B36306E15}"
40-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCensus.Exporter.Prometheus", "src\OpenCensus.Exporter.Prometheus\OpenCensus.Exporter.Prometheus.csproj", "{A86AF35D-9E84-4B12-AA0E-1C558DC2EE1C}"
40+
EndProject
41+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenCensus.Abstractions", "src\OpenCensus.Abstractions\OpenCensus.Abstractions.csproj", "{99F8A331-05E9-45A5-89BA-4C54E825E5B2}"
4142
EndProject
4243
Global
4344
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -69,6 +70,10 @@ Global
6970
{A86AF35D-9E84-4B12-AA0E-1C558DC2EE1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
7071
{A86AF35D-9E84-4B12-AA0E-1C558DC2EE1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
7172
{A86AF35D-9E84-4B12-AA0E-1C558DC2EE1C}.Release|Any CPU.Build.0 = Release|Any CPU
73+
{99F8A331-05E9-45A5-89BA-4C54E825E5B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74+
{99F8A331-05E9-45A5-89BA-4C54E825E5B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
75+
{99F8A331-05E9-45A5-89BA-4C54E825E5B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
76+
{99F8A331-05E9-45A5-89BA-4C54E825E5B2}.Release|Any CPU.Build.0 = Release|Any CPU
7277
EndGlobalSection
7378
GlobalSection(SolutionProperties) = preSolution
7479
HideSolutionNode = FALSE

src/OpenCensus/Api/Common/IClock.cs renamed to src/OpenCensus.Abstractions/Common/IClock.cs

File renamed without changes.

src/OpenCensus/Api/Common/IDuration.cs renamed to src/OpenCensus.Abstractions/Common/IDuration.cs

File renamed without changes.

src/OpenCensus/Api/Common/IScope.cs renamed to src/OpenCensus.Abstractions/Common/IScope.cs

File renamed without changes.

src/OpenCensus/Api/Common/ITimestamp.cs renamed to src/OpenCensus.Abstractions/Common/ITimestamp.cs

File renamed without changes.

src/OpenCensus/Api/Internal/IEventQueue.cs renamed to src/OpenCensus.Abstractions/Internal/IEventQueue.cs

File renamed without changes.

src/OpenCensus/Api/Internal/IEventQueueEntry.cs renamed to src/OpenCensus.Abstractions/Internal/IEventQueueEntry.cs

File renamed without changes.

src/OpenCensus/Api/Internal/ITimestampConverter.cs renamed to src/OpenCensus.Abstractions/Internal/ITimestampConverter.cs

File renamed without changes.

‎src/OpenCensus.Abstractions/OpenCensus.Abstractions.csproj‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'OpenCensus.sln'))\build\Common.prod.props" />
3+
<PropertyGroup>
4+
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
5+
<TargetFrameworks Condition="$(OS) != 'Windows_NT'">netstandard2.0</TargetFrameworks>
6+
<Description>OpenCensus .NET API abstractions</Description>
7+
<IncludeSymbols>True</IncludeSymbols>
8+
<PackageTags>Tracing;OpenCensus;Management;Monitoring</PackageTags>
9+
<PackageIconUrl>https://opencensus.io/images/opencensus-logo.png</PackageIconUrl>
10+
<PackageProjectUrl>https://opencensus.io</PackageProjectUrl>
11+
<PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
12+
<Authors>OpenCensus authors</Authors>
13+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
14+
</PropertyGroup>
15+
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
16+
<DebugType>full</DebugType>
17+
<DebugSymbols>true</DebugSymbols>
18+
</PropertyGroup>
19+
<ItemGroup>
20+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta008">
21+
<PrivateAssets>All</PrivateAssets>
22+
</PackageReference>
23+
</ItemGroup>
24+
<ItemGroup>
25+
<Folder Include="Common\" />
26+
<Folder Include="Internal\" />
27+
<Folder Include="Stats\" />
28+
<Folder Include="Tags\" />
29+
<Folder Include="Trace\" />
30+
</ItemGroup>
31+
<ItemGroup>
32+
<Compile Remove="Utils\Arrays.cs" />
33+
<Compile Remove="Utils\AttributesWithCapacity.cs" />
34+
</ItemGroup>
35+
</Project>

‎src/OpenCensus.Abstractions/Properties/AssemblyInfo.cs‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// <copyright file="AssemblyInfo.cs" company="OpenCensus Authors">
2+
// Copyright 2018, OpenCensus Authors
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of theLicense at
7+
//
8+
// http://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
// </copyright>
16+
17+
using System.Runtime.CompilerServices;
18+
19+
[assembly: InternalsVisibleTo("OpenCensus.Tests" + AssemblyInfo.PublicKey)]
20+
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2" + AssemblyInfo.MoqPublicKey)]
21+
22+
#if SIGNED
23+
internal static class AssemblyInfo
24+
{
25+
public const string PublicKey = ", PublicKey=002400000480000094000000060200000024000052534131000400000100010051C1562A090FB0C9F391012A32198B5E5D9A60E9B80FA2D7B434C9E5CCB7259BD606E66F9660676AFC6692B8CDC6793D190904551D2103B7B22FA636DCBB8208839785BA402EA08FC00C8F1500CCEF28BBF599AA64FFB1E1D5DC1BF3420A3777BADFE697856E9D52070A50C3EA5821C80BEF17CA3ACFFA28F89DD413F096F898";
26+
public const string MoqPublicKey = ", PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7";
27+
}
28+
#else
29+
internal static class AssemblyInfo
30+
{
31+
public const string PublicKey = "";
32+
public const string MoqPublicKey = "";
33+
}
34+
#endif

0 commit comments

Comments
 (0)