From a9fe0c6e322d8f4727cc4b82c95dd53261a6cdaf Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Wed, 9 Oct 2024 08:29:19 -0700 Subject: [PATCH 1/3] Fix failing resource back compat checks (#1459) --- policies/compatibility.rego | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/policies/compatibility.rego b/policies/compatibility.rego index 1b376a169e..5d3a1c6665 100644 --- a/policies/compatibility.rego +++ b/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) From 7c7957417f309f4f57643d2551042545e19d5f17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 08:58:23 -0700 Subject: [PATCH 2/3] Bump openpolicyagent/opa from 0.68.0 to 0.69.0 (#1454) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dependencies.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.Dockerfile b/dependencies.Dockerfile index 9423ce0749..ec9d99157d 100644 --- a/dependencies.Dockerfile +++ b/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. From 6c1c9761263693307c5e7a10275a8b929b72695d Mon Sep 17 00:00:00 2001 From: Reiley Yang Date: Wed, 9 Oct 2024 11:10:48 -0700 Subject: [PATCH 3/3] Move Reiley to Emeritus (#1451) --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c0b2d5ce4..6227be7ca2 100644 --- a/README.md +++ b/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)._