From aba951f315d4899b5e3cb3ea77987076f72ad4da Mon Sep 17 00:00:00 2001
From: Cijo Thomas <cithomas@microsoft.com>
Date: Sat, 17 Jul 2021 10:31:14 -0700
Subject: [PATCH] Remove net452 net46 from zpages (#2149)

* Remove net452 net46 from zpages

* public api
---
 .../.publicApi/net46/PublicAPI.Shipped.txt    |  0
 .../.publicApi/net46/PublicAPI.Unshipped.txt  | 21 -------------------
 .../{net452 => net461}/PublicAPI.Shipped.txt  |  0
 .../PublicAPI.Unshipped.txt                   |  0
 .../CHANGELOG.md                              |  3 +++
 .../Implementation/ZPagesActivityAggregate.cs |  3 ---
 .../Implementation/ZPagesActivityTracker.cs   |  3 ---
 .../OpenTelemetry.Exporter.ZPages.csproj      |  3 +--
 .../ZPagesExporterStatsHttpServer.cs          |  7 -------
 .../ZPagesProcessor.cs                        |  3 ---
 ...OpenTelemetry.Exporter.ZPages.Tests.csproj |  2 +-
 11 files changed, 5 insertions(+), 40 deletions(-)
 delete mode 100644 src/OpenTelemetry.Exporter.ZPages/.publicApi/net46/PublicAPI.Shipped.txt
 delete mode 100644 src/OpenTelemetry.Exporter.ZPages/.publicApi/net46/PublicAPI.Unshipped.txt
 rename src/OpenTelemetry.Exporter.ZPages/.publicApi/{net452 => net461}/PublicAPI.Shipped.txt (100%)
 rename src/OpenTelemetry.Exporter.ZPages/.publicApi/{net452 => net461}/PublicAPI.Unshipped.txt (100%)

diff --git a/src/OpenTelemetry.Exporter.ZPages/.publicApi/net46/PublicAPI.Shipped.txt b/src/OpenTelemetry.Exporter.ZPages/.publicApi/net46/PublicAPI.Shipped.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/OpenTelemetry.Exporter.ZPages/.publicApi/net46/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Exporter.ZPages/.publicApi/net46/PublicAPI.Unshipped.txt
deleted file mode 100644
index faf071f21..000000000
--- a/src/OpenTelemetry.Exporter.ZPages/.publicApi/net46/PublicAPI.Unshipped.txt
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/src/OpenTelemetry.Exporter.ZPages/.publicApi/net452/PublicAPI.Shipped.txt b/src/OpenTelemetry.Exporter.ZPages/.publicApi/net461/PublicAPI.Shipped.txt
similarity index 100%
rename from src/OpenTelemetry.Exporter.ZPages/.publicApi/net452/PublicAPI.Shipped.txt
rename to src/OpenTelemetry.Exporter.ZPages/.publicApi/net461/PublicAPI.Shipped.txt
diff --git a/src/OpenTelemetry.Exporter.ZPages/.publicApi/net452/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Exporter.ZPages/.publicApi/net461/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/OpenTelemetry.Exporter.ZPages/.publicApi/net452/PublicAPI.Unshipped.txt
rename to src/OpenTelemetry.Exporter.ZPages/.publicApi/net461/PublicAPI.Unshipped.txt
diff --git a/src/OpenTelemetry.Exporter.ZPages/CHANGELOG.md b/src/OpenTelemetry.Exporter.ZPages/CHANGELOG.md
index 3a3629694..7bdde8b79 100644
--- a/src/OpenTelemetry.Exporter.ZPages/CHANGELOG.md
+++ b/src/OpenTelemetry.Exporter.ZPages/CHANGELOG.md
@@ -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
diff --git a/src/OpenTelemetry.Exporter.ZPages/Implementation/ZPagesActivityAggregate.cs b/src/OpenTelemetry.Exporter.ZPages/Implementation/ZPagesActivityAggregate.cs
index 924066ab3..842210b24 100644
--- a/src/OpenTelemetry.Exporter.ZPages/Implementation/ZPagesActivityAggregate.cs
+++ b/src/OpenTelemetry.Exporter.ZPages/Implementation/ZPagesActivityAggregate.cs
@@ -16,9 +16,6 @@
 
 using System;
 using System.Diagnostics;
-#if NET452
-using OpenTelemetry.Internal;
-#endif
 
 namespace OpenTelemetry.Exporter.ZPages.Implementation
 {
diff --git a/src/OpenTelemetry.Exporter.ZPages/Implementation/ZPagesActivityTracker.cs b/src/OpenTelemetry.Exporter.ZPages/Implementation/ZPagesActivityTracker.cs
index cfc4cd9fd..b7011c74f 100644
--- a/src/OpenTelemetry.Exporter.ZPages/Implementation/ZPagesActivityTracker.cs
+++ b/src/OpenTelemetry.Exporter.ZPages/Implementation/ZPagesActivityTracker.cs
@@ -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
 {
diff --git a/src/OpenTelemetry.Exporter.ZPages/OpenTelemetry.Exporter.ZPages.csproj b/src/OpenTelemetry.Exporter.ZPages/OpenTelemetry.Exporter.ZPages.csproj
index d990dc181..14dadaf44 100644
--- a/src/OpenTelemetry.Exporter.ZPages/OpenTelemetry.Exporter.ZPages.csproj
+++ b/src/OpenTelemetry.Exporter.ZPages/OpenTelemetry.Exporter.ZPages.csproj
@@ -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>
diff --git a/src/OpenTelemetry.Exporter.ZPages/ZPagesExporterStatsHttpServer.cs b/src/OpenTelemetry.Exporter.ZPages/ZPagesExporterStatsHttpServer.cs
index 4a8811430..5d9d8d988 100644
--- a/src/OpenTelemetry.Exporter.ZPages/ZPagesExporterStatsHttpServer.cs
+++ b/src/OpenTelemetry.Exporter.ZPages/ZPagesExporterStatsHttpServer.cs
@@ -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>" +
diff --git a/src/OpenTelemetry.Exporter.ZPages/ZPagesProcessor.cs b/src/OpenTelemetry.Exporter.ZPages/ZPagesProcessor.cs
index 907f6a8fa..b7062129c 100644
--- a/src/OpenTelemetry.Exporter.ZPages/ZPagesProcessor.cs
+++ b/src/OpenTelemetry.Exporter.ZPages/ZPagesProcessor.cs
@@ -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
diff --git a/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj b/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj
index 8e19752f4..1601ff3f3 100644
--- a/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj
+++ b/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj
@@ -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>