From 0a56cde31dbd6cfc25fba9f403b49df1fbcb2230 Mon Sep 17 00:00:00 2001 From: marcsanmi Date: Fri, 23 Jun 2023 15:12:05 +0200 Subject: [PATCH] update command attributes to be opt-in --- semantic_conventions/resource/container.yaml | 15 +++++++-------- .../resource/semantic_conventions/container.md | 6 +++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/semantic_conventions/resource/container.yaml b/semantic_conventions/resource/container.yaml index 91536d167f..f3f52c7cfa 100644 --- a/semantic_conventions/resource/container.yaml +++ b/semantic_conventions/resource/container.yaml @@ -48,22 +48,21 @@ groups: examples: ['sha256:19c92d0a00d1b66d897bceaa7319bee0dd38a10a851c60bcec9474aa3f01e50f'] - id: command type: string - requirement_level: - conditionally_required: If using embedded credentials or sensitive data, it is recommended to remove them to prevent potential leakage. + requirement_level: opt_in + note: > + If using embedded credentials or sensitive data, it is recommended to remove them to prevent potential leakage. brief: > The command used to run the container (i.e. the command name). examples: [ 'otelcontribcol' ] - id: command_line type: string - requirement_level: - conditionally_required: [2] + requirement_level: opt_in brief: > - The full command run by the container as a single string representing the full command. + The full command run by the container as a single string representing the full command. [2] examples: [ 'otelcontribcol --config config.yaml' ] - id: command_args type: string[] - requirement_level: - conditionally_required: [2] + requirement_level: opt_in brief: > - All the command arguments (including the command/executable itself) run by the container. + All the command arguments (including the command/executable itself) run by the container. [2] examples: [ 'otelcontribcol, --config, config.yaml' ] diff --git a/specification/resource/semantic_conventions/container.md b/specification/resource/semantic_conventions/container.md index b67e2c92e0..d7889e5f6b 100644 --- a/specification/resource/semantic_conventions/container.md +++ b/specification/resource/semantic_conventions/container.md @@ -15,9 +15,9 @@ | `container.image.name` | string | Name of the image the container was built on. | `gcr.io/opentelemetry/operator` | Recommended | | `container.image.tag` | string | Container image tag. | `0.1` | Recommended | | `container.image.id` | string | Runtime specific image identifier. Usually a hash algorithm followed by a UUID. [1] | `sha256:19c92d0a00d1b66d897bceaa7319bee0dd38a10a851c60bcec9474aa3f01e50f` | Recommended | -| `container.command` | string | The command used to run the container (i.e. the command name). | `otelcontribcol` | Conditionally Required: [2] | -| `container.command_line` | string | The full command run by the container as a single string representing the full command. | `otelcontribcol --config config.yaml` | Conditionally Required: [2] | -| `container.command_args` | string[] | All the command arguments (including the command/executable itself) run by the container. | `[otelcontribcol, --config, config.yaml]` | Conditionally Required: [2] | +| `container.command` | string | The command used to run the container (i.e. the command name). [2] | `otelcontribcol` | Opt-In | +| `container.command_line` | string | The full command run by the container as a single string representing the full command. [2] | `otelcontribcol --config config.yaml` | Opt-In | +| `container.command_args` | string[] | All the command arguments (including the command/executable itself) run by the container. [2] | `[otelcontribcol, --config, config.yaml]` | Opt-In | **[1]:** Docker defines a sha256 of the image id; `container.image.id` corresponds to the `Image` field from the Docker container inspect [API](https://docs.docker.com/engine/api/v1.43/#tag/Container/operation/ContainerInspect) endpoint. K8s defines a link to the container registry repository with digest `"imageID": "registry.azurecr.io /namespace/service/dockerfile@sha256:bdeabd40c3a8a492eaf9e8e44d0ebbb84bac7ee25ac0cf8a7159d25f62555625"`.