Skip to content

Commit 6d87bd6

Browse files
authored
[SEMANTIC CONVENTIONS] Upgrade to weaver 0.11.0 (#3194)
1 parent 762b73d commit 6d87bd6

File tree

10 files changed

+19
-24
lines changed

10 files changed

+19
-24
lines changed

api/include/opentelemetry/semconv/error_attributes.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ namespace error
3636
* <p>
3737
* If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
3838
* @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
39-
* status codes), it's RECOMMENDED to: <p> <ul> <li>Use a domain-specific attribute</li> <li>Set
40-
* @code error.type @endcode to capture all errors, regardless of whether they are defined within
41-
* the domain-specific set or not.</li>
39+
* status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
40+
* error.type @endcode to capture all errors, regardless of whether they are defined within the
41+
* domain-specific set or not.</li>
4242
* </ul>
4343
*/
4444
static constexpr const char *kErrorType = "error.type";

api/include/opentelemetry/semconv/incubating/aws_attributes.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ static constexpr const char *kAwsS3Bucket = "aws.s3.bucket";
247247
* The @code copy_source @endcode attribute applies to S3 copy operations and corresponds to the
248248
* @code --copy-source @endcode parameter of the <a
249249
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object
250-
* operation within the S3 API</a>. This applies in particular to the following operations: <p> <ul>
250+
* operation within the S3 API</a>. This applies in particular to the following operations: <ul>
251251
* <li><a
252252
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
253253
* <li><a
@@ -273,7 +273,7 @@ static constexpr const char *kAwsS3Delete = "aws.s3.delete";
273273
* <a href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a>
274274
* operations. <p> The @code key @endcode attribute is applicable to all object-related S3
275275
* operations, i.e. that require the object key as a mandatory parameter. This applies in particular
276-
* to the following operations: <p> <ul> <li><a
276+
* to the following operations: <ul> <li><a
277277
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
278278
* <li><a
279279
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a></li>
@@ -323,7 +323,7 @@ static constexpr const char *kAwsS3PartNumber = "aws.s3.part_number";
323323
* The @code upload_id @endcode attribute applies to S3 multipart-upload operations and corresponds
324324
* to the @code --upload-id @endcode parameter of the <a
325325
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> multipart
326-
* operations. This applies in particular to the following operations: <p> <ul> <li><a
326+
* operations. This applies in particular to the following operations: <ul> <li><a
327327
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html">abort-multipart-upload</a></li>
328328
* <li><a
329329
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html">complete-multipart-upload</a></li>

api/include/opentelemetry/semconv/incubating/cloud_attributes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static constexpr const char *kCloudRegion = "cloud.region";
6565
* startup, so it may be necessary to set @code cloud.resource_id @endcode as a span attribute
6666
* instead. <p> The exact value to use for @code cloud.resource_id @endcode depends on the cloud
6767
* provider. The following well-known definitions MUST be used if you set this attribute and they
68-
* apply: <p> <ul> <li><strong>AWS Lambda:</strong> The function <a
68+
* apply: <ul> <li><strong>AWS Lambda:</strong> The function <a
6969
* href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a>. Take
7070
* care not to use the "invoked ARN" directly but replace any <a
7171
* href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html">alias suffix</a>

api/include/opentelemetry/semconv/incubating/deployment_attributes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static constexpr const char *kDeploymentEnvironment = "deployment.environment";
3434
* @code deployment.environment.name @endcode does not affect the uniqueness constraints defined
3535
* through the @code service.namespace @endcode, @code service.name @endcode and @code
3636
* service.instance.id @endcode resource attributes. This implies that resources carrying the
37-
* following attribute combinations MUST be considered to be identifying the same service: <p> <ul>
37+
* following attribute combinations MUST be considered to be identifying the same service: <ul>
3838
* <li>@code service.name=frontend @endcode, @code deployment.environment.name=production
3939
* @endcode</li> <li>@code service.name=frontend @endcode, @code deployment.environment.name=staging
4040
* @endcode.</li>

api/include/opentelemetry/semconv/incubating/error_attributes.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ namespace error
3636
* <p>
3737
* If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
3838
* @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
39-
* status codes), it's RECOMMENDED to: <p> <ul> <li>Use a domain-specific attribute</li> <li>Set
40-
* @code error.type @endcode to capture all errors, regardless of whether they are defined within
41-
* the domain-specific set or not.</li>
39+
* status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
40+
* error.type @endcode to capture all errors, regardless of whether they are defined within the
41+
* domain-specific set or not.</li>
4242
* </ul>
4343
*/
4444
static constexpr const char *kErrorType = "error.type";

api/include/opentelemetry/semconv/incubating/faas_attributes.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ static constexpr const char *kFaasDocumentTime = "faas.document.time";
5858

