Remove net452 net46 from zpages (#2149)
* Remove net452 net46 from zpages * public api
This commit is contained in:
Cijo Thomas
GitHub
parent
64b967a49b
commit
aba951f315
|
|
@ -1,21 +0,0 @@
|
|||
OpenTelemetry.Exporter.ZPages.ZPagesExporter
|
||||
OpenTelemetry.Exporter.ZPages.ZPagesExporter.ZPagesExporter(OpenTelemetry.Exporter.ZPages.ZPagesExporterOptions options) -> void
|
||||
OpenTelemetry.Exporter.ZPages.ZPagesExporterOptions
|
||||
OpenTelemetry.Exporter.ZPages.ZPagesExporterOptions.RetentionTime.get -> long
|
||||
OpenTelemetry.Exporter.ZPages.ZPagesExporterOptions.RetentionTime.set -> void
|
||||
OpenTelemetry.Exporter.ZPages.ZPagesExporterOptions.Url.get -> string
|
||||
OpenTelemetry.Exporter.ZPages.ZPagesExporterOptions.Url.set -> void
|
||||
OpenTelemetry.Exporter.ZPages.ZPagesExporterOptions.ZPagesExporterOptions() -> void
|
||||
OpenTelemetry.Exporter.ZPages.ZPagesExporterStatsHttpServer
|
||||
OpenTelemetry.Exporter.ZPages.ZPagesExporterStatsHttpServer.Dispose() -> void
|
||||
OpenTelemetry.Exporter.ZPages.ZPagesExporterStatsHttpServer.Start(System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> void
|
||||
OpenTelemetry.Exporter.ZPages.ZPagesExporterStatsHttpServer.Stop() -> void
|
||||
OpenTelemetry.Exporter.ZPages.ZPagesExporterStatsHttpServer.ZPagesExporterStatsHttpServer(OpenTelemetry.Exporter.ZPages.ZPagesExporter exporter) -> void
|
||||
OpenTelemetry.Exporter.ZPages.ZPagesProcessor
|
||||
OpenTelemetry.Exporter.ZPages.ZPagesProcessor.ZPagesProcessor(OpenTelemetry.Exporter.ZPages.ZPagesExporter exporter) -> void
|
||||
OpenTelemetry.Trace.ZPagesExporterHelperExtensions
|
||||
override OpenTelemetry.Exporter.ZPages.ZPagesExporter.Export(in OpenTelemetry.Batch<System.Diagnostics.Activity> batch) -> OpenTelemetry.ExportResult
|
||||
override OpenTelemetry.Exporter.ZPages.ZPagesProcessor.OnEnd(System.Diagnostics.Activity activity) -> void
|
||||
override OpenTelemetry.Exporter.ZPages.ZPagesProcessor.OnStart(System.Diagnostics.Activity activity) -> void
|
||||
static OpenTelemetry.Trace.ZPagesExporterHelperExtensions.AddZPagesExporter(this OpenTelemetry.Trace.TracerProviderBuilder builder, System.Action<OpenTelemetry.Exporter.ZPages.ZPagesExporterOptions> configure = null) -> OpenTelemetry.Trace.TracerProviderBuilder
|
||||
virtual OpenTelemetry.Exporter.ZPages.ZPagesExporterStatsHttpServer.Dispose(bool disposing) -> void
|
||||
|
|
@ -2,6 +2,9 @@
|
|||
|
||||
## Unreleased
|
||||
|
||||
* Removes .NET Framework 4.5.2, 4.6 support. The minimum .NET Framework version
|
||||
supported is .NET 4.6.1. ([2138](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2138))
|
||||
|
||||
## 1.0.0-rc7
|
||||
|
||||
Released 2021-Jul-12
|
||||
|
|
|
|||
|
|
@ -16,9 +16,6 @@
|
|||
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
#if NET452
|
||||
using OpenTelemetry.Internal;
|
||||
#endif
|
||||
|
||||
namespace OpenTelemetry.Exporter.ZPages.Implementation
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,9 +18,6 @@ using System;
|
|||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Timers;
|
||||
#if NET452
|
||||
using OpenTelemetry.Internal;
|
||||
#endif
|
||||
|
||||
namespace OpenTelemetry.Exporter.ZPages.Implementation
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;net452;net46</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
<Description>ZPages exporter for OpenTelemetry .NET</Description>
|
||||
<PackageTags>$(PackageTags);ZPages;distributed-tracing</PackageTags>
|
||||
</PropertyGroup>
|
||||
|
|
@ -10,7 +10,6 @@
|
|||
<ProjectReference Include="$(RepoRoot)\src\OpenTelemetry\OpenTelemetry.csproj" />
|
||||
|
||||
<Compile Include="$(RepoRoot)\src\OpenTelemetry.Api\Internal\ExceptionExtensions.cs" Link="Includes\ExceptionExtensions.cs" />
|
||||
<Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\DateTimeOffsetExtensions.net452.cs" Link="Includes\DateTimeOffsetExtensions.net452.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -21,9 +21,6 @@ using System.Net;
|
|||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using OpenTelemetry.Exporter.ZPages.Implementation;
|
||||
#if NET452
|
||||
using OpenTelemetry.Internal;
|
||||
#endif
|
||||
|
||||
namespace OpenTelemetry.Exporter.ZPages
|
||||
{
|
||||
|
|
@ -169,11 +166,7 @@ namespace OpenTelemetry.Exporter.ZPages
|
|||
|
||||
DateTimeOffset dateTimeOffset;
|
||||
|
||||
#if NET452
|
||||
dateTimeOffset = DateTimeOffsetExtensions.FromUnixTimeMilliseconds(hourSpanInformation.LastUpdated);
|
||||
#else
|
||||
dateTimeOffset = DateTimeOffset.FromUnixTimeMilliseconds(hourSpanInformation.LastUpdated);
|
||||
#endif
|
||||
|
||||
writer.WriteLine("<tr><td>" + hourSpanInformation.Name + "</td><td>" + ZPagesActivityTracker.TotalCount[spanName] + "</td><td>" + countInLastMinute + "</td><td>" + countInLastHour + "</td>" +
|
||||
"<td>" + totalAverageLatency + "</td><td>" + averageLatencyInLastMinute + "</td><td>" + averageLatencyInLastHour + "</td>" +
|
||||
|
|
|
|||
|
|
@ -17,9 +17,6 @@
|
|||
using System;
|
||||
using System.Diagnostics;
|
||||
using OpenTelemetry.Exporter.ZPages.Implementation;
|
||||
#if NET452
|
||||
using OpenTelemetry.Internal;
|
||||
#endif
|
||||
using OpenTelemetry.Trace;
|
||||
|
||||
namespace OpenTelemetry.Exporter.ZPages
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net452;net46</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>
|
||||
<IsPackable>false</IsPackable>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue