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

Add CloudFoundry Resource Attributes #624

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
7bd0436
Add CloudFoundry resource attributes
KarstenSchnitter Dec 27, 2023
7a9b0b4
Add Changelog Entry for CloudFoundry
KarstenSchnitter Jan 11, 2024
f4efa59
Rename CF generic attributes
KarstenSchnitter Jan 15, 2024
736bee4
Revert "Add Changelog Entry for CloudFoundry"
KarstenSchnitter Feb 11, 2024
402c93e
Merge commit '44c830d3dabad9d59f340d92e774a1d5a2356743' into cf-resource
KarstenSchnitter Feb 11, 2024
d41832c
Provide Changelog Entry
KarstenSchnitter Feb 11, 2024
d722e21
Merge branch 'main' into cf-resource
joaopgrassi Mar 20, 2024
9ce2881
Merge branch 'main' into cf-resource
KarstenSchnitter Apr 17, 2024
d20c70f
Create CloudFoundry System Namespace
KarstenSchnitter May 12, 2024
d77ec4b
Merge commit 'c53f76f661a98836f824d27d33b5f4b24dfa5bc4' into cf-resource
KarstenSchnitter May 24, 2024
99a037d
Update docs/attributes-registry/README.md
KarstenSchnitter May 26, 2024
1183038
Merge branch 'main' into cf-resource
KarstenSchnitter Jun 12, 2024
e7ac8f2
Merge branch 'main' into cf-resource
KarstenSchnitter Aug 7, 2024
b5335d5
Merge branch 'main' into cf-resource
KarstenSchnitter Aug 23, 2024
b2da4c9
Merge branch 'main' into cf-resource
KarstenSchnitter Sep 2, 2024
ad85e02
Update issue templates
KarstenSchnitter Sep 9, 2024
5da2eac
Remove prefix
KarstenSchnitter Sep 9, 2024
887ade0
Register CloudFoundry as acronym
KarstenSchnitter Sep 9, 2024
2313a54
Fix issue templates
KarstenSchnitter Sep 9, 2024
fe5afa0
Fix resource model
KarstenSchnitter Sep 9, 2024
060b67e
Merge branch 'main' into cf-resource
KarstenSchnitter Sep 9, 2024
99b1cb8
Merge branch 'main' into cf-resource
KarstenSchnitter Sep 11, 2024
742e03b
Merge branch 'main' into cf-resource
KarstenSchnitter Sep 12, 2024
d319458
Merge branch 'main' into cf-resource
KarstenSchnitter Sep 16, 2024
4808dfe
Merge branch 'main' into cf-resource
KarstenSchnitter Sep 17, 2024
2f991a8
Fix CloudFoundry Model Configuration
KarstenSchnitter Sep 17, 2024
ed7ff7a
Ajdust Github Issue Templates
KarstenSchnitter Sep 17, 2024
54d7997
Merge branch 'main' into cf-resource
KarstenSchnitter Sep 17, 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
26 changes: 26 additions & 0 deletions .chloggen/cf-resource.yaml
Original file line number Diff line number Diff line change
@@ -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.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ body:
- area:client
- area:cloud
- area:cloudevents
- area:cloudfoundry
- area:code
- area:container
- area:cpu
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 @@ -22,6 +22,7 @@ body:
- area:client
- area:cloud
- area:cloudevents
- area:cloudfoundry
- area:code
- area:container
- area:cpu
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 @@ -31,6 +31,7 @@ body:
- area:client
- area:cloud
- area:cloudevents
- area:cloudfoundry
- area:code
- area:container
- area:cpu
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions docs/attributes-registry/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
97 changes: 97 additions & 0 deletions docs/attributes-registry/cloudfoundry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<!--- 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.source.type` | string | The type of the event source. [8] | `APP/PROC/WEB/0`; `APP/TASK/jobscheduler-task-70013817-ab92-4f75-82d4-de8ae4dd64b4`; `RTR`; `STG` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `cloudfoundry.space.id` | string | The guid of the CloudFoundry space the application is running in. [9] | `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. [10] | `my-space-name` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `cloudfoundry.system.id` | string | A guid or another name describing the event source. [11] | `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. [12] | `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]:** CloudFoundry generates log messages with different source types for an
applications. This indicates, whether the log was created from the
actual application, a background task, the central load balancer, or
the CloudFoundry runtime, e.g. during a deployment.

The `source_type` is contained as a tag of the [Loggegator v2 envelope](https://github.com/cloudfoundry/loggregator-api#v2-envelope).
It is also available in the syslog drain structured data as documented
in the [CloudFoundry Dev Guide](https://docs.cloudfoundry.org/devguide/deploy-apps/streaming-logs.html).
Application developers can access the value of the `source_type` in
the log stream generated by `cf logs <app-name>`, usually in square
brackets.

**[9]:** 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`.

**[10]:** Application instrumentation should use the value from environment
variable `VCAP_APPLICATION.space_name`. This is the same value as
reported by `cf spaces`.

**[11]:** CloudFoundry defines the `source_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 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`.

**[12]:** 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 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`.
1 change: 1 addition & 0 deletions docs/resource/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ Attributes defining a running environment (e.g. Operating System, Cloud, Data Ce
- Deployment:
- [Deployment Environment](./deployment-environment.md)
- [Kubernetes](./k8s.md)
- [CloudFoundry](./cloudfoundry.md)
- [Browser](./browser.md)

## Version attributes
Expand Down
Loading