Skip to content

Commit b836bbc

Browse files
joaopgrassijoaopgrassi
authored
Merge branch 'main' into messaging-span-kinds
2 parents cf17a35 + f14f54c commit b836bbc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+647
-204
lines changed

‎.chloggen/2921.yaml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Use this changelog template to create an entry for release notes.
2+
#
3+
# If your change doesn't affect end users you should instead start
4+
# your pull request title with [chore] or use the "Skip Changelog" label.
5+
6+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
7+
change_type: enhancement
8+
9+
# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
10+
component: other
11+
12+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
13+
note: Update resource to include stability in the YAML file
14+
15+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
16+
# The values here must be integers.
17+
issues: [1399]
18+
19+
# (Optional) One or more lines of additional information to render under the primary note.
20+
# These lines will be padded with 2 spaces and then inserted directly into the document.
21+
# Use pipe (|) for multiline entries.
22+
subtext: |
23+
Makes the following changes:
24+
25+
- Require `name` on resource groups.
26+
- Enforce backwards compatibility stability requirements on resource groups.
27+
- Rename `telemetry` to `telemetry.sdk`, attributes are unchanged.
28+
- Mark `telemetry.sdk` and `resource` as stable in YAML model.
29+
- Markdown templates for resource groups NOW includes header describing
30+
the reosurce `type`, `stability` and `description`.

‎.chloggen/add_filesystem_limit.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Use this changelog template to create an entry for release notes.
2+
#
3+
# If your change doesn't affect end users you should instead start
4+
# your pull request title with [chore] or use the "Skip Changelog" label.
5+
6+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
7+
change_type: 'enhancement'
8+
9+
# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
10+
component: system
11+
12+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
13+
note: Add the `system.filesystem.limit` metric
14+
15+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
16+
# The values here must be integers.
17+
issues: [127]
18+
19+
# (Optional) One or more lines of additional information to render under the primary note.
20+
# These lines will be padded with 2 spaces and then inserted directly into the document.
21+
# Use pipe (|) for multiline entries.
22+
subtext:

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,4 +251,4 @@ test-policies:
251251
.PHONY: compatibility-check
252252
compatibility-check:
253253
docker run --rm -v $(PWD)/model:/source -v $(PWD)/docs:/spec --pull=always \
254-
$(SEMCONVGEN_CONTAINER) -f /source compatibility --previous-version $(LATEST_RELEASED_SEMCONV_VERSION)
254+
$(SEMCONVGEN_CONTAINER) --continue-on-validation-errors -f /source compatibility --previous-version $(LATEST_RELEASED_SEMCONV_VERSION)

‎docs/resource/README.md

+30-26
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,20 @@ as specified in the [Resource SDK specification](https://github.com/open-telemet
7373

7474
## Service
7575

76-
**Status**: [Stable][DocumentStatus]
77-
78-
**type:** `service`
79-
80-
**Description:** A service instance.
81-
8276
<!-- semconv service -->
8377
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
8478
<!-- see templates/registry/markdown/snippet.md.j2 -->
8579
<!-- prettier-ignore-start -->
8680
<!-- markdownlint-capture -->
8781
<!-- markdownlint-disable -->
8882

83+
84+
**Status:** ![Stable](https://img.shields.io/badge/-stable-lightgreen)
85+
86+
**type:** `service`
87+
88+
**Description:** A service instance.
89+
8990
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
9091
|---|---|---|---|---|---|
9192
| [`service.name`](/docs/attributes-registry/service.md) | string | Logical name of the service. [1] | `shoppingcart` | `Required` | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
@@ -103,19 +104,20 @@ as specified in the [Resource SDK specification](https://github.com/open-telemet
103104

104105
## Service (Experimental)
105106

106-
**Status**: [Experimental][DocumentStatus]
107-
108-
**type:** `service`
109-
110-
**Description:** Additions to service instance.
111-
112107
<!-- semconv service_experimental -->
113108
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
114109
<!-- see templates/registry/markdown/snippet.md.j2 -->
115110
<!-- prettier-ignore-start -->
116111
<!-- markdownlint-capture -->
117112
<!-- markdownlint-disable -->
118113

114+
115+
**Status:** ![Experimental](https://img.shields.io/badge/-experimental-blue)
116+
117+
**type:** `service`
118+
119+
**Description:** A service instance.
120+
119121
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
120122
|---|---|---|---|---|---|
121123
| [`service.instance.id`](/docs/attributes-registry/service.md) | string | The string ID of the service instance. [1] | `627cc493-f310-47de-96bd-71410b7dec09` | `Recommended` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
@@ -174,19 +176,20 @@ service.name = Shop.shoppingcart
174176

175177
## Telemetry SDK
176178

177-
**Status**: [Stable][DocumentStatus]
178-
179-
**type:** `telemetry.sdk`
180-
181-
**Description:** The telemetry SDK used to capture data recorded by the instrumentation libraries.
182-
183-
<!-- semconv telemetry -->
179+
<!-- semconv telemetry.sdk -->
184180
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
185181
<!-- see templates/registry/markdown/snippet.md.j2 -->
186182
<!-- prettier-ignore-start -->
187183
<!-- markdownlint-capture -->
188184
<!-- markdownlint-disable -->
189185

186+
187+
**Status:** ![Stable](https://img.shields.io/badge/-stable-lightgreen)
188+
189+
**type:** `telemetry.sdk`
190+
191+
**Description:** The telemetry SDK used to capture data recorded by the instrumentation libraries.
192+
190193
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
191194
|---|---|---|---|---|---|
192195
| [`telemetry.sdk.language`](/docs/attributes-registry/telemetry.md) | string | The language of the telemetry SDK. | `cpp`; `dotnet`; `erlang` | `Required` | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
@@ -228,19 +231,20 @@ All custom identifiers SHOULD be stable across different versions of an implemen
228231

229232
## Telemetry Distribution (Experimental)
230233

231-
**Status**: [Experimental][DocumentStatus]
232-
233-
**type:** `telemetry.distro`
234-
235-
**Description:** The telemetry distribution (distro) used to capture data recorded by the instrumentation libraries.
236-
237-
<!-- semconv telemetry_experimental -->
234+
<!-- semconv telemetry.sdk_experimental -->
238235
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
239236
<!-- see templates/registry/markdown/snippet.md.j2 -->
240237
<!-- prettier-ignore-start -->
241238
<!-- markdownlint-capture -->
242239
<!-- markdownlint-disable -->
243240

241+
242+
**Status:** ![Experimental](https://img.shields.io/badge/-experimental-blue)
243+
244+
**type:** `telemetry.sdk`
245+
246+
**Description:** The telemetry SDK used to capture data recorded by the instrumentation libraries.
247+
244248
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
245249
|---|---|---|---|---|---|
246250
| [`telemetry.distro.name`](/docs/attributes-registry/telemetry.md) | string | The name of the auto instrumentation agent or distribution, if used. [1] | `parts-unlimited-java` | `Recommended` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |

‎docs/resource/android.md

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
# Android
22

3-
**Status**: [Experimental][DocumentStatus]
4-
5-
**type:** `android`
6-
7-
**Description**: The Android platform on which the Android application is running.
8-
93
<!-- semconv android -->
104
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
115
<!-- see templates/registry/markdown/snippet.md.j2 -->
126
<!-- prettier-ignore-start -->
137
<!-- markdownlint-capture -->
148
<!-- markdownlint-disable -->
159

10+
11+
**Status:** ![Experimental](https://img.shields.io/badge/-experimental-blue)
12+
13+
**type:** `android`
14+
15+
**Description:** The Android platform on which the Android application is running.
16+
1617
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
1718
|---|---|---|---|---|---|
1819
| [`android.os.api_level`](/docs/attributes-registry/android.md) | string | Uniquely identifies the framework API revision offered by a version (`os.version`) of the android operating system. More information can be found [here](https://developer.android.com/guide/topics/manifest/uses-sdk-element#ApiLevels). | `33`; `32` | `Recommended` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
@@ -22,5 +23,3 @@
2223
<!-- prettier-ignore-end -->
2324
<!-- END AUTOGENERATED TEXT -->
2425
<!-- endsemconv -->
25-
26-
[DocumentStatus]: https://opentelemetry.io/docs/specs/otel/document-status

‎docs/resource/browser.md

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
# Browser
22

3-
**Status**: [Experimental][DocumentStatus]
4-
5-
**type:** `browser`
6-
7-
**Description**: The web browser in which the application represented by the resource is running. The `browser.*` attributes MUST be used only for resources that represent applications running in a web browser (regardless of whether running on a mobile or desktop device).
8-
9-
All of these attributes can be provided by the user agent itself in the form of an HTTP header (e.g. Sec-CH-UA, Sec-CH-Platform, User-Agent). However, the headers could be removed by proxy servers, and are tied to calls from individual clients. In order to support batching through services like the Collector and to prevent loss of data (e.g. due to proxy servers removing headers), these attributes should be used when possible.
10-
113
<!-- semconv browser -->
124
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
135
<!-- see templates/registry/markdown/snippet.md.j2 -->
146
<!-- prettier-ignore-start -->
157
<!-- markdownlint-capture -->
168
<!-- markdownlint-disable -->
179

10+
11+
**Status:** ![Experimental](https://img.shields.io/badge/-experimental-blue)
12+
13+
**type:** `browser`
14+
15+
**Description:** The web browser in which the application represented by the resource is running. The `browser.*` attributes MUST be used only for resources that represent applications running in a web browser (regardless of whether running on a mobile or desktop device).
16+
1817
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
1918
|---|---|---|---|---|---|
2019
| [`browser.brands`](/docs/attributes-registry/browser.md) | string[] | Array of brand name and version separated by a space [1] | `[" Not A;Brand 99", "Chromium 99", "Chrome 99"]` | `Recommended` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
@@ -42,4 +41,4 @@ The list of possible values is defined in the [W3C User-Agent Client Hints speci
4241
<!-- END AUTOGENERATED TEXT -->
4342
<!-- endsemconv -->
4443

45-
[DocumentStatus]: https://opentelemetry.io/docs/specs/otel/document-status
44+
All of these attributes can be provided by the user agent itself in the form of an HTTP header (e.g. Sec-CH-UA, Sec-CH-Platform, User-Agent). However, the headers could be removed by proxy servers, and are tied to calls from individual clients. In order to support batching through services like the Collector and to prevent loss of data (e.g. due to proxy servers removing headers), these attributes should be used when possible.

‎docs/resource/cloud-provider/aws/ecs.md

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
# AWS ECS
22

3-
**Status**: [Experimental][DocumentStatus]
4-
5-
**type:** `aws.ecs`
6-
7-
**Description:** Resources used by AWS Elastic Container Service (ECS).
8-
93
<!-- semconv aws.ecs -->
104
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
115
<!-- see templates/registry/markdown/snippet.md.j2 -->
126
<!-- prettier-ignore-start -->
137
<!-- markdownlint-capture -->
148
<!-- markdownlint-disable -->
159

10+
11+
**Status:** ![Experimental](https://img.shields.io/badge/-experimental-blue)
12+
13+
**type:** `aws.ecs`
14+
15+
**Description:** Resources used by AWS Elastic Container Service (ECS).
16+
1617
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
1718
|---|---|---|---|---|---|
1819
| [`aws.ecs.task.id`](/docs/attributes-registry/aws.md) | string | The ID of a running ECS task. The ID MUST be extracted from `task.arn`. | `10838bed-421f-43ef-870a-f43feacbbb5b`; `23ebb8ac-c18f-46c6-8bbe-d55d0e37cfbd` | `Conditionally Required` If and only if `task.arn` is populated. | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
@@ -36,5 +37,3 @@
3637
<!-- prettier-ignore-end -->
3738
<!-- END AUTOGENERATED TEXT -->
3839
<!-- endsemconv -->
39-
40-
[DocumentStatus]: https://opentelemetry.io/docs/specs/otel/document-status

‎docs/resource/cloud-provider/aws/eks.md

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
# AWS EKS
22

3-
**Status**: [Experimental][DocumentStatus]
4-
5-
**type:** `aws.eks`
6-
7-
**Description:** Resources used by AWS Elastic Kubernetes Service (EKS).
8-
93
<!-- semconv aws.eks -->
104
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
115
<!-- see templates/registry/markdown/snippet.md.j2 -->
126
<!-- prettier-ignore-start -->
137
<!-- markdownlint-capture -->
148
<!-- markdownlint-disable -->
159

10+
11+
**Status:** ![Experimental](https://img.shields.io/badge/-experimental-blue)
12+
13+
**type:** `aws.eks`
14+
15+
**Description:** Resources used by AWS Elastic Kubernetes Service (EKS).
16+
1617
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
1718
|---|---|---|---|---|---|
1819
| [`aws.eks.cluster.arn`](/docs/attributes-registry/aws.md) | string | The ARN of an EKS cluster. | `arn:aws:ecs:us-west-2:123456789123:cluster/my-cluster` | `Recommended` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
@@ -22,5 +23,3 @@
2223
<!-- prettier-ignore-end -->
2324
<!-- END AUTOGENERATED TEXT -->
2425
<!-- endsemconv -->
25-
26-
[DocumentStatus]: https://opentelemetry.io/docs/specs/otel/document-status

‎docs/resource/cloud-provider/aws/logs.md

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
# AWS Logs
22

3-
**Status**: [Experimental][DocumentStatus]
4-
5-
**Type:** `aws.log`
6-
7-
**Description:** Log attributes for Amazon Web Services.
8-
93
<!-- semconv aws.log -->
104
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
115
<!-- see templates/registry/markdown/snippet.md.j2 -->
126
<!-- prettier-ignore-start -->
137
<!-- markdownlint-capture -->
148
<!-- markdownlint-disable -->
159

10+
11+
**Status:** ![Experimental](https://img.shields.io/badge/-experimental-blue)
12+
13+
**type:** `aws.log`
14+
15+
**Description:** Resources specific to Amazon Web Services.
16+
1617
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
1718
|---|---|---|---|---|---|
1819
| [`aws.log.group.arns`](/docs/attributes-registry/aws.md) | string[] | The Amazon Resource Name(s) (ARN) of the AWS log group(s). [1] | `["arn:aws:logs:us-west-1:123456789012:log-group:/aws/my/group:*"]` | `Recommended` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
@@ -33,5 +34,3 @@
3334
<!-- prettier-ignore-end -->
3435
<!-- END AUTOGENERATED TEXT -->
3536
<!-- endsemconv -->
36-
37-
[DocumentStatus]: https://opentelemetry.io/docs/specs/otel/document-status

‎docs/resource/cloud-provider/gcp/cloud-run.md

+7-4
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,20 @@
44

55
These conventions are recommended for resources running on Cloud Run.
66

7-
**Type:** `gcp.cloud_run`
8-
9-
**Description:** Resource attributes for Cloud Run.
10-
117
<!-- semconv gcp.cloud_run -->
128
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
139
<!-- see templates/registry/markdown/snippet.md.j2 -->
1410
<!-- prettier-ignore-start -->
1511
<!-- markdownlint-capture -->
1612
<!-- markdownlint-disable -->
1713

14+
15+
**Status:** ![Experimental](https://img.shields.io/badge/-experimental-blue)
16+
17+
**type:** `gcp.cloud_run`
18+
19+
**Description:** Resource used by Google Cloud Run.
20+
1821
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
1922
|---|---|---|---|---|---|
2023
| [`gcp.cloud_run.job.execution`](/docs/attributes-registry/gcp.md) | string | The name of the Cloud Run [execution](https://cloud.google.com/run/docs/managing/job-executions) being run for the Job, as set by the [`CLOUD_RUN_EXECUTION`](https://cloud.google.com/run/docs/container-contract#jobs-env-vars) environment variable. | `job-name-xxxx`; `sample-job-mdw84` | `Recommended` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |

‎docs/resource/cloud-provider/gcp/gce.md

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
# Google Compute Engine
22

3-
**Type:** `gcp.gce`
4-
5-
**Description:** Resource attributes for GCE instances.
6-
73
<!-- semconv gcp.gce -->
84
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
95
<!-- see templates/registry/markdown/snippet.md.j2 -->
106
<!-- prettier-ignore-start -->
117
<!-- markdownlint-capture -->
128
<!-- markdownlint-disable -->
139

10+
11+
**Status:** ![Experimental](https://img.shields.io/badge/-experimental-blue)
12+
13+
**type:** `gcp.gce`
14+
15+
**Description:** Resources used by Google Compute Engine (GCE).
16+
1417
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
1518
|---|---|---|---|---|---|
1619
| [`gcp.gce.instance.hostname`](/docs/attributes-registry/gcp.md) | string | The hostname of a GCE instance. This is the full value of the default or [custom hostname](https://cloud.google.com/compute/docs/instances/custom-hostname-vm). | `my-host1234.example.com`; `sample-vm.us-west1-b.c.my-project.internal` | `Recommended` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |

‎docs/resource/cloud-provider/heroku.md

+7
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@
1313
<!-- markdownlint-capture -->
1414
<!-- markdownlint-disable -->
1515

16+
17+
**Status:** ![Experimental](https://img.shields.io/badge/-experimental-blue)
18+
19+
**type:** `heroku`
20+
21+
**Description:** Heroku dyno metadata
22+
1623
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
1724
|---|---|---|---|---|---|
1825
| [`heroku.app.id`](/docs/attributes-registry/heroku.md) | string | Unique identifier for the application | `2daa2797-e42b-4624-9322-ec3f968df4da` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |

0 commit comments

Comments
 (0)