From c7564f7e44d7f427c1dc09bd2cf661c9adc162fb Mon Sep 17 00:00:00 2001 From: Mario Macias Date: Fri, 13 Mar 2026 10:51:07 +0100 Subject: [PATCH 1/2] Document container and cloud metadata --- docs/sources/configure/service-discovery.md | 18 ++++++++++++++++++ docs/sources/metrics.md | 17 +++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/docs/sources/configure/service-discovery.md b/docs/sources/configure/service-discovery.md index e612a32df3..8f9e5bdc05 100644 --- a/docs/sources/configure/service-discovery.md +++ b/docs/sources/configure/service-discovery.md @@ -35,6 +35,7 @@ You can override the service name, namespace, and other configurations per servi | `open_ports` | Selects the process to instrument by the port it has open (listens to). Refer to [open ports](#open-ports). | string | (unset) | | `exe_path` | Selects the processes to instrument by their executable name path. Refer to [executable path](#executable-path). | string (glob) | (unset) | | `containers_only` | Selects processes to instrument which are running in an OCI container. Refer to [containers only](#containers-only). | boolean | false | +| `container_name` | Filter services by OCI container name. Refer to [Container name](#container-name). | string (glob) | (unset) | | `k8s_namespace` | Filter services by Kubernetes namespace. Refer to [K8s namespace](#k8s-namespace). | string (glob) | (unset) | | `k8s_pod_name` | Filter services by Kubernetes Pod. Refer to [K8s Pod name](#k8s-pod-name). | string (glob) | (unset) | | `k8s_deployment_name` | Filter services by Kubernetes Deployment. Refer to [K8s deployment name](#k8s-deployment-name). | string (glob) | (unset) | @@ -103,6 +104,23 @@ Selects processes to instrument which are running in an OCI container. To perfor If you specify other selectors in the same `instrument` entry, the processes must match all the selector properties. +### Container name + +This selector property limits the instrumentation to the applications running in OCI containers (such as Docker) with a name matching the provided glob pattern. + +For example: + +```yaml +discovery: + instrument: + - container_name: "*testserver*" + - container_name: "my-app-*" +``` + +This example discovers all processes running in containers whose names contain "testserver" or start with "my-app-". + +If you specify other selectors in the same `instrument` entry, the processes must match all the selector properties. + ### K8s namespace This selector property limits the instrumentation to the applications running in the Kubernetes Namespaces with a name matching the provided glob. diff --git a/docs/sources/metrics.md b/docs/sources/metrics.md index 7db60bc268..bd8e90f40f 100644 --- a/docs/sources/metrics.md +++ b/docs/sources/metrics.md @@ -54,6 +54,10 @@ For more information about the OpenTelemetry semantic conventions for each metri - [Messaging metrics conventions](https://opentelemetry.io/docs/specs/semconv/messaging/messaging-metrics/) - [Process metrics conventions](https://opentelemetry.io/docs/specs/semconv/system/process-metrics/) - [Kubernetes resource conventions](https://opentelemetry.io/docs/specs/semconv/resource/k8s/) +- [Container resource conventions](https://opentelemetry.io/docs/specs/semconv/resource/container/) +- [Host resource conventions](https://opentelemetry.io/docs/specs/semconv/resource/host/) +- [Cloud resource conventions](https://opentelemetry.io/docs/specs/semconv/resource/cloud/) +- [Cloud provider specific conventions](https://opentelemetry.io/docs/specs/semconv/resource/cloud-provider/) | Metrics | Name | Default | |--------------------------------|------------------------------|---------------------------------------------------| @@ -72,6 +76,19 @@ For more information about the OpenTelemetry semantic conventions for each metri | Application (all) | `k8s.replicaset.name` | shown if Kubernetes metadata is enabled | | Application (all) | `k8s.statefulset.name` | shown if Kubernetes metadata is enabled | | Application (all) | `k8s.cluster.name` | shown if Kubernetes metadata is enabled | +| Application (all) | `container.id` | shown if Docker metadata is enabled | +| Application (all) | `container.name` | shown if Docker metadata is enabled | +| Application (all) | `cloud.provider` | shown if cloud metadata is enabled | +| Application (all) | `cloud.platform` | shown if cloud metadata is enabled | +| Application (all) | `cloud.region` | shown if cloud metadata is enabled | +| Application (all) | `cloud.account.id` | shown if cloud metadata is enabled | +| Application (all) | `cloud.availability_zone` | shown if cloud metadata is enabled | +| Application (all) | `cloud.resource_id` | shown if cloud metadata is enabled (Azure only) | +| Application (all) | `host.id` | shown if cloud metadata is enabled | +| Application (all) | `host.type` | shown if cloud metadata is enabled | +| Application (all) | `host.image.id` | shown if cloud metadata is enabled (AWS only) | +| Application (all) | `gcp.gce.instance.name` | shown if cloud metadata is enabled (GCP only) | +| Application (all) | `gcp.gce.instance.hostname` | shown if cloud metadata is enabled (GCP only) | | Application (all) | `service.name` | shown | | Application (all) | `service.namespace` | shown | | Application (all) | `target.instance` | shown | From bf1945ed31e0f779e2dc8d1b4b523ed27e6a100d Mon Sep 17 00:00:00 2001 From: Mario Macias Date: Fri, 13 Mar 2026 11:30:03 +0100 Subject: [PATCH 2/2] try make vale happy --- docs/sources/configure/service-discovery.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/configure/service-discovery.md b/docs/sources/configure/service-discovery.md index 8f9e5bdc05..baf1bec771 100644 --- a/docs/sources/configure/service-discovery.md +++ b/docs/sources/configure/service-discovery.md @@ -117,7 +117,7 @@ discovery: - container_name: "my-app-*" ``` -This example discovers all processes running in containers whose names contain "testserver" or start with "my-app-". +This example discovers all processes running in containers whose names contain `testserver` or start with `my-app-`. If you specify other selectors in the same `instrument` entry, the processes must match all the selector properties.