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

[SEMANTIC CONVENTIONS] Upgrade to weaver 0.11.0 #3194

Merged
merged 2 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions api/include/opentelemetry/semconv/error_attributes.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ namespace error
* <p>
* If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
* @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
* status codes), it's RECOMMENDED to: <p> <ul> <li>Use a domain-specific attribute</li> <li>Set
* @code error.type @endcode to capture all errors, regardless of whether they are defined within
* the domain-specific set or not.</li>
* status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
* error.type @endcode to capture all errors, regardless of whether they are defined within the
* domain-specific set or not.</li>
* </ul>
*/
static constexpr const char *kErrorType = "error.type";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ static constexpr const char *kAwsS3Bucket = "aws.s3.bucket";
* The @code copy_source @endcode attribute applies to S3 copy operations and corresponds to the
* @code --copy-source @endcode parameter of the <a
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object
* operation within the S3 API</a>. This applies in particular to the following operations: <p> <ul>
* operation within the S3 API</a>. This applies in particular to the following operations: <ul>
* <li><a
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
* <li><a
Expand All @@ -273,7 +273,7 @@ static constexpr const char *kAwsS3Delete = "aws.s3.delete";
* <a href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a>
* operations. <p> The @code key @endcode attribute is applicable to all object-related S3
* operations, i.e. that require the object key as a mandatory parameter. This applies in particular
* to the following operations: <p> <ul> <li><a
* to the following operations: <ul> <li><a
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
* <li><a
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a></li>
Expand Down Expand Up @@ -323,7 +323,7 @@ static constexpr const char *kAwsS3PartNumber = "aws.s3.part_number";
* The @code upload_id @endcode attribute applies to S3 multipart-upload operations and corresponds
* to the @code --upload-id @endcode parameter of the <a
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> multipart
* operations. This applies in particular to the following operations: <p> <ul> <li><a
* operations. This applies in particular to the following operations: <ul> <li><a
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html">abort-multipart-upload</a></li>
* <li><a
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html">complete-multipart-upload</a></li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static constexpr const char *kCloudRegion = "cloud.region";
* startup, so it may be necessary to set @code cloud.resource_id @endcode as a span attribute
* instead. <p> The exact value to use for @code cloud.resource_id @endcode depends on the cloud
* provider. The following well-known definitions MUST be used if you set this attribute and they
* apply: <p> <ul> <li><strong>AWS Lambda:</strong> The function <a
* apply: <ul> <li><strong>AWS Lambda:</strong> The function <a
* href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a>. Take
* care not to use the "invoked ARN" directly but replace any <a
* href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html">alias suffix</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ static constexpr const char *kDeploymentEnvironment = "deployment.environment";
* @code deployment.environment.name @endcode does not affect the uniqueness constraints defined
* through the @code service.namespace @endcode, @code service.name @endcode and @code
* service.instance.id @endcode resource attributes. This implies that resources carrying the
* following attribute combinations MUST be considered to be identifying the same service: <p> <ul>
* following attribute combinations MUST be considered to be identifying the same service: <ul>
* <li>@code service.name=frontend @endcode, @code deployment.environment.name=production
* @endcode</li> <li>@code service.name=frontend @endcode, @code deployment.environment.name=staging
* @endcode.</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ namespace error
* <p>
* If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
* @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
* status codes), it's RECOMMENDED to: <p> <ul> <li>Use a domain-specific attribute</li> <li>Set
* @code error.type @endcode to capture all errors, regardless of whether they are defined within
* the domain-specific set or not.</li>
* status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
* error.type @endcode to capture all errors, regardless of whether they are defined within the
* domain-specific set or not.</li>
* </ul>
*/
static constexpr const char *kErrorType = "error.type";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ static constexpr const char *kFaasDocumentTime = "faas.document.time";

