From f3a7455d320e524955af99bdfff0019d711aa08a Mon Sep 17 00:00:00 2001 From: Alexandra Konrad Date: Mon, 8 Apr 2024 22:51:28 +0200 Subject: [PATCH 1/4] move log to registry; use file namespace for some log attributes --- .chloggen/log.yaml | 22 ++++++++ .github/ISSUE_TEMPLATE/bug_report.yaml | 1 + .github/ISSUE_TEMPLATE/change_proposal.yaml | 1 + .github/ISSUE_TEMPLATE/new-conventions.yaml | 1 + docs/attributes-registry/README.md | 1 + docs/attributes-registry/log.md | 60 +++++++++++++++++++++ docs/general/logs.md | 16 +++--- model/logs/general.yaml | 14 +---- model/logs/media.yaml | 47 +++------------- model/registry/deprecated/log.yaml | 19 +++++++ model/registry/log.yaml | 60 +++++++++++++++++++++ schema-next.yaml | 7 +++ 12 files changed, 187 insertions(+), 62 deletions(-) create mode 100755 .chloggen/log.yaml create mode 100644 docs/attributes-registry/log.md create mode 100644 model/registry/deprecated/log.yaml create mode 100644 model/registry/log.yaml diff --git a/.chloggen/log.yaml b/.chloggen/log.yaml new file mode 100755 index 0000000000..82db451d6a --- /dev/null +++ b/.chloggen/log.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: breaking + +# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db) +component: log + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Rename `log.file.name` to `file.name` and `log.file.path` to `file.path`. Deprecate old names. + +# 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: [908] + +# (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: diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 138ec6c592..2c70e9a659 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -46,6 +46,7 @@ body: - area:http - area:ios - area:k8s + - area:log - area:messaging - area:network - area:oci diff --git a/.github/ISSUE_TEMPLATE/change_proposal.yaml b/.github/ISSUE_TEMPLATE/change_proposal.yaml index 117491cb40..10b1876c74 100644 --- a/.github/ISSUE_TEMPLATE/change_proposal.yaml +++ b/.github/ISSUE_TEMPLATE/change_proposal.yaml @@ -39,6 +39,7 @@ body: - area:http - area:ios - area:k8s + - area:log - area:messaging - area:network - area:oci diff --git a/.github/ISSUE_TEMPLATE/new-conventions.yaml b/.github/ISSUE_TEMPLATE/new-conventions.yaml index f663263c59..4add75aa4a 100644 --- a/.github/ISSUE_TEMPLATE/new-conventions.yaml +++ b/.github/ISSUE_TEMPLATE/new-conventions.yaml @@ -48,6 +48,7 @@ body: - area:http - area:ios - area:k8s + - area:log - area:messaging - area:network - area:oci diff --git a/docs/attributes-registry/README.md b/docs/attributes-registry/README.md index c9f832ec74..dc14129423 100644 --- a/docs/attributes-registry/README.md +++ b/docs/attributes-registry/README.md @@ -54,6 +54,7 @@ Currently, the following namespaces exist: * [HTTP](http.md) * [iOS](ios.md) * [K8s](k8s.md) +* [Log](log.md) * [Network](network.md) * [OCI](oci.md) * [OpenTelemetry](otel.md) diff --git a/docs/attributes-registry/log.md b/docs/attributes-registry/log.md new file mode 100644 index 0000000000..31fcb2a379 --- /dev/null +++ b/docs/attributes-registry/log.md @@ -0,0 +1,60 @@ + + +# Log + + + +- [Log Attributes](#log-attributes) + - [Generic log attributes](#generic-log-attributes) + - [File log attributes](#file-log-attributes) + - [Record log attributes](#record-log-attributes) + - [Deprecated log attributes](#deprecated-log-attributes) + + + +## Log Attributes + +### Generic log attributes + + +| Attribute | Type | Description | Examples | Stability | +|---|---|---|---|---| +| `log.iostream` | string | The stream associated with the log. See below for a list of well-known values. | `stdout` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | + +`log.iostream` has the following list of well-known values. If one of them applies, then the respective value MUST be used; otherwise, a custom value MAY be used. + +| Value | Description | Stability | +|---|---|---| +| `stdout` | Logs from stdout stream | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `stderr` | Events from stderr stream | ![Experimental](https://img.shields.io/badge/-experimental-blue) | + + +### File log attributes + + +| Attribute | Type | Description | Examples | Stability | +|---|---|---|---|---| +| `log.file.name_resolved` | string | The basename of the file, with symlinks resolved. | `uuid.log` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `log.file.path_resolved` | string | The full path to the file, with symlinks resolved. | `/var/lib/docker/uuid.log` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | + + +### Record log attributes + + +| Attribute | Type | Description | Examples | Stability | +|---|---|---|---|---| +| `log.record.uid` | string | A unique identifier for the Log Record. [1] | `01ARZ3NDEKTSV4RRFFQ69G5FAV` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | + +**[1]:** If an id is provided, other log records with the same id will be considered duplicates and can be removed safely. This means, that two distinguishable log records MUST have different values. +The id MAY be an [Universally Unique Lexicographically Sortable Identifier (ULID)](https://github.com/ulid/spec), but other identifiers (e.g. UUID) may be used as needed. + + +### Deprecated log attributes + + +| Attribute | Type | Description | Examples | Stability | +|---|---|---|---|---| +| `log.file.name` | string | Deprecated, use `file.name` instead. | `audit.log` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)
Replaced by `file.name`. | +| `log.file.path` | string | Deprecated, use `file.path` instead. | `/var/log/mysql/audit.log` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)
Replaced by `file.path`. | + \ No newline at end of file diff --git a/docs/general/logs.md b/docs/general/logs.md index 748c2e61fc..441af6ff3c 100644 --- a/docs/general/logs.md +++ b/docs/general/logs.md @@ -38,7 +38,7 @@ These attributes may be used for identifying a Log Record. | Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability | |---|---|---|---|---|---| -| `log.record.uid` | string | A unique identifier for the Log Record. [1] | `01ARZ3NDEKTSV4RRFFQ69G5FAV` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| [`log.record.uid`](../attributes-registry/log.md) | string | A unique identifier for the Log Record. [1] | `01ARZ3NDEKTSV4RRFFQ69G5FAV` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | **[1]:** If an id is provided, other log records with the same id will be considered duplicates and can be removed safely. This means, that two distinguishable log records MUST have different values. The id MAY be an [Universally Unique Lexicographically Sortable Identifier (ULID)](https://github.com/ulid/spec), but other identifiers (e.g. UUID) may be used as needed. @@ -59,22 +59,22 @@ As such, these should be recorded as Log Record attributes when applicable. They | Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability | |---|---|---|---|---|---| -| `log.file.name` | string | The basename of the file. | `audit.log` | `Recommended` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | -| `log.file.name_resolved` | string | The basename of the file, with symlinks resolved. | `uuid.log` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | -| `log.file.path` | string | The full path to the file. | `/var/log/mysql/audit.log` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | -| `log.file.path_resolved` | string | The full path to the file, with symlinks resolved. | `/var/lib/docker/uuid.log` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| [`file.name`](../attributes-registry/file.md) | string | Name of the file including the extension, without the directory. | `example.png` | `Recommended` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| [`file.path`](../attributes-registry/file.md) | string | Full path to the file, including the file name. It should include the drive letter, when appropriate. | `/home/alice/example.png`; `C:\Program Files\MyApp\myapp.exe` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| [`log.file.name_resolved`](../attributes-registry/log.md) | string | The basename of the file, with symlinks resolved. | `uuid.log` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| [`log.file.path_resolved`](../attributes-registry/log.md) | string | The full path to the file, with symlinks resolved. | `/var/lib/docker/uuid.log` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | ### I/O Stream **Description:** The I/O stream to which the log was emitted. - + | Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability | |---|---|---|---|---|---| -| `log.iostream` | string | The stream associated with the log. See below for a list of well-known values. | `stdout` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| [`log.iostream`](../attributes-registry/log.md) | string | The stream associated with the log. See below for a list of well-known values. | `stdout` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | -`log.iostream` MUST be one of the following: +`log.iostream` has the following list of well-known values. If one of them applies, then the respective value MUST be used; otherwise, a custom value MAY be used. | Value | Description | Stability | |---|---|---| diff --git a/model/logs/general.yaml b/model/logs/general.yaml index e8f9ea5853..b4afe2c16c 100644 --- a/model/logs/general.yaml +++ b/model/logs/general.yaml @@ -1,20 +1,8 @@ groups: - id: log.record - prefix: log.record type: attribute_group brief: > The attributes described in this section are rather generic. They may be used in any Log Record they apply to. attributes: - - id: uid - type: string - stability: experimental + - ref: log.record.uid requirement_level: opt_in - brief: > - A unique identifier for the Log Record. - note: > - If an id is provided, other log records with the same id will be considered duplicates and can be removed safely. - This means, that two distinguishable log records MUST have different values. - - The id MAY be an [Universally Unique Lexicographically Sortable Identifier (ULID)](https://github.com/ulid/spec), - but other identifiers (e.g. UUID) may be used as needed. - examples: ["01ARZ3NDEKTSV4RRFFQ69G5FAV"] diff --git a/model/logs/media.yaml b/model/logs/media.yaml index b6bfea89d4..8aa9ac5bfe 100644 --- a/model/logs/media.yaml +++ b/model/logs/media.yaml @@ -1,56 +1,21 @@ groups: - id: attributes.log - prefix: log type: attribute_group brief: "Describes Log attributes" attributes: - - id: iostream + - ref: log.iostream requirement_level: opt_in - stability: experimental - brief: > - The stream associated with the log. See below for a list of well-known values. - type: - allow_custom_values: false - members: - - id: stdout - value: 'stdout' - brief: 'Logs from stdout stream' - stability: experimental - - id: stderr - value: 'stderr' - brief: 'Events from stderr stream' - stability: experimental + - id: attributes.log.file - prefix: log.file type: attribute_group brief: > A file to which log was emitted. attributes: - - id: name - type: string - stability: experimental + - ref: file.name requirement_level: recommended - brief: > - The basename of the file. - examples: ["audit.log"] - - id: path - type: string - stability: experimental + - ref: file.path requirement_level: opt_in - brief: > - The full path to the file. - examples: [ "/var/log/mysql/audit.log" ] - - id: name_resolved - type: string - stability: experimental + - ref: log.file.name_resolved requirement_level: opt_in - brief: > - The basename of the file, with symlinks resolved. - examples: [ "uuid.log" ] - - id: path_resolved - type: string - stability: experimental + - ref: log.file.path_resolved requirement_level: opt_in - brief: > - The full path to the file, with symlinks resolved. - examples: [ "/var/lib/docker/uuid.log" ] diff --git a/model/registry/deprecated/log.yaml b/model/registry/deprecated/log.yaml new file mode 100644 index 0000000000..c37dd6faca --- /dev/null +++ b/model/registry/deprecated/log.yaml @@ -0,0 +1,19 @@ +groups: + - id: registry.log.file.deprecated + prefix: log.file + type: attribute_group + brief: 'Deprecated log attributes.' + attributes: + - id: name + type: string + examples: ["audit.log"] + stability: experimental + brief: "Deprecated, use `file.name` instead." + deprecated: "Replaced by `file.name`." + - id: path + type: string + examples: [ "/var/log/mysql/audit.log"] + stability: experimental + brief: "Deprecated, use `file.path` instead." + deprecated: "Replaced by `file.path`." + diff --git a/model/registry/log.yaml b/model/registry/log.yaml new file mode 100644 index 0000000000..b752eaf763 --- /dev/null +++ b/model/registry/log.yaml @@ -0,0 +1,60 @@ +groups: + - id: registry.log + type: attribute_group + prefix: log + brief: > + This document defines log attributes + attributes: + - id: iostream + stability: experimental + brief: > + The stream associated with the log. See below for a list of well-known values. + type: + allow_custom_values: true + members: + - id: stdout + value: 'stdout' + brief: 'Logs from stdout stream' + stability: experimental + - id: stderr + value: 'stderr' + brief: 'Events from stderr stream' + stability: experimental + + - id: registry.log.file #TODO: replace with file namespace once re-use is implemented + type: attribute_group + prefix: log.file + brief: > + Attributes for a file to which log was emitted. + attributes: + - id: name_resolved + type: string + stability: experimental + brief: > + The basename of the file, with symlinks resolved. + examples: [ "uuid.log" ] + - id: path_resolved + type: string + stability: experimental + brief: > + The full path to the file, with symlinks resolved. + examples: [ "/var/lib/docker/uuid.log" ] + + - id: registry.log.record + type: attribute_group + prefix: log.record + brief: > + This document defines the generic attributes that may be used in any Log Record. + attributes: + - id: uid + type: string + stability: experimental + brief: > + A unique identifier for the Log Record. + note: > + If an id is provided, other log records with the same id will be considered duplicates and can be removed safely. + This means, that two distinguishable log records MUST have different values. + + The id MAY be an [Universally Unique Lexicographically Sortable Identifier (ULID)](https://github.com/ulid/spec), + but other identifiers (e.g. UUID) may be used as needed. + examples: ["01ARZ3NDEKTSV4RRFFQ69G5FAV"] diff --git a/schema-next.yaml b/schema-next.yaml index b893a50d4e..b231263adc 100644 --- a/schema-next.yaml +++ b/schema-next.yaml @@ -2,6 +2,13 @@ file_format: 1.1.0 schema_url: https://opentelemetry.io/schemas/next versions: next: + logs: + changes: + - # https://github.com/open-telemetry/semantic-conventions/pull/908 + - rename_attributes: + attribute_map: + log.file.name: file.name + log.file.path: file.path 1.25.0: spans: From 150a92c31270304a9d109de667df1fb54a8d21a3 Mon Sep 17 00:00:00 2001 From: Alexandra Konrad Date: Mon, 8 Apr 2024 22:56:09 +0200 Subject: [PATCH 2/4] update todo --- model/registry/log.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/registry/log.yaml b/model/registry/log.yaml index b752eaf763..21bd9daac3 100644 --- a/model/registry/log.yaml +++ b/model/registry/log.yaml @@ -21,7 +21,7 @@ groups: brief: 'Events from stderr stream' stability: experimental - - id: registry.log.file #TODO: replace with file namespace once re-use is implemented + - id: registry.log.file #TODO: should we move it to the file model? type: attribute_group prefix: log.file brief: > From b59190c48b8dfbdcbc06637e98e8ab23d7a3f86a Mon Sep 17 00:00:00 2001 From: Alexandra Konrad Date: Mon, 8 Apr 2024 22:58:22 +0200 Subject: [PATCH 3/4] make yaml happy --- model/registry/deprecated/log.yaml | 1 - model/registry/log.yaml | 2 +- schema-next.yaml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/model/registry/deprecated/log.yaml b/model/registry/deprecated/log.yaml index c37dd6faca..0a1542b1a6 100644 --- a/model/registry/deprecated/log.yaml +++ b/model/registry/deprecated/log.yaml @@ -16,4 +16,3 @@ groups: stability: experimental brief: "Deprecated, use `file.path` instead." deprecated: "Replaced by `file.path`." - diff --git a/model/registry/log.yaml b/model/registry/log.yaml index 21bd9daac3..08f01515c6 100644 --- a/model/registry/log.yaml +++ b/model/registry/log.yaml @@ -21,7 +21,7 @@ groups: brief: 'Events from stderr stream' stability: experimental - - id: registry.log.file #TODO: should we move it to the file model? + - id: registry.log.file # TODO: should we move it to the file model? type: attribute_group prefix: log.file brief: > diff --git a/schema-next.yaml b/schema-next.yaml index b231263adc..95de97c0bc 100644 --- a/schema-next.yaml +++ b/schema-next.yaml @@ -4,7 +4,7 @@ versions: next: logs: changes: - - # https://github.com/open-telemetry/semantic-conventions/pull/908 + # https://github.com/open-telemetry/semantic-conventions/pull/908 - rename_attributes: attribute_map: log.file.name: file.name From 48d81880155a30adf454c553b3a126a2e7fc3005 Mon Sep 17 00:00:00 2001 From: Alexandra Konrad Date: Wed, 17 Apr 2024 12:43:03 +0200 Subject: [PATCH 4/4] revert extraction of file to dedicated NS --- .chloggen/log.yaml | 22 ---------------------- docs/attributes-registry/log.md | 12 ++---------- docs/general/logs.md | 4 ++-- model/logs/media.yaml | 4 ++-- model/registry/deprecated/log.yaml | 18 ------------------ model/registry/log.yaml | 12 ++++++++++++ schema-next.yaml | 7 ------- 7 files changed, 18 insertions(+), 61 deletions(-) delete mode 100755 .chloggen/log.yaml delete mode 100644 model/registry/deprecated/log.yaml diff --git a/.chloggen/log.yaml b/.chloggen/log.yaml deleted file mode 100755 index 82db451d6a..0000000000 --- a/.chloggen/log.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# 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: breaking - -# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db) -component: log - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Rename `log.file.name` to `file.name` and `log.file.path` to `file.path`. Deprecate old names. - -# 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: [908] - -# (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: diff --git a/docs/attributes-registry/log.md b/docs/attributes-registry/log.md index 31fcb2a379..89c5145c1b 100644 --- a/docs/attributes-registry/log.md +++ b/docs/attributes-registry/log.md @@ -9,7 +9,6 @@ - [Generic log attributes](#generic-log-attributes) - [File log attributes](#file-log-attributes) - [Record log attributes](#record-log-attributes) - - [Deprecated log attributes](#deprecated-log-attributes) @@ -35,7 +34,9 @@ | Attribute | Type | Description | Examples | Stability | |---|---|---|---|---| +| `log.file.name` | string | The basename of the file. | `audit.log` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `log.file.name_resolved` | string | The basename of the file, with symlinks resolved. | `uuid.log` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `log.file.path` | string | The full path to the file. | `/var/log/mysql/audit.log` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `log.file.path_resolved` | string | The full path to the file, with symlinks resolved. | `/var/lib/docker/uuid.log` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | @@ -48,13 +49,4 @@ **[1]:** If an id is provided, other log records with the same id will be considered duplicates and can be removed safely. This means, that two distinguishable log records MUST have different values. The id MAY be an [Universally Unique Lexicographically Sortable Identifier (ULID)](https://github.com/ulid/spec), but other identifiers (e.g. UUID) may be used as needed. - - -### Deprecated log attributes - - -| Attribute | Type | Description | Examples | Stability | -|---|---|---|---|---| -| `log.file.name` | string | Deprecated, use `file.name` instead. | `audit.log` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)
Replaced by `file.name`. | -| `log.file.path` | string | Deprecated, use `file.path` instead. | `/var/log/mysql/audit.log` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)
Replaced by `file.path`. | \ No newline at end of file diff --git a/docs/general/logs.md b/docs/general/logs.md index 441af6ff3c..cd443a3b2d 100644 --- a/docs/general/logs.md +++ b/docs/general/logs.md @@ -59,9 +59,9 @@ As such, these should be recorded as Log Record attributes when applicable. They | Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability | |---|---|---|---|---|---| -| [`file.name`](../attributes-registry/file.md) | string | Name of the file including the extension, without the directory. | `example.png` | `Recommended` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | -| [`file.path`](../attributes-registry/file.md) | string | Full path to the file, including the file name. It should include the drive letter, when appropriate. | `/home/alice/example.png`; `C:\Program Files\MyApp\myapp.exe` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| [`log.file.name`](../attributes-registry/log.md) | string | The basename of the file. | `audit.log` | `Recommended` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | [`log.file.name_resolved`](../attributes-registry/log.md) | string | The basename of the file, with symlinks resolved. | `uuid.log` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| [`log.file.path`](../attributes-registry/log.md) | string | The full path to the file. | `/var/log/mysql/audit.log` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | [`log.file.path_resolved`](../attributes-registry/log.md) | string | The full path to the file, with symlinks resolved. | `/var/lib/docker/uuid.log` | `Opt-In` | ![Experimental](https://img.shields.io/badge/-experimental-blue) | diff --git a/model/logs/media.yaml b/model/logs/media.yaml index 8aa9ac5bfe..34c7631d5c 100644 --- a/model/logs/media.yaml +++ b/model/logs/media.yaml @@ -11,9 +11,9 @@ groups: brief: > A file to which log was emitted. attributes: - - ref: file.name + - ref: log.file.name requirement_level: recommended - - ref: file.path + - ref: log.file.path requirement_level: opt_in - ref: log.file.name_resolved requirement_level: opt_in diff --git a/model/registry/deprecated/log.yaml b/model/registry/deprecated/log.yaml deleted file mode 100644 index 0a1542b1a6..0000000000 --- a/model/registry/deprecated/log.yaml +++ /dev/null @@ -1,18 +0,0 @@ -groups: - - id: registry.log.file.deprecated - prefix: log.file - type: attribute_group - brief: 'Deprecated log attributes.' - attributes: - - id: name - type: string - examples: ["audit.log"] - stability: experimental - brief: "Deprecated, use `file.name` instead." - deprecated: "Replaced by `file.name`." - - id: path - type: string - examples: [ "/var/log/mysql/audit.log"] - stability: experimental - brief: "Deprecated, use `file.path` instead." - deprecated: "Replaced by `file.path`." diff --git a/model/registry/log.yaml b/model/registry/log.yaml index 08f01515c6..b26870a696 100644 --- a/model/registry/log.yaml +++ b/model/registry/log.yaml @@ -27,6 +27,18 @@ groups: brief: > Attributes for a file to which log was emitted. attributes: + - id: name + type: string + stability: experimental + brief: > + The basename of the file. + examples: [ "audit.log" ] + - id: path + type: string + stability: experimental + brief: > + The full path to the file. + examples: [ "/var/log/mysql/audit.log" ] - id: name_resolved type: string stability: experimental diff --git a/schema-next.yaml b/schema-next.yaml index 3a41331b8b..430901253a 100644 --- a/schema-next.yaml +++ b/schema-next.yaml @@ -2,13 +2,6 @@ file_format: 1.1.0 schema_url: https://opentelemetry.io/schemas/next versions: next: - logs: - changes: - # https://github.com/open-telemetry/semantic-conventions/pull/908 - - rename_attributes: - attribute_map: - log.file.name: file.name - log.file.path: file.path 1.25.0: spans: