cleanup

Author: lmolkova

CHANGELOG.md

@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 
 # Unreleased
 
+- Reject v2 entity refinements that change the base entity's identity. ([#TODO](https://github.com/open-telemetry/weaver/pull/TODO) by @lmolkova)
 - Represent v2 entity refinements in the resolved and materialized schema, allow to refine identity attributes. ([#1588](https://github.com/open-telemetry/weaver/pull/1588) by @lmolkova)
 - Support signal refinements over a published dependency. ([#1587](https://github.com/open-telemetry/weaver/pull/1587) by @lmolkova)
 - Fix panic when a registry, policy, or template path uses a commit SHA. ([#1414](https://github.com/open-telemetry/weaver/pull/1414))

crates/weaver_resolver/src/registry.rs

@@ -573,7 +573,11 @@ fn resolve_extends_references(ureg: &mut UnresolvedRegistry) -> Result<(), Error
                     errors.push(err);
                     continue;
                 }
-                if unresolved_group.is_v2 && unresolved_group.group.r#type == GroupType::Entity {
+                // Only meaningful when refining another entity
+                if unresolved_group.is_v2
+                    && unresolved_group.group.r#type == GroupType::Entity
+                    && parent_summary.r#type == GroupType::Entity
+                {
                     fatal_errors.extend(entity_identity_refinement_errors(
                         unresolved_group,
                         extends,
@@ -744,7 +748,8 @@ fn resolve_extends_references(ureg: &mut UnresolvedRegistry) -> Result<(), Error
     }
 }
 
-/// Errors when an entity refinement alters the identity of the base entity.
+/// Errors when an entity refinement alters the identity of the base entity
+/// (demoting, promoting, or adding an identity attribute).
 fn entity_identity_refinement_errors(
     group: &UnresolvedGroup,
     extends: &str,

crates/weaver_semconv/src/v2/mod.rs

@@ -125,8 +125,7 @@ impl SemConvSpecV2 {
     /// that is elevated to an error under `--future`.
     ///
     /// It also rejects entities and entity refinements that list the same
-    /// attribute under both `identity` and `description` — the two lists
-    /// assign contradicting roles, so this is a fatal definition error.
+    /// attribute under both `identity` and `description`.
     pub(crate) fn validate(self, provenance: &str) -> WResult<Self, Error> {
         let mut errors: Vec<Error> = vec![];
         let mut fatal_errors: Vec<Error> = vec![];

schemas/semconv-syntax.v2.md

@@ -415,7 +415,7 @@ An entity refinement definition consists of the following properties:
 - `id` - Required. Uniquely identifies the entity refinement.
 - `ref` - Required. The name of the entity being refined.
 - `identity` - Optional. List of [attribute references](#attribute-reference) refining identity attributes of the entity. Attributes listed here have the identifying role, so an identity attribute of the base entity can be refined (`brief`, `note`, `examples`, etc.) while keeping its role. A refinement must **not change the identity** of the base entity: it may only list attribute keys the base entity already declares under `identity`.
-- `description` - Optional. The additional attributes to describe the Entity. Attributes listed here have the descriptive role.
+- `description` - Optional. The additional attributes to describe the Entity. Attributes listed here have the descriptive role. As with entity definitions, the same attribute must **not** appear under both `identity` and `description`.
 - `brief` - Optional. Refines the brief description of the signal.
 - `note` - Optional. Refines the more elaborate description of the signal.
 - `stability` - Optional. Refines the stability of the signal.