From 9e5f8990a551f01ce4d731b6acf8b8abe6833f7d Mon Sep 17 00:00:00 2001 From: Eddy Nakamura Date: Wed, 4 Nov 2020 11:13:33 -0300 Subject: [PATCH 1/2] SpanAttributeConstants is internal --- examples/Console/Examples.Console.csproj | 2 ++ src/OpenTelemetry.Api/Trace/SpanAttributeConstants.cs | 2 +- .../OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj | 1 + .../OpenTelemetry.Instrumentation.AspNet.csproj | 1 + .../OpenTelemetry.Instrumentation.AspNetCore.csproj | 1 + .../OpenTelemetry.Instrumentation.SqlClient.csproj | 1 + .../OpenTelemetry.Instrumentation.Grpc.Tests.csproj | 1 + .../OpenTelemetry.Instrumentation.Http.Tests.csproj | 1 + ...penTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj | 1 + 9 files changed, 10 insertions(+), 1 deletion(-) diff --git a/examples/Console/Examples.Console.csproj b/examples/Console/Examples.Console.csproj index 9b82b87838a..e939830fae8 100644 --- a/examples/Console/Examples.Console.csproj +++ b/examples/Console/Examples.Console.csproj @@ -19,6 +19,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/src/OpenTelemetry.Api/Trace/SpanAttributeConstants.cs b/src/OpenTelemetry.Api/Trace/SpanAttributeConstants.cs index 1236f794ea2..c7ca70c2e59 100644 --- a/src/OpenTelemetry.Api/Trace/SpanAttributeConstants.cs +++ b/src/OpenTelemetry.Api/Trace/SpanAttributeConstants.cs @@ -19,7 +19,7 @@ namespace OpenTelemetry.Trace /// /// Defines well-known span attribute keys. /// - public static class SpanAttributeConstants + internal static class SpanAttributeConstants { #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member public const string StatusCodeKey = "otel.status_code"; diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj index 28625b22e86..14253e7c9ab 100644 --- a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj +++ b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj @@ -13,6 +13,7 @@ + diff --git a/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj b/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj index 4493dd69035..af29670a09b 100644 --- a/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj +++ b/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj @@ -8,6 +8,7 @@ + diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj b/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj index d8efa1ae85d..7fc4ae2450a 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj @@ -7,6 +7,7 @@ + diff --git a/src/OpenTelemetry.Instrumentation.SqlClient/OpenTelemetry.Instrumentation.SqlClient.csproj b/src/OpenTelemetry.Instrumentation.SqlClient/OpenTelemetry.Instrumentation.SqlClient.csproj index 1d529533168..5105751daa7 100644 --- a/src/OpenTelemetry.Instrumentation.SqlClient/OpenTelemetry.Instrumentation.SqlClient.csproj +++ b/src/OpenTelemetry.Instrumentation.SqlClient/OpenTelemetry.Instrumentation.SqlClient.csproj @@ -9,6 +9,7 @@ + diff --git a/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj b/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj index 1ba32931e3d..16120ff75ab 100644 --- a/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj @@ -30,6 +30,7 @@ + diff --git a/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj b/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj index 643b4b4e4f9..393056de9f6 100644 --- a/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj @@ -11,6 +11,7 @@ + diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj index 6bdbd73ddfa..4f5074bf0bc 100644 --- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj @@ -8,6 +8,7 @@ + From e5ac0d31a08e0163bab0fd71bff462ba75b3169f Mon Sep 17 00:00:00 2001 From: Eddy Nakamura Date: Wed, 4 Nov 2020 11:24:49 -0300 Subject: [PATCH 2/2] updating changelog fixing tests Revert "fixing tests" This reverts commit 66167c899025f2e56aca957bbcbe6d658a866d17. --- src/OpenTelemetry.Api/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/OpenTelemetry.Api/CHANGELOG.md b/src/OpenTelemetry.Api/CHANGELOG.md index 52d89e2dded..4eb309cbfcd 100644 --- a/src/OpenTelemetry.Api/CHANGELOG.md +++ b/src/OpenTelemetry.Api/CHANGELOG.md @@ -17,6 +17,8 @@ ([#1427](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1427)) * Added GlobalPropagators API via Propagators.DefaultTextMapPropagator. ([#1427](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1428)) +* Changed SpanAttributeConstants from public to internal + ([#1457](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1457)) ## 0.7.0-beta.1