Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
f6178c6
[cicd] add initial cicd attributes to registry
adrielp May 25, 2024
5efab61
[chore] fix deprecation and rerun checks
adrielp May 25, 2024
c11986e
[chore] add changelog
adrielp May 25, 2024
2ac46ac
[chore] fix changelog issue numbers
adrielp May 25, 2024
f520284
[chore] run fixes
adrielp May 25, 2024
13fbba7
[chore] run issue template gen
adrielp May 25, 2024
46f1557
[chore] fix yaml linting
adrielp May 25, 2024
87d9dd6
[chore] fixing up structure a bit
adrielp May 27, 2024
3c4f8cd
[chore] fix yamllint errors
adrielp May 27, 2024
2ece673
[chore] adjust scm, deployment, and deprecated deployment based on fe…
adrielp Jun 1, 2024
2d557c6
[chore] add cicd, remove pipeline, update test
adrielp Jun 7, 2024
f82511d
[chore] multiple updates after feedback
adrielp Jun 17, 2024
0368268
[chore] fix missing stability after enum
adrielp Jun 17, 2024
311698c
[chore] fix local typo
adrielp Jun 17, 2024
fc914cf
[chore] remove incident from registry, will iterate through sep pr
adrielp Jun 17, 2024
563f071
Merge branch 'main' into cicd-reg-attr
Jun 18, 2024
ea7b402
[chore] make changes from workflows
adrielp Jun 21, 2024
b1ddced
Merge branch 'main' into cicd-reg-attr
Jun 21, 2024
8f3fce3
[chore] run issue template generation
Jun 21, 2024
793a1f4
[chore] make changes to test and deploy file based on pr feedback
adrielp Jun 26, 2024
1ea5c57
[chore] general updates and changes after suggestions
adrielp Jun 27, 2024
938537c
[chore] remove allow custom values and updates bacsed on suggestions
adrielp Jul 2, 2024
6c7b2c8
[chore] remove runner attributes from CICD for now, add url.full
adrielp Jul 4, 2024
25e8c4c
[chore] add in_progress to status attributes for suite and case runs
adrielp Jul 4, 2024
66b3bc5
Merge branch 'main' into cicd-reg-attr
Jul 8, 2024
8bbcd74
[chore] update hash value brief, separate artifact from build
adrielp Jul 9, 2024
7439ce8
[chore] migrate artifact to its own ns, include attestations to
adrielp Jul 10, 2024
d060aab
[chore] run make generate templates
adrielp Jul 10, 2024
c84b645
[chore] replace status for case with status for test
adrielp Jul 10, 2024
4699ded
Merge branch 'main' into cicd-reg-attr
Jul 10, 2024
e190234
[chore] yammlint
adrielp Jul 10, 2024
6135550
[chore] run make gen issue templates
adrielp Jul 10, 2024
488b516
[chore] revert commit of gsed in shell script
adrielp Jul 10, 2024
91b8cd7
[chore] add additional fully qualified test examples
adrielp Jul 11, 2024
b41c126
[chore] update components in changelog
adrielp Jul 11, 2024
2fcfa27
[chore] make adjustments to vcs, cicd, changlog, artifact based on fe…
adrielp Jul 15, 2024
c7bd599
[chore] fix line length after linting
adrielp Jul 15, 2024
03f73dd
Merge branch 'main' into cicd-reg-attr
Jul 15, 2024
70e75bc
[chore] run attribute registry generation
adrielp Jul 15, 2024
c6ec2c9
[chore] update artifact and test attribute per suggestions
adrielp Jul 16, 2024
b766d04
Merge branch 'main' into cicd-reg-attr
Jul 16, 2024
e7e2c2c
[chore] move artifact.name to artifact.filename per suggestions
adrielp Jul 16, 2024
d5a3a34
[chore] move commit.hash to revision and add additional information
adrielp Jul 16, 2024
82df8ba
[chore] upper case CICD in weaver
adrielp Jul 16, 2024
d75e796
[chore] adjust weaver yaml
adrielp Jul 16, 2024
93e7801
[chore] remove test run id attribute and fix title
adrielp Jul 16, 2024
6604910
[chore] add CICD codeowners
adrielp Jul 17, 2024
33452c6
[chore] more wording adjustments based on feedback
adrielp Jul 17, 2024
49755bd
Merge branch 'main' into cicd-reg-attr
Jul 18, 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
24 changes: 24 additions & 0 deletions .chloggen/cicd-reg-attr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Use this changelog template to create an entry for release notes.
#
# If your change doesn't affect end users you should instead start
# your pull request title with [chore] or use the "Skip Changelog" label.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
component: cicd, deployment

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Adds CICD common attributes to the registry.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
# The values here must be integers.
issues: [915, 832, 833]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: |
- CICD common attributes have been added to the registry.
- "`deployment.environment` has been deprecated and moved to `deployment.environment.name`."
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ body:
- area:aspnetcore
- area:aws
- area:browser
- area:cicd
- area:client
- area:cloud
- area:cloudevents
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/change_proposal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ body:
- area:aspnetcore
- area:aws
- area:browser
- area:cicd
- area:client
- area:cloud
- area:cloudevents
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/new-conventions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ body:
- area:aspnetcore
- area:aws
- area:browser
- area:cicd
- area:client
- area:cloud
- area:cloudevents
Expand Down
5 changes: 5 additions & 0 deletions docs/attributes-registry/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Currently, the following namespaces exist:
- [Aspnetcore](aspnetcore.md)
- [AWS](aws.md)
- [Browser](browser.md)
- [Build](build.md)
- [Client](client.md)
- [Cloud](cloud.md)
- [CloudEvents](cloudevents.md)
Expand All @@ -60,6 +61,7 @@ Currently, the following namespaces exist:
- [Heroku](heroku.md)
- [Host](host.md)
- [HTTP](http.md)
- [Incident](incident.md)
- [iOS](ios.md)
- [JVM](jvm.md)
- [K8s](k8s.md)
Expand All @@ -71,15 +73,18 @@ Currently, the following namespaces exist:
- [OS](os.md)
- [OTel](otel.md)
- [Peer](peer.md)
- [Pipeline](pipeline.md)
- [Process](process.md)
- [RPC](rpc.md)
- [Scm](scm.md)
- [Server](server.md)
- [Service](service.md)
- [Session](session.md)
- [SignalR](signalr.md)
- [Source](source.md)
- [System](system.md)
- [Telemetry](telemetry.md)
- [Test](test.md)
- [Thread](thread.md)
- [TLS](tls.md)
- [URL](url.md)
Expand Down
20 changes: 20 additions & 0 deletions docs/attributes-registry/build.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!--- Hugo front matter used to generate the website version of this page:
--->

