Skip to content

Commit 87beade

Browse files
authored
Removes net452 net46 from OTLP Exporter (#2152)
1 parent 7e2c128 commit 87beade

File tree

7 files changed

+29
-10
lines changed

7 files changed

+29
-10
lines changed

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/.publicApi/net46/PublicAPI.Unshipped.txt

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
OpenTelemetry.Exporter.OtlpExporterOptions
2+
OpenTelemetry.Exporter.OtlpExporterOptions.BatchExportProcessorOptions.get -> OpenTelemetry.BatchExportProcessorOptions<System.Diagnostics.Activity>
3+
OpenTelemetry.Exporter.OtlpExporterOptions.BatchExportProcessorOptions.set -> void
4+
OpenTelemetry.Exporter.OtlpExporterOptions.Endpoint.get -> System.Uri
5+
OpenTelemetry.Exporter.OtlpExporterOptions.Endpoint.set -> void
6+
OpenTelemetry.Exporter.OtlpExporterOptions.ExportProcessorType.get -> OpenTelemetry.ExportProcessorType
7+
OpenTelemetry.Exporter.OtlpExporterOptions.ExportProcessorType.set -> void
8+
OpenTelemetry.Exporter.OtlpExporterOptions.Headers.get -> string
9+
OpenTelemetry.Exporter.OtlpExporterOptions.Headers.set -> void
10+
OpenTelemetry.Exporter.OtlpExporterOptions.OtlpExporterOptions() -> void
11+
OpenTelemetry.Exporter.OtlpExporterOptions.TimeoutMilliseconds.get -> int
12+
OpenTelemetry.Exporter.OtlpExporterOptions.TimeoutMilliseconds.set -> void
13+
OpenTelemetry.Exporter.OtlpTraceExporter
14+
OpenTelemetry.Exporter.OtlpTraceExporter.OtlpTraceExporter(OpenTelemetry.Exporter.OtlpExporterOptions options) -> void
15+
OpenTelemetry.Trace.OtlpTraceExporterHelperExtensions
16+
override OpenTelemetry.Exporter.OtlpTraceExporter.Export(in OpenTelemetry.Batch<System.Diagnostics.Activity> activityBatch) -> OpenTelemetry.ExportResult
17+
override OpenTelemetry.Exporter.OtlpTraceExporter.OnShutdown(int timeoutMilliseconds) -> bool
18+
static OpenTelemetry.Trace.OtlpTraceExporterHelperExtensions.AddOtlpExporter(this OpenTelemetry.Trace.TracerProviderBuilder builder, System.Action<OpenTelemetry.Exporter.OtlpExporterOptions> configure = null) -> OpenTelemetry.Trace.TracerProviderBuilder

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ please check the latest changes
99

1010
## Unreleased
1111

12+
* Removes .NET Framework 4.5.2, .NET 4.6 support. The minimum .NET Framework
13+
version supported is .NET 4.6.1. ([#2138](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2138))
14+
1215
## 1.1.0
1316

1417
Released 2021-Jul-12

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net452;net46</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
44

55
<!--
66
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 @@
2626
<MinVerTagPrefix>core-</MinVerTagPrefix>
2727
</PropertyGroup>
2828

29+
<!--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.
30+
Remove this property once we have released a stable net461 version.-->
31+
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
32+
<RunApiCompat>false</RunApiCompat>
33+
</PropertyGroup>
34+
2935
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
3036
<PackageReference Include="Grpc.Net.Client" Version="$(GrpcNetClientPkgVer)" />
3137
</ItemGroup>

test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks Condition="$(TARGET_FRAMEWORK) == ''">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
5-
<TargetFrameworks Condition="$(TARGET_FRAMEWORK) == '' AND $(OS) == 'Windows_NT'">$(TargetFrameworks);net452;net46</TargetFrameworks>
5+
<TargetFrameworks Condition="$(TARGET_FRAMEWORK) == '' AND $(OS) == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>
66
<TargetFrameworks Condition="$(TARGET_FRAMEWORK) != ''">$(TARGET_FRAMEWORK)</TargetFrameworks>
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
@@ -22,7 +22,6 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<Compile Include="$(RepoRoot)\src\OpenTelemetry\Internal\DateTimeOffsetExtensions.net452.cs" Link="Includes\DateTimeOffsetExtensions.net452.cs" />
2625
<Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\DelegatingTestExporter.cs" Link="Includes\DelegatingTestExporter.cs" />
2726
<Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\EventSourceTestHelper.cs" Link="Includes\EventSourceTestHelper.cs" />
2827
<Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\SkipUnlessEnvVarFoundFactAttribute.cs" Link="Includes\SkipUnlessEnvVarFoundFactAttribute.cs" />

test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpExporterTest.cs

-7
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
using Grpc.Core;
2525
using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;
2626
using OpenTelemetry.Resources;
27-
#if NET452
28-
using OpenTelemetry.Internal;
29-
#endif
3027
using OpenTelemetry.Tests;
3128
using OpenTelemetry.Trace;
3229
using Xunit;
@@ -194,11 +191,7 @@ public void ToOtlpSpanTest()
194191
var startTime = new DateTime(2020, 02, 20, 20, 20, 20, DateTimeKind.Utc);
195192

196193
DateTimeOffset dateTimeOffset;
197-
#if NET452
198-
dateTimeOffset = DateTimeOffsetExtensions.FromUnixTimeMilliseconds(0);
199-
#else
200194
dateTimeOffset = DateTimeOffset.FromUnixTimeMilliseconds(0);
201-
#endif
202195

203196
var expectedUnixTimeTicks = (ulong)(startTime.Ticks - dateTimeOffset.Ticks);
204197
var duration = TimeSpan.FromMilliseconds(1555);

0 commit comments

Comments
 (0)