From d3918888594aea3eb08601f4d54ed8d48cd235d3 Mon Sep 17 00:00:00 2001 From: Joao Grassi Date: Fri, 16 Jul 2021 22:32:13 +0200 Subject: [PATCH 1/4] Remove net452 from shims project (#2139) --- .../.publicApi/net452/PublicAPI.Unshipped.txt | 7 ------- src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md | 3 +++ .../OpenTelemetry.Shims.OpenTracing.csproj | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 src/OpenTelemetry.Shims.OpenTracing/.publicApi/net452/PublicAPI.Unshipped.txt diff --git a/src/OpenTelemetry.Shims.OpenTracing/.publicApi/net452/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Shims.OpenTracing/.publicApi/net452/PublicAPI.Unshipped.txt deleted file mode 100644 index f6459c7461e..00000000000 --- a/src/OpenTelemetry.Shims.OpenTracing/.publicApi/net452/PublicAPI.Unshipped.txt +++ /dev/null @@ -1,7 +0,0 @@ -OpenTelemetry.Shims.OpenTracing.TracerShim -OpenTelemetry.Shims.OpenTracing.TracerShim.ActiveSpan.get -> OpenTracing.ISpan -OpenTelemetry.Shims.OpenTracing.TracerShim.BuildSpan(string operationName) -> OpenTracing.ISpanBuilder -OpenTelemetry.Shims.OpenTracing.TracerShim.Extract(OpenTracing.Propagation.IFormat format, TCarrier carrier) -> OpenTracing.ISpanContext -OpenTelemetry.Shims.OpenTracing.TracerShim.Inject(OpenTracing.ISpanContext spanContext, OpenTracing.Propagation.IFormat format, TCarrier carrier) -> void -OpenTelemetry.Shims.OpenTracing.TracerShim.ScopeManager.get -> OpenTracing.IScopeManager -OpenTelemetry.Shims.OpenTracing.TracerShim.TracerShim(OpenTelemetry.Trace.Tracer tracer, OpenTelemetry.Context.Propagation.TextMapPropagator textFormat) -> void diff --git a/src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md b/src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md index 040eafae749..d0f37d63288 100644 --- a/src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md +++ b/src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Removes .NET Framework 4.5.2 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.Shims.OpenTracing/OpenTelemetry.Shims.OpenTracing.csproj b/src/OpenTelemetry.Shims.OpenTracing/OpenTelemetry.Shims.OpenTracing.csproj index e30033aa3aa..6106eb65ed4 100644 --- a/src/OpenTelemetry.Shims.OpenTracing/OpenTelemetry.Shims.OpenTracing.csproj +++ b/src/OpenTelemetry.Shims.OpenTracing/OpenTelemetry.Shims.OpenTracing.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net452 + netstandard2.0 OpenTracing shim for OpenTelemetry .NET $(PackageTags);distributed-tracing;OpenTracing true From f5171678780a5b118125c14a84b6934c7c1b6a62 Mon Sep 17 00:00:00 2001 From: Joao Grassi Date: Fri, 16 Jul 2021 22:42:29 +0200 Subject: [PATCH 2/4] Update src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md Co-authored-by: Reiley Yang --- src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md b/src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md index d0f37d63288..7d50303ee14 100644 --- a/src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md +++ b/src/OpenTelemetry.Shims.OpenTracing/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased * Removes .NET Framework 4.5.2 support. The minimum .NET Framework version - supported is .NET 4.6.1. ([2138](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2138)) + supported is .NET 4.6.1. ([#2138](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2138)) ## 1.0.0-rc7 From 0613ac8fb52812edb3778282dc1971e5e7f10cf8 Mon Sep 17 00:00:00 2001 From: Joao Grassi Date: Sat, 17 Jul 2021 11:22:53 +0200 Subject: [PATCH 3/4] Add missing target framework --- .../OpenTelemetry.Shims.OpenTracing.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTelemetry.Shims.OpenTracing/OpenTelemetry.Shims.OpenTracing.csproj b/src/OpenTelemetry.Shims.OpenTracing/OpenTelemetry.Shims.OpenTracing.csproj index 6106eb65ed4..669d7c68aa1 100644 --- a/src/OpenTelemetry.Shims.OpenTracing/OpenTelemetry.Shims.OpenTracing.csproj +++ b/src/OpenTelemetry.Shims.OpenTracing/OpenTelemetry.Shims.OpenTracing.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net461 OpenTracing shim for OpenTelemetry .NET $(PackageTags);distributed-tracing;OpenTracing true From 4e6edfe244c2add5c50309f8ad5de72963f92b9b Mon Sep 17 00:00:00 2001 From: Joao Grassi Date: Sat, 17 Jul 2021 11:45:34 +0200 Subject: [PATCH 4/4] Add public API for net461 --- .../.publicApi/net461/PublicAPI.Shipped.txt | 0 .../.publicApi/net461/PublicAPI.Unshipped.txt | 7 +++++++ 2 files changed, 7 insertions(+) create mode 100644 src/OpenTelemetry.Shims.OpenTracing/.publicApi/net461/PublicAPI.Shipped.txt create mode 100644 src/OpenTelemetry.Shims.OpenTracing/.publicApi/net461/PublicAPI.Unshipped.txt diff --git a/src/OpenTelemetry.Shims.OpenTracing/.publicApi/net461/PublicAPI.Shipped.txt b/src/OpenTelemetry.Shims.OpenTracing/.publicApi/net461/PublicAPI.Shipped.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/OpenTelemetry.Shims.OpenTracing/.publicApi/net461/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Shims.OpenTracing/.publicApi/net461/PublicAPI.Unshipped.txt new file mode 100644 index 00000000000..a9a1b3717e4 --- /dev/null +++ b/src/OpenTelemetry.Shims.OpenTracing/.publicApi/net461/PublicAPI.Unshipped.txt @@ -0,0 +1,7 @@ +OpenTelemetry.Shims.OpenTracing.TracerShim +OpenTelemetry.Shims.OpenTracing.TracerShim.ActiveSpan.get -> OpenTracing.ISpan +OpenTelemetry.Shims.OpenTracing.TracerShim.BuildSpan(string operationName) -> OpenTracing.ISpanBuilder +OpenTelemetry.Shims.OpenTracing.TracerShim.Extract(OpenTracing.Propagation.IFormat format, TCarrier carrier) -> OpenTracing.ISpanContext +OpenTelemetry.Shims.OpenTracing.TracerShim.Inject(OpenTracing.ISpanContext spanContext, OpenTracing.Propagation.IFormat format, TCarrier carrier) -> void +OpenTelemetry.Shims.OpenTracing.TracerShim.ScopeManager.get -> OpenTracing.IScopeManager +OpenTelemetry.Shims.OpenTracing.TracerShim.TracerShim(OpenTelemetry.Trace.Tracer tracer, OpenTelemetry.Context.Propagation.TextMapPropagator textFormat) -> void \ No newline at end of file