<!-- NOTE: THIS FILE IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
<!-- see templates/registry/markdown/attribute_namespace.md.j2 -->

# Build

## Build Attributes

This group describes attributes specific to builds (ci).

| Attribute | Type | Description | Examples | Stability |
| ------------------------ | ------ | -------------------------------------------- | ------------------------------------------------------------------ | ---------------------------------------------------------------- |
| `build.artifact.id` | string | The id of the build artifact. | `120912` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `build.artifact.name` | string | The name of the build artifact. | `golang-binary-amd64-v0.1.0`; `docker-image-amd64-v0.1.0` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `build.artifact.sha` | string | The sha (checksum) of the build artifact. | `9ff4c52759e2c4ac70b7d517bc7fcdc1cda631ca0045271ddd1b192544f8a3e9` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `build.artifact.version` | string | The version of the build artifact. | `v0.1.0`; `1.2.1`; `122691-build` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `build.attestation.id` | string | The id of the build attestation. | `123` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `build.attestation.sha` | string | The sha (checksum) of the build attestation. | `1b31dfcd5b7f9267bf2ff47651df1cfb9147b9e4df1f335accf65b4cda498408` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
27 changes: 24 additions & 3 deletions docs/attributes-registry/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,18 @@

# Deployment

- [Deployment](#deployment-attributes)
- [Deployment Deprecated](#deployment-deprecated-attributes)

## Deployment Attributes

This document defines attributes for software deployments.

| Attribute | Type | Description | Examples | Stability |
| ------------------------ | ------ | ------------------------------------------------------------------------------------------------------------------ | ----------------------- | ---------------------------------------------------------------- |
| `deployment.environment` | string | Name of the [deployment environment](https://wikipedia.org/wiki/Deployment_environment) (aka deployment tier). [1] | `staging`; `production` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| Attribute | Type | Description | Examples | Stability |
| ----------------------------- | ------ | ------------------------------------------------------------------------------------------------------------------ | ---------------------------------- | ---------------------------------------------------------------- |
| `deployment.environment.name` | string | Name of the [deployment environment](https://wikipedia.org/wiki/Deployment_environment) (aka deployment tier). [1] | `staging`; `production` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `deployment.id` | string | The id of the deployment. | `1208` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `deployment.name` | string | The name of the deployment. | `deploy my app`; `deploy-frontend` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |

**[1]:** `deployment.environment` does not affect the uniqueness constraints defined through
the `service.namespace`, `service.name` and `service.instance.id` resource attributes.
Expand All @@ -21,3 +26,19 @@ considered to be identifying the same service:

- `service.name=frontend`, `deployment.environment=production`
- `service.name=frontend`, `deployment.environment=staging`.

## Deployment Deprecated Attributes

"Describes deprecated deployment attributes."

| Attribute | Type | Description | Examples | Stability |
| ------------------------ | ------ | ------------------------------------------------------------ | ----------------------- | --------------------------------------------------------------------------------------------------------------------- |
| `deployment.environment` | string | 'Deprecated, use `deployment.environment.name` instead.' [2] | `staging`; `production` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br>Deprecated, use `deployment.environment.name` instead. |

**[2]:** `deployment.environment` does not affect the uniqueness constraints defined through
the `service.namespace`, `service.name` and `service.instance.id` resource attributes.
This implies that resources carrying the following attribute combinations MUST be
considered to be identifying the same service:

- `service.name=frontend`, `deployment.environment=production`
- `service.name=frontend`, `deployment.environment=staging`.
17 changes: 17 additions & 0 deletions docs/attributes-registry/incident.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!--- Hugo front matter used to generate the website version of this page:
--->

<!-- NOTE: THIS FILE IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
<!-- see templates/registry/markdown/attribute_namespace.md.j2 -->

# Incident

## Incident Attributes

This group describes attributes specific to incidents.

| Attribute | Type | Description | Examples | Stability |
| ------------------- | ------ | ----------------------------- | ----------------------------------- | ---------------------------------------------------------------- |
| `incident.id` | string | The id of the incident. | `123` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `incident.name` | string | The name of the incident. | `incident-123` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `incident.severity` | string | The severity of the incident. | `critical`; `high`; `medium`; `low` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
22 changes: 22 additions & 0 deletions docs/attributes-registry/pipeline.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!--- Hugo front matter used to generate the website version of this page:
--->

<!-- NOTE: THIS FILE IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
<!-- see templates/registry/markdown/attribute_namespace.md.j2 -->

# Pipeline

## Pipeline Attributes

This group describes attributes specific to pipelines.

| Attribute | Type | Description | Examples | Stability |
| ----------------------------- | ------ | ------------------------------------------------------------------------------------ | ---------------------------------------------------------------------- | ---------------------------------------------------------------- |
| `pipeline.id` | string | The id of the pipeline. | `120912` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `pipeline.name` | string | The name of the pipeline. | `build_go_project`; `deploy_to_k8s`; `data pipeline`; `spark pipeline` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `pipeline.step.id` | string | The id of the step within a pipeline. | `12097` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `pipeline.step.name` | string | The name of the step within a pipeline. | `golang lint`; `go build`; `go test`; `transform data` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `pipeline.step.runner.id` | string | The id of the runner executing the step within a pipeline. | `1289` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `pipeline.step.runner.name` | string | The name of the runner executing the step within a pipeline. | `ubuntu-runner-latest` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `pipeline.step.runner.system` | string | OS system attributes of the runner acorrding to the [OS system attributes](./os.md). | `system.os.name` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `pipeline.step.type` | string | The type of the step within a pipeline. | `build`; `test`; `deploy` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
19 changes: 19 additions & 0 deletions docs/attributes-registry/scm.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--- Hugo front matter used to generate the website version of this page:
--->

<!-- NOTE: THIS FILE IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
<!-- see templates/registry/markdown/attribute_namespace.md.j2 -->

# Scm

## Scm Repository Attributes

This group defines the attributes for source control management (SCM) systems.

| Attribute | Type | Description | Examples | Stability |
| -------------------- | ------ | ------------------------------------------------------------------------ | ------------------------------------------------------------------ | ---------------------------------------------------------------- |
| `scm.change.id` | string | The id of the change (pull request / merge request) in the repository. | `123` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `scm.change.name` | string | The name of the change (pull request / merge request) in the repository. | `pull-request-123` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `scm.name` | string | The name of the repository. | `opentelemetry-collector-contrib` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `scm.ref.commit.sha` | string | The sha of the commit the ref (branch) is pointing to in the repository. | `9d59409acf479dfa0df1aa568182e43e43df8bbe28d60fcf2bc52e30068802cc` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `scm.ref.name` | string | The name of the ref (branch) in the repository. | `my-feature-branch` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
19 changes: 19 additions & 0 deletions docs/attributes-registry/test.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--- Hugo front matter used to generate the website version of this page:
--->

<!-- NOTE: THIS FILE IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
<!-- see templates/registry/markdown/attribute_namespace.md.j2 -->

# Test

## Test Suite Attributes

This group describes attributes specific to tests.

| Attribute | Type | Description | Examples | Stability |
| ------------------------ | ------ | ---------------------------- | ------------------------------- | ---------------------------------------------------------------- |
| `test.suite.case.id` | string | The id of the test case. | `123445` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `test.suite.case.name` | string | The name of the test case. | `TestCase1` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `test.suite.case.status` | string | The status of the test case. | `success`; `failure`; `skipped` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `test.suite.id` | string | The id of the test suite. | `123408` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `test.suite.name` | string | The name of the test suite. | `TestSuite1` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
2 changes: 1 addition & 1 deletion docs/resource/deployment-environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
|---|---|---|---|---|---|
| [`deployment.environment`](/docs/attributes-registry/deployment.md) | string | Name of the [deployment environment](https://wikipedia.org/wiki/Deployment_environment) (aka deployment tier). [1] | `staging`; `production` | `Recommended` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| [`deployment.environment.name`](/docs/attributes-registry/deployment.md) | string | Name of the [deployment environment](https://wikipedia.org/wiki/Deployment_environment) (aka deployment tier). [1] | `staging`; `production` | `Recommended` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |

**[1]:** `deployment.environment` does not affect the uniqueness constraints defined through
the `service.namespace`, `service.name` and `service.instance.id` resource attributes.
Expand Down
43 changes: 43 additions & 0 deletions model/registry/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
groups:
- id: registry.build
prefix: build
type: attribute_group
brief: >
This group describes attributes specific to builds (ci).
attributes:
- id: artifact.name
type: string
stability: experimental
brief: >
The name of the build artifact.
examples: ['golang-binary-amd64-v0.1.0', 'docker-image-amd64-v0.1.0']
- id: artifact.id
type: string
stability: experimental
brief: >
The id of the build artifact.
examples: ['120912']
- id: artifact.version
type: string
stability: experimental
brief: >
The version of the build artifact.
examples: ['v0.1.0', '1.2.1', '122691-build']
- id: artifact.sha
type: string
stability: experimental
brief: >
The sha (checksum) of the build artifact.
examples: ['9ff4c52759e2c4ac70b7d517bc7fcdc1cda631ca0045271ddd1b192544f8a3e9']
- id: attestation.id
type: string
stability: experimental
brief: >
The id of the build attestation.
examples: ['123']
- id: attestation.sha
type: string
stability: experimental
brief: >
The sha (checksum) of the build attestation.
examples: ['1b31dfcd5b7f9267bf2ff47651df1cfb9147b9e4df1f335accf65b4cda498408']
14 changes: 13 additions & 1 deletion model/registry/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,19 @@ groups:
brief: >
This document defines attributes for software deployments.
attributes:
- id: environment
- id: name
type: string
stability: experimental
brief: >
The name of the deployment.
examples: ['deploy my app', 'deploy-frontend']
- id: id
type: string
stability: experimental
brief: >
The id of the deployment.
examples: ['1208']
- id: environment.name
type: string
stability: experimental
brief: >
Expand Down
Loading