-
Notifications
You must be signed in to change notification settings - Fork 291
Commit
…n semantic convention output). There will be a fast follow PR to remove Legacy in preparation for an RC.
- Loading branch information
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -66,7 +66,11 @@ 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.V1_28_0; | ||
internal const SemanticConventionVersion DefaultSemanticConventionVersion = | ||
// Beta Release | ||
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net9.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net9.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net462)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net462)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net9.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net9.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net8.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net8.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net8.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net8.0)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net462)
Check failure on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net462)
Check warning on line 70 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / lint-dotnet-format / run-dotnet-format
|
||
SemanticConventionVersion.Legacy; | ||
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net9.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net9.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net462)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net462)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net9.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net9.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net8.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net8.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net8.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net8.0)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net462)
Check failure on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net462)
Check warning on line 71 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / lint-dotnet-format / run-dotnet-format
|
||
// RC Release | ||
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net9.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net9.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net462)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net462)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net9.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net9.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net8.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net8.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net8.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net8.0)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net462)
Check failure on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net462)
Check warning on line 72 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / lint-dotnet-format / run-dotnet-format
|
||
//SemanticConventionVersion.V1_28_0; | ||
|
||
private readonly SemanticConventionVersion semanticConventionVersion; | ||
|
||
|
@@ -488,6 +492,9 @@ private AWSSemanticConventionsBase GetSemanticConventionVersion() | |
case SemanticConventionVersion.V1_28_0: | ||
return new AWSSemanticConventions_V1_28_0(); | ||
|
||
case SemanticConventionVersion.Legacy: | ||
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net9.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net9.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net462)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net462)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net9.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net9.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net8.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net8.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net8.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net8.0)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net462)
Check failure on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net462)
Check warning on line 495 in src/Shared/AWS/AWSSemanticConventions.cs GitHub Actions / lint-dotnet-format / run-dotnet-format
|
||
return new AWSSemanticConventionsLegacy(); | ||
|
||
default: | ||
throw new InvalidEnumArgumentException( | ||
argumentName: nameof(SemanticConventionVersion), | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -73,6 +73,18 @@ 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, | ||
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-resources-aws / build-test (ubuntu-22.04, net9.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-instrumentation-aws / build-test (ubuntu-22.04, net8.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net9.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net9.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net462)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net462)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net9.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net9.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net8.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net8.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net8.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-resources-aws / build-test (windows-latest, net8.0)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net462)
Check failure on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / build-test-instrumentation-aws / build-test (windows-latest, net462)
Check warning on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / lint-dotnet-format / run-dotnet-format
Check warning on line 86 in src/Shared/AWS/SemanticConventionVersion.cs GitHub Actions / lint-dotnet-format / run-dotnet-format
|
||
|
||
/// <summary> | ||
/// Pin to the specific state of all Semantic Conventions as of the 1.28.0 | ||
/// release. See: | ||
|