default to use Semantic Convention 1.28 and remove option Legacy

open-telemetry · Dec 20, 2024 · f6e3870 · f6e3870
1 parent 8e3d503
commit f6e3870
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 25 deletions.
diff --git a/src/OpenTelemetry.Instrumentation.AWS/.publicApi/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Instrumentation.AWS/.publicApi/PublicAPI.Unshipped.txt
@@ -1,6 +1,5 @@
 #nullable enable
 OpenTelemetry.Instrumentation.AWS.SemanticConventionVersion
-OpenTelemetry.Instrumentation.AWS.SemanticConventionVersion.Legacy = -1 -> OpenTelemetry.Instrumentation.AWS.SemanticConventionVersion
 OpenTelemetry.Instrumentation.AWS.SemanticConventionVersion.Latest = 0 -> OpenTelemetry.Instrumentation.AWS.SemanticConventionVersion
 OpenTelemetry.Instrumentation.AWS.SemanticConventionVersion.V1_29_0 = 2 -> OpenTelemetry.Instrumentation.AWS.SemanticConventionVersion
 OpenTelemetry.Instrumentation.AWS.SemanticConventionVersion.V1_28_0 = 1 -> OpenTelemetry.Instrumentation.AWS.SemanticConventionVersion

diff --git a/src/OpenTelemetry.Instrumentation.AWS/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.AWS/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+* BREAKING: Change default Semantic Convention to 1.28
+
 ## 1.10.0-beta.3
 
 Released 2024-Dec-20

diff --git a/src/OpenTelemetry.Instrumentation.AWSLambda/.publicApi/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Instrumentation.AWSLambda/.publicApi/PublicAPI.Unshipped.txt
@@ -1,5 +1,4 @@
 #nullable enable
-OpenTelemetry.Instrumentation.AWSLambda.SemanticConventionVersion.Legacy = -1 -> OpenTelemetry.Instrumentation.AWSLambda.SemanticConventionVersion
 OpenTelemetry.Instrumentation.AWSLambda.SemanticConventionVersion
 OpenTelemetry.Instrumentation.AWSLambda.SemanticConventionVersion.Latest = 0 -> OpenTelemetry.Instrumentation.AWSLambda.SemanticConventionVersion
 OpenTelemetry.Instrumentation.AWSLambda.SemanticConventionVersion.V1_29_0 = 2 -> OpenTelemetry.Instrumentation.AWSLambda.SemanticConventionVersion

diff --git a/src/OpenTelemetry.Instrumentation.AWSLambda/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.AWSLambda/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+* BREAKING: Change default Semantic Convention to 1.28
+
 ## 1.10.0-beta.3
 
 Released 2024-Dec-20

diff --git a/src/OpenTelemetry.Resources.AWS/.publicApi/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Resources.AWS/.publicApi/PublicAPI.Unshipped.txt
@@ -1,5 +1,4 @@
 OpenTelemetry.Resources.AWS.SemanticConventionVersion
-OpenTelemetry.Resources.AWS.SemanticConventionVersion.Legacy = -1 -> OpenTelemetry.Resources.AWS.SemanticConventionVersion
 OpenTelemetry.Resources.AWS.SemanticConventionVersion.Latest = 0 -> OpenTelemetry.Resources.AWS.SemanticConventionVersion
 OpenTelemetry.Resources.AWS.SemanticConventionVersion.V1_29_0 = 2 -> OpenTelemetry.Resources.AWS.SemanticConventionVersion
 OpenTelemetry.Resources.AWS.SemanticConventionVersion.V1_28_0 = 1 -> OpenTelemetry.Resources.AWS.SemanticConventionVersion

diff --git a/src/OpenTelemetry.Resources.AWS/CHANGELOG.md b/src/OpenTelemetry.Resources.AWS/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+* BREAKING: Change default Semantic Convention to 1.28
+
 * Introduce `AWSResourceBuilderOptions.SemanticConventionVersion` which
   provides a mechanism for developers to opt-in to newer versions of the
   of the Open Telemetry Semantic Conventions.

diff --git a/src/Shared/AWS/AWSSemanticConventions.cs b/src/Shared/AWS/AWSSemanticConventions.cs
@@ -19,9 +19,6 @@
 #pragma warning disable SA1201
 #pragma warning disable SA1623
 
-// disable obsolete warning - remove in RC
-#pragma warning disable CS0618
-
 namespace OpenTelemetry.AWS;
 
 /// <summary>
@@ -69,10 +66,7 @@ internal partial class AWSSemanticConventions
     /// Per SemanticConventionVersion, default should stay as
     /// <see cref="SemanticConventionVersion.V1_28_0"/> until next major version bump.
     /// </remarks>
-    internal const SemanticConventionVersion DefaultSemanticConventionVersion = SemanticConventionVersion.Legacy;
-
-    // RC Release: change to
-    //SemanticConventionVersion.V1_28_0;
+    internal const SemanticConventionVersion DefaultSemanticConventionVersion = SemanticConventionVersion.V1_28_0;
 
     private readonly SemanticConventionVersion semanticConventionVersion;
 
@@ -494,9 +488,6 @@ private AWSSemanticConventionsBase GetSemanticConventionVersion()
             case SemanticConventionVersion.V1_28_0:
                 return new AWSSemanticConventions_V1_28_0();
 
-            case SemanticConventionVersion.Legacy:
-                return new AWSSemanticConventionsLegacy();
-
             default:
                 throw new InvalidEnumArgumentException(
                     argumentName: nameof(SemanticConventionVersion),

diff --git a/src/Shared/AWS/SemanticConventionVersion.cs b/src/Shared/AWS/SemanticConventionVersion.cs
@@ -73,18 +73,6 @@ public enum SemanticConventionVersion
     /// </summary>
     Latest = 0,
 
-    /// <summary>
-    /// Represents the mixture of Semantic Conventions used in OpenTelemetry.*.AWS libraries
-    /// in 1.10.0-beta.x.
-    /// <para />
-    /// This allows users to upgrade to the latest beta nuget package without experiencing a change in
-    /// Semantic Convention output.  Then there is an opportunity for users to trial <see cref="V1_28_0"/>.
-    /// <para />
-    /// This option will be REMOVED in the next Release Candidate.
-    /// </summary>
-    [Obsolete("This will be removed in the 1.10.0-RC", error: false)]
-    Legacy = -1,
-
     /// <summary>
     /// Pin to the specific state of all Semantic Conventions as of the 1.28.0
     /// release. See: