Merge branch 'main' into attribute-templates

CHANGELOG.md

@@ -114,6 +114,8 @@ release.
   ([#296](https://github.com/open-telemetry/semantic-conventions/pull/296))
 - Introducing Android `android.os.api_level` resource attribute.
   ([#328](https://github.com/open-telemetry/semantic-conventions/pull/328))
+- Added `os.build_id` resource attribute.
+  ([#293](https://github.com/open-telemetry/semantic-conventions/pull/293))
 
 ## v1.21.0 (2023-07-13)
 

docs/http/http-spans.md

@@ -362,10 +362,6 @@ This span type represents an inbound HTTP request.
 
 For an HTTP server span, `SpanKind` MUST be `Server`.
 
-Given an inbound request for a route (e.g. `"/users/:userID?"`) the `name` attribute of the span SHOULD be set to this route.
-
-If the route cannot be determined, the `name` attribute MUST be set as defined in the general semantic conventions for HTTP.
-
 <!-- semconv trace.http.server(full) -->
 | Attribute  | Type | Description  | Examples  | Requirement Level |
 |---|---|---|---|---|

docs/resource/README.md

@@ -62,7 +62,6 @@ These are the attributes which MAY be configurable via a dedicated environment v
 as specified in [OpenTelemetry Environment Variable Specification](https://github.com/open-telemetry/opentelemetry-specification/tree/v1.22.0/specification/configuration/sdk-environment-variables.md):
 
 - [`service.name`](#service)
-- [`service.version`](#service)
 
 ## Semantic Attributes with SDK-provided Default Value
 

docs/resource/os.md

@@ -15,6 +15,7 @@ In case of virtualized environments, this is the operating system as it is obser
 | `os.description` | string | Human readable (not intended to be parsed) OS version information, like e.g. reported by `ver` or `lsb_release -a` commands. | `Microsoft Windows [Version 10.0.18363.778]`; `Ubuntu 18.04.1 LTS` | Recommended |
 | `os.name` | string | Human readable operating system name. | `iOS`; `Android`; `Ubuntu` | Recommended |
 | `os.version` | string | The version string of the operating system as defined in [Version Attributes](/docs/resource/README.md#version-attributes). | `14.2.1`; `18.04.1` | Recommended |
+| `os.build_id` | string | Unique identifier for a particular build or compilation of the operating system. | `TQ3C.230805.001.B2`; `20E247`; `22621` | Recommended |
 
 `os.type` 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.
 

model/resource/os.yaml

@@ -63,3 +63,7 @@ groups:
           The version string of the operating system as defined in
           [Version Attributes](/docs/resource/README.md#version-attributes).
         examples: ['14.2.1', '18.04.1']
+      - id: build_id
+        type: string
+        brief: 'Unique identifier for a particular build or compilation of the operating system.'
+        examples: ['TQ3C.230805.001.B2', '20E247', '22621']