5959
/**
6060
* The execution environment ID as a string, that will be potentially reused for other invocations
61-
* to the same function/function version. <p> <ul> <li><strong>AWS Lambda:</strong> Use the (full)
62-
* log stream name.</li>
61+
* to the same function/function version. <ul> <li><strong>AWS Lambda:</strong> Use the (full) log
62+
* stream name.</li>
6363
* </ul>
6464
*/
6565
static constexpr const char *kFaasInstance = "faas.instance";
@@ -109,7 +109,7 @@ static constexpr const char *kFaasMaxMemory = "faas.max_memory";
109109
* <a href="/docs/general/attributes.md#source-code-attributes">@code code.namespace @endcode/@code
110110
* code.function @endcode</a> span attributes). <p> For some cloud providers, the above definition
111111
* is ambiguous. The following definition of function name MUST be used for this attribute (and
112-
* consequently the span name) for the listed cloud providers/products: <p> <ul>
112+
* consequently the span name) for the listed cloud providers/products: <ul>
113113
* <li><strong>Azure:</strong> The full name @code <FUNCAPP>/<FUNC> @endcode, i.e., function app
114114
* name followed by a forward slash followed by the function name (this form can also be seen in the
115115
* resource JSON for the function). This means that a span attribute MUST be used, as an Azure
@@ -135,7 +135,6 @@ static constexpr const char *kFaasTrigger = "faas.trigger";
135135
* The immutable version of the function being executed.
136136
* <p>
137137
* Depending on the cloud provider and platform, use:
138-
* <p>
139138
* <ul>
140139
* <li><strong>AWS Lambda:</strong> The <a
141140
* href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-versions.html">function

api/include/opentelemetry/semconv/incubating/system_metrics.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDouble
263263
* Time disk spent activated
264264
* <p>
265265
* The real elapsed time ("wall clock") used in the I/O path (time from operations running in
266-
* parallel are not counted). Measured as: <p> <ul> <li>Linux: Field 13 from <a
266+
* parallel are not counted). Measured as: <ul> <li>Linux: Field 13 from <a
267267
* href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
268268
* <li>Windows: The complement of
269269
* <a
@@ -380,7 +380,7 @@ CreateAsyncDoubleMetricSystemDiskMerged(metrics::Meter *meter)
380380
* Sum of the time each operation took to complete
381381
* <p>
382382
* Because it is the sum of time each request took, parallel-issued requests each contribute to make
383-
* the count grow. Measured as: <p> <ul> <li>Linux: Fields 7 & 11 from <a
383+
* the count grow. Measured as: <ul> <li>Linux: Fields 7 & 11 from <a
384384
* href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
385385
* <li>Windows: "Avg. Disk sec/Read" perf counter multiplied by "Disk Reads/sec" perf counter
386386
* (similar for Writes)</li>
@@ -888,7 +888,6 @@ CreateAsyncDoubleMetricSystemNetworkConnections(metrics::Meter *meter)
888888
* Count of packets that are dropped or discarded even though there was no error
889889
* <p>
890890
* Measured as:
891-
* <p>
892891
* <ul>
893892
* <li>Linux: the @code drop @endcode column in @code /proc/dev/net @endcode (<a
894893
* href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>)</li>
@@ -937,7 +936,6 @@ CreateAsyncDoubleMetricSystemNetworkDropped(metrics::Meter *meter)
937936
* Count of network errors detected
938937
* <p>
939938
* Measured as:
940-
* <p>
941939
* <ul>
942940
* <li>Linux: the @code errs @endcode column in @code /proc/dev/net @endcode (<a
943941
* href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>).</li>

api/include/opentelemetry/semconv/incubating/url_attributes.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ static constexpr const char *kUrlFragment = "url.fragment";
5959
*
6060
* Query string values for the following keys SHOULD be redacted by default and replaced by the
6161
* value @code REDACTED @endcode:
62-
* <p>
6362
* <ul>
6463
* <li><a
6564
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
@@ -110,7 +109,7 @@ static constexpr const char *kUrlPort = "url.port";
110109
* can identify it. <p>
111110
*
112111
* Query string values for the following keys SHOULD be redacted by default and replaced by the
113-
* value @code REDACTED @endcode: <p> <ul> <li><a
112+
* value @code REDACTED @endcode: <ul> <li><a
114113
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
115114
* AWSAccessKeyId @endcode</a></li> <li><a
116115
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code

api/include/opentelemetry/semconv/url_attributes.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ static constexpr const char *kUrlFragment = "url.fragment";
3939
*
4040
* Query string values for the following keys SHOULD be redacted by default and replaced by the
4141
* value @code REDACTED @endcode:
42-
* <p>
4342
* <ul>
4443
* <li><a
4544
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
@@ -73,7 +72,7 @@ static constexpr const char *kUrlPath = "url.path";
7372
* can identify it. <p>
7473
*
7574
* Query string values for the following keys SHOULD be redacted by default and replaced by the
76-
* value @code REDACTED @endcode: <p> <ul> <li><a
75+
* value @code REDACTED @endcode: <ul> <li><a
7776
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
7877
* AWSAccessKeyId @endcode</a></li> <li><a
7978
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code

buildscripts/semantic-convention/generate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ROOT_DIR="${SCRIPT_DIR}/../../"
1919
SEMCONV_VERSION=1.29.0
2020

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

2424
SEMCONV_VERSION_TAG=v$SEMCONV_VERSION
2525
WEAVER_VERSION_TAG=v$WEAVER_VERSION

0 commit comments

Comments
 (0)