Removes net452 net46 from OTLP Exporter (#2152)
This commit is contained in:
parent
7e2c128b76
commit
87beade9a5
|
|
@ -0,0 +1,18 @@
|
|||
OpenTelemetry.Exporter.OtlpExporterOptions
|
||||
OpenTelemetry.Exporter.OtlpExporterOptions.BatchExportProcessorOptions.get -> OpenTelemetry.BatchExportProcessorOptions<System.Diagnostics.Activity>
|
||||
OpenTelemetry.Exporter.OtlpExporterOptions.BatchExportProcessorOptions.set -> void
|
||||
OpenTelemetry.Exporter.OtlpExporterOptions.Endpoint.get -> System.Uri
|
||||
OpenTelemetry.Exporter.OtlpExporterOptions.Endpoint.set -> void
|
||||
OpenTelemetry.Exporter.OtlpExporterOptions.ExportProcessorType.get -> OpenTelemetry.ExportProcessorType
|
||||
OpenTelemetry.Exporter.OtlpExporterOptions.ExportProcessorType.set -> void
|
||||
OpenTelemetry.Exporter.OtlpExporterOptions.Headers.get -> string
|
||||
OpenTelemetry.Exporter.OtlpExporterOptions.Headers.set -> void
|
||||
OpenTelemetry.Exporter.OtlpExporterOptions.OtlpExporterOptions() -> void
|
||||
OpenTelemetry.Exporter.OtlpExporterOptions.TimeoutMilliseconds.get -> int
|
||||
OpenTelemetry.Exporter.OtlpExporterOptions.TimeoutMilliseconds.set -> void
|
||||
OpenTelemetry.Exporter.OtlpTraceExporter
|
||||
OpenTelemetry.Exporter.OtlpTraceExporter.OtlpTraceExporter(OpenTelemetry.Exporter.OtlpExporterOptions options) -> void
|
||||
OpenTelemetry.Trace.OtlpTraceExporterHelperExtensions
|
||||
override OpenTelemetry.Exporter.OtlpTraceExporter.Export(in OpenTelemetry.Batch<System.Diagnostics.Activity> activityBatch) -> OpenTelemetry.ExportResult
|
||||
override OpenTelemetry.Exporter.OtlpTraceExporter.OnShutdown(int timeoutMilliseconds) -> bool
|
||||
static OpenTelemetry.Trace.OtlpTraceExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Trace.TracerProviderBuilder builder, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions> configure = null) -> OpenTelemetry.Trace.TracerProviderBuilder
|
||||
|
|
@ -9,6 +9,9 @@ please check the latest changes
|
|||
|
||||
## Unreleased
|
||||
|
||||
* Removes .NET Framework 4.5.2, .NET 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.1.0
|
||||
|
||||
Released 2021-Jul-12
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netstandard2.0;net452;net46</TargetFrameworks>
|
||||
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
|
||||
|
||||
<!--
|
||||
There is an integration test for the OTLP exporter that runs a test targeting netcoreapp2.1, netcoreapp3.1 and net5.0.
|
||||
|
|
@ -26,6 +26,12 @@
|
|||
<MinVerTagPrefix>core-</MinVerTagPrefix>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--Do not run ApiCopmat for net461 as this is newly added. There is no existing contract for net461 against which we could compare the implementation.
|
||||
Remove this property once we have released a stable net461 version.-->
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
|
||||
<RunApiCompat>false</RunApiCompat>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
|
||||
<PackageReference Include="Grpc.Net.Client" Version="$(GrpcNetClientPkgVer)" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks Condition="$(TARGET_FRAMEWORK) == ''">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$(TARGET_FRAMEWORK) == '' AND $(OS) == 'Windows_NT'">$(TargetFrameworks);net452;net46</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$(TARGET_FRAMEWORK) == '' AND $(OS) == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>
|
||||
<TargetFrameworks Condition="$(TARGET_FRAMEWORK) != ''">$(TARGET_FRAMEWORK)</TargetFrameworks>
|
||||
<IsPackable>false</IsPackable>
|
||||
</PropertyGroup>
|
||||
|
|
@ -22,7 +22,6 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\DateTimeOffsetExtensions.net452.cs" Link="Includes\DateTimeOffsetExtensions.net452.cs" />
|
||||
<Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\DelegatingTestExporter.cs" Link="Includes\DelegatingTestExporter.cs" />
|
||||
<Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\EventSourceTestHelper.cs" Link="Includes\EventSourceTestHelper.cs" />
|
||||
<Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\SkipUnlessEnvVarFoundFactAttribute.cs" Link="Includes\SkipUnlessEnvVarFoundFactAttribute.cs" />
|
||||
|
|
|
|||
|
|
@ -24,9 +24,6 @@ using Google.Protobuf.Collections;
|
|||
using Grpc.Core;
|
||||
using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;
|
||||
using OpenTelemetry.Resources;
|
||||
#if NET452
|
||||
using OpenTelemetry.Internal;
|
||||
#endif
|
||||
using OpenTelemetry.Tests;
|
||||
using OpenTelemetry.Trace;
|
||||
using Xunit;
|
||||
|
|
@ -194,11 +191,7 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests
|
|||
var startTime = new DateTime(2020, 02, 20, 20, 20, 20, DateTimeKind.Utc);
|
||||
|
||||
DateTimeOffset dateTimeOffset;
|
||||
#if NET452
|
||||
dateTimeOffset = DateTimeOffsetExtensions.FromUnixTimeMilliseconds(0);
|
||||
#else
|
||||
dateTimeOffset = DateTimeOffset.FromUnixTimeMilliseconds(0);
|
||||
#endif
|
||||
|
||||
var expectedUnixTimeTicks = (ulong)(startTime.Ticks - dateTimeOffset.Ticks);
|
||||
var duration = TimeSpan.FromMilliseconds(1555);
|
||||
|
|
|
|||
Loading…
Reference in New Issue