/**
* The execution environment ID as a string, that will be potentially reused for other invocations
* to the same function/function version. <p> <ul> <li><strong>AWS Lambda:</strong> Use the (full)
* log stream name.</li>
* to the same function/function version. <ul> <li><strong>AWS Lambda:</strong> Use the (full) log
* stream name.</li>
* </ul>
*/
static constexpr const char *kFaasInstance = "faas.instance";
Expand Down Expand Up @@ -109,7 +109,7 @@ static constexpr const char *kFaasMaxMemory = "faas.max_memory";
* <a href="/docs/general/attributes.md#source-code-attributes">@code code.namespace @endcode/@code
* code.function @endcode</a> span attributes). <p> For some cloud providers, the above definition
* is ambiguous. The following definition of function name MUST be used for this attribute (and
* consequently the span name) for the listed cloud providers/products: <p> <ul>
* consequently the span name) for the listed cloud providers/products: <ul>
* <li><strong>Azure:</strong> The full name @code <FUNCAPP>/<FUNC> @endcode, i.e., function app
* name followed by a forward slash followed by the function name (this form can also be seen in the
* resource JSON for the function). This means that a span attribute MUST be used, as an Azure
Expand All @@ -135,7 +135,6 @@ static constexpr const char *kFaasTrigger = "faas.trigger";
* The immutable version of the function being executed.
* <p>
* Depending on the cloud provider and platform, use:
* <p>
* <ul>
* <li><strong>AWS Lambda:</strong> The <a
* href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-versions.html">function
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDouble
* Time disk spent activated
* <p>
* The real elapsed time ("wall clock") used in the I/O path (time from operations running in
* parallel are not counted). Measured as: <p> <ul> <li>Linux: Field 13 from <a
* parallel are not counted). Measured as: <ul> <li>Linux: Field 13 from <a
* href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
* <li>Windows: The complement of
* <a
Expand Down Expand Up @@ -380,7 +380,7 @@ CreateAsyncDoubleMetricSystemDiskMerged(metrics::Meter *meter)
* Sum of the time each operation took to complete
* <p>
* Because it is the sum of time each request took, parallel-issued requests each contribute to make
* the count grow. Measured as: <p> <ul> <li>Linux: Fields 7 & 11 from <a
* the count grow. Measured as: <ul> <li>Linux: Fields 7 & 11 from <a
* href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
* <li>Windows: "Avg. Disk sec/Read" perf counter multiplied by "Disk Reads/sec" perf counter
* (similar for Writes)</li>
Expand Down Expand Up @@ -888,7 +888,6 @@ CreateAsyncDoubleMetricSystemNetworkConnections(metrics::Meter *meter)
* Count of packets that are dropped or discarded even though there was no error
* <p>
* Measured as:
* <p>
* <ul>
* <li>Linux: the @code drop @endcode column in @code /proc/dev/net @endcode (<a
* href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>)</li>
Expand Down Expand Up @@ -937,7 +936,6 @@ CreateAsyncDoubleMetricSystemNetworkDropped(metrics::Meter *meter)
* Count of network errors detected
* <p>
* Measured as:
* <p>
* <ul>
* <li>Linux: the @code errs @endcode column in @code /proc/dev/net @endcode (<a
* href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>).</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ static constexpr const char *kUrlFragment = "url.fragment";
*
* Query string values for the following keys SHOULD be redacted by default and replaced by the
* value @code REDACTED @endcode:
* <p>
* <ul>
* <li><a
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
Expand Down Expand Up @@ -110,7 +109,7 @@ static constexpr const char *kUrlPort = "url.port";
* can identify it. <p>
*
* Query string values for the following keys SHOULD be redacted by default and replaced by the
* value @code REDACTED @endcode: <p> <ul> <li><a
* value @code REDACTED @endcode: <ul> <li><a
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
* AWSAccessKeyId @endcode</a></li> <li><a
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
Expand Down
3 changes: 1 addition & 2 deletions api/include/opentelemetry/semconv/url_attributes.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ static constexpr const char *kUrlFragment = "url.fragment";
*
* Query string values for the following keys SHOULD be redacted by default and replaced by the
* value @code REDACTED @endcode:
* <p>
* <ul>
* <li><a
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
Expand Down Expand Up @@ -73,7 +72,7 @@ static constexpr const char *kUrlPath = "url.path";
* can identify it. <p>
*
* Query string values for the following keys SHOULD be redacted by default and replaced by the
* value @code REDACTED @endcode: <p> <ul> <li><a
* value @code REDACTED @endcode: <ul> <li><a
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
* AWSAccessKeyId @endcode</a></li> <li><a
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/semantic-convention/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ROOT_DIR="${SCRIPT_DIR}/../../"
SEMCONV_VERSION=1.29.0

# repository: https://github.com/open-telemetry/weaver
WEAVER_VERSION=0.10.0
WEAVER_VERSION=0.11.0

SEMCONV_VERSION_TAG=v$SEMCONV_VERSION
WEAVER_VERSION_TAG=v$WEAVER_VERSION
Expand Down
Loading