Merge branch 'main' into 1372-vcs-metrics

.chloggen/1421.yaml

@@ -0,0 +1,4 @@
+change_type: breaking
+component: database
+note: Add new `db.response.status_code` attribute, deprecate `db.cosmos.status_code`.
+issues: [1424]

.chloggen/add_container_csi_attributes.yaml

@@ -0,0 +1,7 @@
+change_type: enhancement
+component: container
+note: >-
+  Add CSI (Container Storage Interface) attributes:
+  `container.csi.plugin.name` and `container.csi.volume.id`.
+issues: [1119]
+subtext:

.chloggen/add_k8s_memory_usage.yaml

@@ -0,0 +1,22 @@
+# 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: enhancement
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: k8s
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add k8s.pod.memory usage and k8s.node.memory.usage metrics
+
+# 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: [1406]
+
+# (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:

.chloggen/cf-resource.yaml

@@ -0,0 +1,26 @@
+# 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: new_component
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: cloudfoundry
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Adds a resource convention for Cloud Foundry applications and system components.
+
+# 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: [622, 624]
+
+# (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: |
+  Introduces a description for CloudFoundry resources. These can either be
+  applications deployed on the runtime or system components of Cloud Foundry
+  itself. It also extends to the runtime logs and metrics, e.g. Gorouter access
+  logs and container metrics.

.chloggen/file_leftovers.yaml

@@ -0,0 +1,22 @@
+# 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: enhancement
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: file
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add additional attributes from ECS to the `file` namespace.
+
+# 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: [914]
+
+# (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:

.chloggen/fix-deprecated-messaging-servicebus.yaml

@@ -0,0 +1,4 @@
+change_type: 'bug_fix'
+component: messaging
+note: Fix deprecated note for service bus attributes
+issues: [1418]

.chloggen/messaging-parent-child-trace.yaml

@@ -0,0 +1,4 @@
+change_type: enhancement
+component: messaging
+note: Clarify the possibility to have a parent-child trace structure in messaging conventions
+issues: [1282]

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -30,6 +30,7 @@ body:
         - area:client
         - area:cloud
         - area:cloudevents
+        - area:cloudfoundry
         - area:code
         - area:container
         - area:cpu

.github/ISSUE_TEMPLATE/change_proposal.yaml

@@ -22,6 +22,7 @@ body:
         - area:client
         - area:cloud
         - area:cloudevents
+        - area:cloudfoundry
         - area:code
         - area:container
         - area:cpu

.github/ISSUE_TEMPLATE/new-conventions.yaml

@@ -31,6 +31,7 @@ body:
         - area:client
         - area:cloud
         - area:cloudevents
+        - area:cloudfoundry
         - area:code
         - area:container
         - area:cpu

Makefile

@@ -10,7 +10,7 @@ else
 	SED := sed
 endif
 
-TOOLS_DIR := ./internal/tools
+TOOLS_DIR := $(PWD)/internal/tools
 
 MISSPELL_BINARY=bin/misspell
 MISSPELL = $(TOOLS_DIR)/$(MISSPELL_BINARY)
@@ -150,7 +150,7 @@ table-check:
 		--mount 'type=bind,source=$(PWD)/model,target=/home/weaver/source,readonly' \
 		--mount 'type=bind,source=$(PWD)/docs,target=/home/weaver/target,readonly' \
 		$(WEAVER_CONTAINER) registry update-markdown \
-		--registry=/home/weaver/target \
+		--registry=/home/weaver/source \
 		--attribute-registry-base-url=/docs/attributes-registry \
 		--templates=/home/weaver/templates \
 		--target=markdown \

dependencies.Dockerfile

@@ -3,7 +3,7 @@
 # Dependabot can keep this file up to date with latest containers.
 
 # Weaver is used to generate markdown docs, and enforce policies on the model.
-FROM otel/weaver:v0.9.2 AS weaver
+FROM otel/weaver:v0.10.0 AS weaver
 
 # OPA is used to test policies enforced by weaver.
 FROM openpolicyagent/opa:0.68.0 AS opa

docs/attributes-registry/README.md

@@ -41,6 +41,7 @@ Currently, the following namespaces exist:
 - [Client](client.md)
 - [Cloud](cloud.md)
 - [CloudEvents](cloudevents.md)
+- [CloudFoundry](cloudfoundry.md)
 - [Code](code.md)
 - [Container](container.md)
 - [CPU](cpu.md)

docs/attributes-registry/cloudfoundry.md

