Merge branch 'main' into migration-guide

README.md

@@ -34,6 +34,9 @@ Maintainers ([@open-telemetry/specs-semconv-maintainers](https://github.com/orgs
 - [Johannes Tax](https://github.com/pyohannes), Grafana Labs
 - [Josh Suereth](https://github.com/jsuereth), Google
 - [Liudmila Molkova](https://github.com/lmolkova), Microsoft
-- [Reiley Yang](https://github.com/reyang), Microsoft
+
+Emeritus Maintainers:
+
+- [Reiley Yang](https://github.com/reyang)
 
 _Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer)._

dependencies.Dockerfile

@@ -6,7 +6,7 @@
 FROM otel/weaver:v0.10.0 AS weaver
 
 # OPA is used to test policies enforced by weaver.
-FROM openpolicyagent/opa:0.68.0 AS opa
+FROM openpolicyagent/opa:0.69.0 AS opa
 
 # Semconv gen is used for backwards compatibility checks.
 # TODO(jsuereth): Remove this when no longer used.

policies/compatibility.rego

@@ -160,7 +160,7 @@ deny contains back_comp_violation(description, group_id, attr.name) if {
      some nmember in nattr.type.members
      member.id == nmember.id
 
-     # Enforce the policy    
+     # Enforce the policy
      member.stability == "stable"
      nmember.stability != "stable"
 
@@ -184,7 +184,7 @@ deny contains back_comp_violation(description, group_id, attr.name) if {
      some nmember in nattr.type.members
      member.id == nmember.id
 
-     # Enforce the policy    
+     # Enforce the policy
      member.value != nmember.value
 
      # Generate human readable error.
@@ -294,7 +294,7 @@ deny contains back_comp_violation(description, group_id, "") if {
     metric.stability == "stable"
     some nmetric in registry_metrics
     metric.metric_name = nmetric.metric_name
-    
+
     baseline_attributes := { attr.name |
         some attr in metric.attributes
         not is_opt_in(attr)
@@ -321,7 +321,7 @@ deny contains back_comp_violation(description, group_id, "") if {
     metric.stability == "stable"
     some nmetric in registry_metrics
     metric.metric_name = nmetric.metric_name
-    
+
     baseline_attributes := { attr.name |
         some attr in metric.attributes
         not is_opt_in(attr)
@@ -385,8 +385,9 @@ deny contains back_comp_violation(description, group_id, "") if {
     some resource in baseline_resources
     resource.stability == "stable"
     some nresource in registry_resources
-    resource.name = nresource.name
-
+    resource.name == nresource.name
+    nresource.stability == "stable" # remove after https://github.com/open-telemetry/semantic-conventions/pull/1423 is merged
+
     baseline_attributes := { attr.name |
         some attr in resource.attributes
         not is_opt_in(attr)