open-telemetry
/
opentelemetry-dotnet
mirror of https://github.com/open-telemetry/opentelemetry-dotnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup after merge.

This commit is contained in:
E.G. Hornbostel 2019-07-09 12:15:15 -07:00
parent fcab9be55b
commit ba897aa69e
14 changed files with 53 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.targets
View File

@ -1,6 +1,6 @@
<Project>
<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" Condition="'$(SkipAnalysis)'!='true'">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>

8
lib/Directory.Build.props Normal file
View File

@ -0,0 +1,8 @@
<Project>
<Import Project="..\Directory.Build.props" Condition="Exists('..\Directory.Build.props')" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'OpenTelemetry.sln'))\build\Common.prod.props" />
<PropertyGroup>
<SkipAnalysis>True</SkipAnalysis>
</PropertyGroup>
</Project>

10
lib/Directory.Build.targets Normal file
View File

@ -0,0 +1,10 @@
<Project>
<Import Project="..\Directory.Build.targets" Condition="Exists('..\Directory.Build.targets')" />
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>

7
lib/Thrift/Thrift.csproj
View File

@ -3,10 +3,15 @@
<PropertyGroup>
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition="$(OS) != 'Windows_NT'">netstandard2.0</TargetFrameworks>
<Authors>OpenTelemetry authors</Authors>
<PackageIconUrl>https://opentelemetry.io/img/logos/opentelemetry-icon-color.png</PackageIconUrl>
<PackageProjectUrl>https://OpenTelemetry.io</PackageProjectUrl>
<PackageTags>Tracing;OpenTelemetry;Management;Monitoring;Jaeger;distributed-tracing</PackageTags>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
<Reference Include="System.Net.Http" Version="4.3.4" />
<Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Net.Http" />
</ItemGroup>
</Project>

8
lib/Thrift/Transports/Client/THttpClientTransport.cs
View File

