up

lmolkova · Nov 8, 2024 · 3a30378 · 3a30378
1 parent f0148dd
commit 3a30378
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/docs/resource/README.md b/docs/resource/README.md
@@ -196,8 +196,7 @@ All custom identifiers SHOULD be stable across different versions of an implemen
 
 ## Telemetry Distro
 
-<<<<<<< HEAD
-<!-- semconv telemetry.distro -->
+<!-- semconv resource.telemetry.distro -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->

diff --git a/model/telemetry/resources.yaml b/model/telemetry/resources.yaml
@@ -12,7 +12,7 @@ groups:
         requirement_level: required
       - ref: telemetry.sdk.version
         requirement_level: required
-  - id: telemetry.distro
+  - id: resource.telemetry.distro
     name: 'telemetry.distro'
     type: resource
     stability: experimental

diff --git a/policies/group_stability.rego b/policies/group_stability.rego
@@ -11,7 +11,7 @@ deny[group_stability_violation(description, group.id, name)] {
         # TODO: https://github.com/open-telemetry/semantic-conventions/issues/1514
         "metric.kestrel.connection.duration", "metric.kestrel.tls_handshake.duration",
         # TODO: https://github.com/open-telemetry/semantic-conventions/issues/1519
-        "service",
+        "resource.service",
     }
     not exceptions[group.id]