@@ -0,0 +1,84 @@
+<!--- 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 -->
+
+# CloudFoundry
+
+## CloudFoundry Attributes
+
+CloudFoundry resource attributes.
+
+| Attribute                         | Type   | Description                                                                    | Examples                               | Stability                                                        |
+| --------------------------------- | ------ | ------------------------------------------------------------------------------ | -------------------------------------- | ---------------------------------------------------------------- |
+| `cloudfoundry.app.id`             | string | The guid of the application. [1]                                               | `218fc5a9-a5f1-4b54-aa05-46717d0ab26d` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `cloudfoundry.app.instance.id`    | string | The index of the application instance. 0 when just one instance is active. [2] | `0`; `1`                               | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `cloudfoundry.app.name`           | string | The name of the application. [3]                                               | `my-app-name`                          | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `cloudfoundry.org.id`             | string | The guid of the CloudFoundry org the application is running in. [4]            | `218fc5a9-a5f1-4b54-aa05-46717d0ab26d` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `cloudfoundry.org.name`           | string | The name of the CloudFoundry organization the app is running in. [5]           | `my-org-name`                          | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `cloudfoundry.process.id`         | string | The UID identifying the process. [6]                                           | `218fc5a9-a5f1-4b54-aa05-46717d0ab26d` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `cloudfoundry.process.type`       | string | The type of process. [7]                                                       | `web`                                  | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `cloudfoundry.space.id`           | string | The guid of the CloudFoundry space the application is running in. [8]          | `218fc5a9-a5f1-4b54-aa05-46717d0ab26d` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `cloudfoundry.space.name`         | string | The name of the CloudFoundry space the application is running in. [9]          | `my-space-name`                        | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `cloudfoundry.system.id`          | string | A guid or another name describing the event source. [10]                       | `cf/gorouter`                          | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `cloudfoundry.system.instance.id` | string | A guid describing the concrete instance of the event source. [11]              | `218fc5a9-a5f1-4b54-aa05-46717d0ab26d` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+
+**[1]:** Application instrumentation should use the value from environment
+variable `VCAP_APPLICATION.application_id`. This is the same value as
+reported by `cf app <app-name> --guid`.
+
+**[2]:** CloudFoundry defines the `instance_id` in the [Loggegator v2 envelope](https://github.com/cloudfoundry/loggregator-api#v2-envelope).
+It is used for logs and metrics emitted by CloudFoundry. It is
+supposed to contain the application instance index for applications
+deployed on the runtime.
+
+Application instrumentation should use the value from environment
+variable `CF_INSTANCE_INDEX`.
+
+**[3]:** Application instrumentation should use the value from environment
+variable `VCAP_APPLICATION.application_name`. This is the same value
+as reported by `cf apps`.
+
+**[4]:** Application instrumentation should use the value from environment
+variable `VCAP_APPLICATION.org_id`. This is the same value as
+reported by `cf org <org-name> --guid`.
+
+**[5]:** Application instrumentation should use the value from environment
+variable `VCAP_APPLICATION.org_name`. This is the same value as
+reported by `cf orgs`.
+
+**[6]:** Application instrumentation should use the value from environment
+variable `VCAP_APPLICATION.process_id`. It is supposed to be equal to
+`VCAP_APPLICATION.app_id` for applications deployed to the runtime.
+For system components, this could be the actual PID.
+
+**[7]:** CloudFoundry applications can consist of multiple jobs. Usually the
+main process will be of type `web`. There can be additional background
+tasks or side-cars with different process types.
+
+**[8]:** Application instrumentation should use the value from environment
+variable `VCAP_APPLICATION.space_id`. This is the same value as
+reported by `cf space <space-name> --guid`.
+
+**[9]:** Application instrumentation should use the value from environment
+variable `VCAP_APPLICATION.space_name`. This is the same value as
+reported by `cf spaces`.
+
+**[10]:** CloudFoundry defines the `source_id` in the [Loggregator v2 envelope](https://github.com/cloudfoundry/loggregator-api#v2-envelope).
+It is used for logs and metrics emitted by CloudFoundry. It is
+supposed to contain the component name, e.g. "gorouter", for
+CloudFoundry components.
+
+When system components are instrumented, values from the
+[Bosh spec](https://bosh.io/docs/jobs/#properties-spec)
+should be used. The `system.id` should be set to
+`spec.deployment/spec.name`.
+
+**[11]:** CloudFoundry defines the `instance_id` in the [Loggregator v2 envelope](https://github.com/cloudfoundry/loggregator-api#v2-envelope).
+It is used for logs and metrics emitted by CloudFoundry. It is
+supposed to contain the vm id for CloudFoundry components.
+
+When system components are instrumented, values from the
+[Bosh spec](https://bosh.io/docs/jobs/#properties-spec)
+should be used. The `system.instance.id` should be set to `spec.id`.