From 703309156f6387365c967d26141ad90af0dda66b Mon Sep 17 00:00:00 2001
From: Jaana Dogan <jbd@amazon.com>
Date: Tue, 2 Mar 2021 05:37:53 -0800
Subject: [PATCH] Add container runtime to container conventions (#1482)

---
 CHANGELOG.md                                             | 1 +
 semantic_conventions/resource/container.yaml             | 8 +++++++-
 specification/resource/semantic_conventions/container.md | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b031a1eac1..62c44e0a79e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ release.
   ([#1439](https://github.com/open-telemetry/opentelemetry-specification/pull/1439))
 - Add [`ForceFlush`](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/sdk.md#forceflush) to SDK's `TracerProvider` ([#1452](https://github.com/open-telemetry/opentelemetry-specification/pull/1452))
 - Add `elasticsearch` to `db.system` semantic conventions ([#1463](https://github.com/open-telemetry/opentelemetry-specification/pull/1463))
+- Add `runtime` to `container` semantic conventions ([#1482](https://github.com/open-telemetry/opentelemetry-specification/pull/1482))
 
 ## v1.0.1 (2021-02-11)
 
diff --git a/semantic_conventions/resource/container.yaml b/semantic_conventions/resource/container.yaml
index ba54d4437d6..70ba6fbb1c1 100644
--- a/semantic_conventions/resource/container.yaml
+++ b/semantic_conventions/resource/container.yaml
@@ -12,10 +12,15 @@ groups:
       - id: id
         type: string
         brief: >
-          Container id. Usually a UUID, as for example used to
+          Container ID. Usually a UUID, as for example used to
           [identify Docker containers](https://docs.docker.com/engine/reference/run/#container-identification).
           The UUID might be abbreviated.
         examples: ['a3bf90e006b2']
+      - id: runtime
+        type: string
+        brief: >
+          The container runtime managing this container.
+        examples: ['docker', 'containerd', 'rkt']
       - id: image.name
         type: string
         brief: >
@@ -26,3 +31,4 @@ groups:
         brief: >
           Container image tag.
         examples: ['0.1']
+
diff --git a/specification/resource/semantic_conventions/container.md b/specification/resource/semantic_conventions/container.md
index 2d76b03bc50..0af90820663 100644
--- a/specification/resource/semantic_conventions/container.md
+++ b/specification/resource/semantic_conventions/container.md
@@ -10,7 +10,8 @@
 | Attribute  | Type | Description  | Examples  | Required |
 |---|---|---|---|---|
 | `container.name` | string | Container name. | `opentelemetry-autoconf` | No |
-| `container.id` | string | Container id. Usually a UUID, as for example used to [identify Docker containers](https://docs.docker.com/engine/reference/run/#container-identification). The UUID might be abbreviated. | `a3bf90e006b2` | No |
+| `container.id` | string | Container ID. Usually a UUID, as for example used to [identify Docker containers](https://docs.docker.com/engine/reference/run/#container-identification). The UUID might be abbreviated. | `a3bf90e006b2` | No |
+| `container.runtime` | string | The container runtime managing this container. | `docker`; `containerd`; `rkt` | No |
 | `container.image.name` | string | Name of the image the container was built on. | `gcr.io/opentelemetry/operator` | No |
 | `container.image.tag` | string | Container image tag. | `0.1` | No |
 <!-- endsemconv -->