@ -112,7 +112,7 @@ namespace Thrift.Transports.Client
try
{
var ret = await _inputStream.ReadAsync(buffer, offset, length, cancellationToken);
var ret = await _inputStream.ReadAsync(buffer, offset, length, cancellationToken).ConfigureAwait(false);
if (ret == -1)
{
@ -134,12 +134,16 @@ namespace Thrift.Transports.Client
await Task.FromCanceled(cancellationToken);
}
await _outputStream.WriteAsync(buffer, offset, length, cancellationToken);
await _outputStream.WriteAsync(buffer, offset, length, cancellationToken).ConfigureAwait(false);
}
private HttpClient CreateClient()
{
#if NET46
var handler = new WebRequestHandler();
#else
var handler = new HttpClientHandler();
#endif
if (_certificates.Length > 0)
{
handler.ClientCertificates.AddRange(_certificates);

4
lib/Thrift/Transports/Client/TMemoryBufferClientTransport.cs
View File

@ -1,4 +1,4 @@
// Licensed to the Apache Software Foundation(ASF) under one
// Licensed to the Apache Software Foundation(ASF) under one
// or more contributor license agreements.See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership.The ASF licenses this file
@ -49,7 +49,7 @@ namespace Thrift.Transports.Client
public override void Close()
{
/** do nothing **/
// do nothing
}
public override async Task<int> ReadAsync(byte[] buffer, int offset, int length,

6
lib/Thrift/Transports/TTransportFactory.cs
View File

@ -1,4 +1,4 @@
// Licensed to the Apache Software Foundation(ASF) under one
// Licensed to the Apache Software Foundation(ASF) under one
// or more contributor license agreements.See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership.The ASF licenses this file
@ -18,11 +18,11 @@
namespace Thrift.Transports
{
/// <summary>
/// From Mark Slee & Aditya Agarwal of Facebook:
/// From Mark Slee &amp; Aditya Agarwal of Facebook:
/// Factory class used to create wrapped instance of Transports.
/// This is used primarily in servers, which get Transports from
/// a ServerTransport and then may want to mutate them (i.e. create
/// a BufferedTransport from the underlying base transport)
/// a BufferedTransport from the underlying base transport).
/// </summary>
// ReSharper disable once InconsistentNaming
public class TTransportFactory

5
samples/Exporters/Program.cs
View File

@ -35,8 +35,9 @@ namespace Samples
/// <param name="args">Arguments from command line.</param>
public static void Main(string[] args)
{
Parser.Default.ParseArguments<ZipkinOptions, ApplicationInsightsOptions, PrometheusOptions, HttpClientOptions, StackdriverOptions>(args)
Parser.Default.ParseArguments<JaegerOptions, ZipkinOptions, ApplicationInsightsOptions, PrometheusOptions, HttpClientOptions, StackdriverOptions>(args)
.MapResult(
(JaegerOptions options) => TestJaeger.Run(options.Host, options.Port),
(ZipkinOptions options) => TestZipkin.Run(options.Uri),
(ApplicationInsightsOptions options) => TestApplicationInsights.Run(),
(PrometheusOptions options) => TestPrometheus.Run(),
@ -58,7 +59,7 @@ namespace Samples
}
[Verb("jaeger", HelpText = "Specify the options required to test Jaeger exporter")]
class JaegerOptions
internal class JaegerOptions
{
[Option('h', "host", HelpText = "Please specify the host of the Jaeger Agent", Required = true)]
public string Host { get; set; }

4
samples/Exporters/TestJaeger.cs
View File

@ -53,7 +53,7 @@ namespace Samples
var tracer = Tracing.Tracer;
// 4. Create a scoped span. It will end automatically when using statement ends
using (var scope = tracer.SpanBuilder("Main").StartScopedSpan())
using (tracer.WithSpan(tracer.SpanBuilder("Main").StartSpan()))
{
tracer.CurrentSpan.SetAttribute("custom-attribute", 55);
Console.WriteLine("About to do a busy work");
@ -77,7 +77,7 @@ namespace Samples
// 7. Start another span. If another span was already started, it'll use that span as the parent span.
// In this example, the main method already started a span, so that'll be the parent span, and this will be
// a child span.
using (var scope = tracer.SpanBuilder("DoWork").StartScopedSpan())
using (tracer.WithSpan(tracer.SpanBuilder("DoWork").StartSpan()))
{
// Simulate some work.
var span = tracer.CurrentSpan;

4
src/Directory.Build.targets
View File

@ -2,9 +2,9 @@
<Import Project="..\Directory.Build.targets" Condition="Exists('..\Directory.Build.targets')" />
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*">
<!-- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</PackageReference> -->
</ItemGroup>
</Project>

6
src/OpenTelemetry.Exporter.Jaeger/Implimentation/JaegerSpanRef.cs
View File

@ -1,4 +1,4 @@
// <copyright file="JaegerSpanRef.cs" company="OpenTelemetry Authors">
// <copyright file="JaegerSpanRef.cs" company="OpenTelemetry Authors">
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
@ -98,9 +98,9 @@ namespace OpenTelemetry.Exporter.Jaeger.Implimentation
}
/// <summary>
/// <seealso cref="SpanRefType"/>
/// <seealso cref="JaegerSpanRefType"/>
/// </summary>
/// <returns>A string representation of the object</returns>
/// <returns>A string representation of the object.</returns>
public override string ToString()
{
var sb = new StringBuilder("SpanRef(");

4
src/OpenTelemetry.Exporter.Jaeger/Implimentation/JaegerSpanRefType.cs
View File

@ -1,4 +1,4 @@
// <copyright file="JaegerSpanRefType.cs" company="OpenTelemetry Authors">
// <copyright file="JaegerSpanRefType.cs" company="OpenTelemetry Authors">
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
@ -19,7 +19,7 @@ namespace OpenTelemetry.Exporter.Jaeger.Implimentation
using System;
/// <summary>
/// Represents the different types of Jaeger Spans
/// Represents the different types of Jaeger Spans.
/// </summary>
public enum JaegerSpanRefType
{

4
src/OpenTelemetry.Exporter.Jaeger/Implimentation/JaegerTagType.cs
View File

@ -1,4 +1,4 @@
// <copyright file="JaegerTagType.cs" company="OpenTelemetry Authors">
// <copyright file="JaegerTagType.cs" company="OpenTelemetry Authors">
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
@ -19,7 +19,7 @@ namespace OpenTelemetry.Exporter.Jaeger.Implimentation
using System;
/// <summary>
/// Indicates the data type of a Jaeger tag
/// Indicates the data type of a Jaeger tag.
/// </summary>
public enum JaegerTagType
{

2
src/OpenTelemetry.Exporter.Jaeger/OpenTelemetry.Exporter.Jaeger.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>