Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SemanticConvention] Migrate generation to Weaver and bump version to 1.26 #2040

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
6f19aa8
Migrate to Weaver
joaopgrassi Jul 25, 2024
7a0f5fe
Bump to 1.26
joaopgrassi Jul 26, 2024
dfee1b5
Keep .NET unrelated files for now
joaopgrassi Sep 4, 2024
2dc7775
Simplify template with new Weaver features
joaopgrassi Sep 5, 2024
a33d30a
Generate attributes with Weaver
joaopgrassi Sep 5, 2024
3e61b1e
Add changelog
joaopgrassi Sep 5, 2024
a4d83b4
Update bash script
joaopgrassi Sep 5, 2024
6be6781
Merge branch 'main' into feat/semconv-migrate-to-weaver
joaopgrassi Sep 5, 2024
3615b57
Drop deprecated `otel.*` attributes for now
joaopgrassi Sep 5, 2024
e166e05
PR suggestions
joaopgrassi Sep 6, 2024
f2e6bc9
PR suggestions
joaopgrassi Sep 9, 2024
88c07be
Merge branch 'main' into feat/semconv-migrate-to-weaver
joaopgrassi Sep 9, 2024
2d30d4a
Merge branch 'main' into feat/semconv-migrate-to-weaver
joaopgrassi Sep 10, 2024
558bc64
Update public api file
joaopgrassi Sep 10, 2024
b0e91c5
Add comment about auto-gen code in sanity check script
joaopgrassi Sep 10, 2024
ca3f9ce
Merge branch 'main' into feat/semconv-migrate-to-weaver
joaopgrassi Sep 11, 2024
de0f818
Merge branch 'main' into feat/semconv-migrate-to-weaver
Kielek Sep 11, 2024
ccb8a78
PR suggestions
joaopgrassi Sep 12, 2024
19c6677
Add nullablity
joaopgrassi Sep 12, 2024
bc94569
Avoid error when deleting non-existing folder in ps script
joaopgrassi Sep 12, 2024
016ea1f
Add workflow checks for semconv
joaopgrassi Sep 12, 2024
bbd9537
Fix checks
joaopgrassi Sep 12, 2024
a70db47
CI attemp 1
joaopgrassi Sep 12, 2024
5cfdd66
CI attemp 2
joaopgrassi Sep 12, 2024
c91243a
Merge branch 'main' into feat/semconv-migrate-to-weaver
Kielek Sep 13, 2024
4e81c53
Remove checks for now
joaopgrassi Sep 13, 2024
b9c8e3f
Add nullable to template
joaopgrassi Sep 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build/scripts/sanitycheck.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
LF = b'\n'

# Add paths to exclude from sanity checks here
# Mostly used for auto-generated code
exclude_folders = [
"src/OpenTelemetry.SemanticConventions/Attributes"
]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#nullable enable
1,679 changes: 868 additions & 811 deletions src/OpenTelemetry.SemanticConventions/.publicApi/PublicAPI.Unshipped.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

// <auto-generated>This file has been auto generated from scripts/templates/SemanticConventionsAttributes.cs.j2</auto-generated>
// <auto-generated>This file has been auto generated from 'src\OpenTelemetry.SemanticConventions\scripts\templates\registry\SemanticConventionsAttributes.cs.j2' </auto-generated>

#pragma warning disable CS1570 // XML comment has badly formed XML
#nullable enable

using System;
#pragma warning disable CS1570 // XML comment has badly formed XML

namespace OpenTelemetry.SemanticConventions;

Expand All @@ -15,35 +15,35 @@ namespace OpenTelemetry.SemanticConventions;
public static class AndroidAttributes
{
/// <summary>
/// Uniquely identifies the framework API revision offered by a version (<c>os.version</c>) of the android operating system. More information can be found <a href="https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels">here</a>.
/// Uniquely identifies the framework API revision offered by a version (<c>os.version</c>) of the android operating system. More information can be found <a href="https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels">here</a>
joaopgrassi marked this conversation as resolved.
Show resolved Hide resolved
/// </summary>
public const string AttributeAndroidOsApiLevel = "android.os.api_level";

/// <summary>
/// This attribute represents the state the application has transitioned into at the occurrence of the event.
/// Deprecated use the <c>device.app.lifecycle</c> event definition including <c>android.state</c> as a payload field instead
/// </summary>
/// <remarks>
/// The Android lifecycle states are defined in <a href="https://developer.android.com/guide/components/activities/activity-lifecycle#lc">Activity lifecycle callbacks</a>, and from which the <c>OS identifiers</c> are derived.
/// The Android lifecycle states are defined in <a href="https://developer.android.com/guide/components/activities/activity-lifecycle#lc">Activity lifecycle callbacks</a>, and from which the <c>OS identifiers</c> are derived
/// </remarks>
public const string AttributeAndroidState = "android.state";

/// <summary>
/// This attribute represents the state the application has transitioned into at the occurrence of the event.
/// Deprecated use the <c>device.app.lifecycle</c> event definition including <c>android.state</c> as a payload field instead
/// </summary>
public static class AndroidStateValues
{
/// <summary>
/// Any time before Activity.onResume() or, if the app has no Activity, Context.startService() has been called in the app for the first time.
/// Any time before Activity.onResume() or, if the app has no Activity, Context.startService() has been called in the app for the first time
/// </summary>
public const string Created = "created";

/// <summary>
/// Any time after Activity.onPause() or, if the app has no Activity, Context.stopService() has been called when the app was in the foreground state.
/// Any time after Activity.onPause() or, if the app has no Activity, Context.stopService() has been called when the app was in the foreground state
/// </summary>
public const string Background = "background";

/// <summary>
/// Any time after Activity.onResume() or, if the app has no Activity, Context.startService() has been called when the app was in either the created or background states.
/// Any time after Activity.onResume() or, if the app has no Activity, Context.startService() has been called when the app was in either the created or background states
/// </summary>
public const string Foreground = "foreground";
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

// <auto-generated>This file has been auto generated from scripts/templates/SemanticConventionsAttributes.cs.j2</auto-generated>
// <auto-generated>This file has been auto generated from 'src\OpenTelemetry.SemanticConventions\scripts\templates\registry\SemanticConventionsAttributes.cs.j2' </auto-generated>

#pragma warning disable CS1570 // XML comment has badly formed XML
#nullable enable

using System;
#pragma warning disable CS1570 // XML comment has badly formed XML

namespace OpenTelemetry.SemanticConventions;

Expand All @@ -15,104 +15,104 @@ namespace OpenTelemetry.SemanticConventions;
public static class AspnetcoreAttributes
{
/// <summary>
/// ASP.NET Core exception middleware handling result.
/// ASP.NET Core exception middleware handling result
/// </summary>
public const string AttributeAspnetcoreDiagnosticsExceptionResult = "aspnetcore.diagnostics.exception.result";

/// <summary>
/// Full type name of the <a href="https://learn.microsoft.com/dotnet/api/microsoft.aspnetcore.diagnostics.iexceptionhandler"><c>IExceptionHandler</c></a> implementation that handled the exception.
/// Full type name of the <a href="https://learn.microsoft.com/dotnet/api/microsoft.aspnetcore.diagnostics.iexceptionhandler"><c>IExceptionHandler</c></a> implementation that handled the exception
/// </summary>
public const string AttributeAspnetcoreDiagnosticsHandlerType = "aspnetcore.diagnostics.handler.type";

/// <summary>
/// Rate limiting policy name.
/// Rate limiting policy name
/// </summary>
public const string AttributeAspnetcoreRateLimitingPolicy = "aspnetcore.rate_limiting.policy";

/// <summary>
/// Rate-limiting result, shows whether the lease was acquired or contains a rejection reason.
/// Rate-limiting result, shows whether the lease was acquired or contains a rejection reason
/// </summary>
public const string AttributeAspnetcoreRateLimitingResult = "aspnetcore.rate_limiting.result";

/// <summary>
/// Flag indicating if request was handled by the application pipeline.
/// Flag indicating if request was handled by the application pipeline
/// </summary>
public const string AttributeAspnetcoreRequestIsUnhandled = "aspnetcore.request.is_unhandled";

/// <summary>
/// A value that indicates whether the matched route is a fallback route.
/// A value that indicates whether the matched route is a fallback route
/// </summary>
public const string AttributeAspnetcoreRoutingIsFallback = "aspnetcore.routing.is_fallback";

/// <summary>
/// Match result - success or failure.
/// Match result - success or failure
/// </summary>
public const string AttributeAspnetcoreRoutingMatchStatus = "aspnetcore.routing.match_status";

/// <summary>
/// ASP.NET Core exception middleware handling result.
/// ASP.NET Core exception middleware handling result
/// </summary>
public static class AspnetcoreDiagnosticsExceptionResultValues
{
/// <summary>
/// Exception was handled by the exception handling middleware.
/// Exception was handled by the exception handling middleware
/// </summary>
public const string Handled = "handled";

/// <summary>
/// Exception was not handled by the exception handling middleware.
/// Exception was not handled by the exception handling middleware
/// </summary>
public const string Unhandled = "unhandled";

/// <summary>
/// Exception handling was skipped because the response had started.
/// Exception handling was skipped because the response had started
/// </summary>
public const string Skipped = "skipped";

/// <summary>
/// Exception handling didn't run because the request was aborted.
/// Exception handling didn't run because the request was aborted
/// </summary>
public const string Aborted = "aborted";
}

/// <summary>
/// Rate-limiting result, shows whether the lease was acquired or contains a rejection reason.
/// Rate-limiting result, shows whether the lease was acquired or contains a rejection reason
/// </summary>
public static class AspnetcoreRateLimitingResultValues
{
/// <summary>
/// Lease was acquired.
/// Lease was acquired
/// </summary>
public const string Acquired = "acquired";

/// <summary>
/// Lease request was rejected by the endpoint limiter.
/// Lease request was rejected by the endpoint limiter
/// </summary>
public const string EndpointLimiter = "endpoint_limiter";

/// <summary>
/// Lease request was rejected by the global limiter.
/// Lease request was rejected by the global limiter
/// </summary>
public const string GlobalLimiter = "global_limiter";

/// <summary>
/// Lease request was canceled.
/// Lease request was canceled
/// </summary>
public const string RequestCanceled = "request_canceled";
}

/// <summary>
/// Match result - success or failure.
/// Match result - success or failure
/// </summary>
public static class AspnetcoreRoutingMatchStatusValues
{
/// <summary>
/// Match succeeded.
/// Match succeeded
/// </summary>
public const string Success = "success";

/// <summary>
/// Match failed.
/// Match failed
/// </summary>
public const string Failure = "failure";
}
Expand Down
Loading
Loading