From e37eac79943586b6b4e18c8e0bb2d061d4850cb4 Mon Sep 17 00:00:00 2001 From: Joao Grassi Date: Fri, 12 Jan 2024 14:01:13 -0300 Subject: [PATCH] Revert "Clarify that service.* conventions apply to all telemetry sources" (#638) --- CHANGELOG.md | 3 --- docs/resource/README.md | 4 ++-- model/resource/service.yaml | 7 +------ model/resource/service_experimental.yaml | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dfe18a4a..6f597bc79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,9 +23,6 @@ release. ### Fixes -- Clarify that `service.*` attributes apply to all telemetry sources. - ([#630](https://github.com/open-telemetry/semantic-conventions/pull/630)) - ## v1.24.0 (2023-12-15) ### Breaking diff --git a/docs/resource/README.md b/docs/resource/README.md index 1c0b63718..a77cbd2f6 100644 --- a/docs/resource/README.md +++ b/docs/resource/README.md @@ -77,7 +77,7 @@ as specified in the [Resource SDK specification](https://github.com/open-telemet **type:** `service` -**Description:** A telemetry source. OpenTelemetry has adopted a broad interpretation such that every telemetry source is a service. Examples include, but are not limited to: web services, hosts, mobile applications, browser application, edge computing devices, functions as a service, databases, message brokers, etc. Specific types of telemetry sources may have additional conventions defining domain specific information, but the `service` conventions are applicable to all telemetry sources. +**Description:** A service instance. | Attribute | Type | Description | Examples | Requirement Level | @@ -94,7 +94,7 @@ as specified in the [Resource SDK specification](https://github.com/open-telemet **type:** `service` -**Description:** Experimental additions to service. +**Description:** Additions to service instance. | Attribute | Type | Description | Examples | Requirement Level | diff --git a/model/resource/service.yaml b/model/resource/service.yaml index fc3d3a6c5..05b2e0269 100644 --- a/model/resource/service.yaml +++ b/model/resource/service.yaml @@ -3,12 +3,7 @@ groups: prefix: service type: resource brief: > - A telemetry source. OpenTelemetry has adopted a broad interpretation such that every - telemetry source is a service. Examples include, but are not limited to: web services, - hosts, mobile applications, browser application, edge computing devices, functions as - a service, databases, message brokers, etc. Specific types of telemetry sources may have - additional conventions defining domain specific information, but the `service` - conventions are applicable to all telemetry sources. + A service instance. attributes: - id: name type: string diff --git a/model/resource/service_experimental.yaml b/model/resource/service_experimental.yaml index 9103ac753..43c869ee3 100644 --- a/model/resource/service_experimental.yaml +++ b/model/resource/service_experimental.yaml @@ -3,7 +3,7 @@ groups: prefix: service type: resource brief: > - Experimental additions to service. + A service instance. attributes: - id: namespace type: string