Merge branch 'main' into missing-display-names

open-telemetry · Dec 11, 2024 · ae87875 · ae87875
2 parents 84e8484 + a1de990
commit ae87875
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,7 +10,7 @@
         "MD040": false,
     },
     "yaml.schemas": {
-        "https://raw.githubusercontent.com/open-telemetry/weaver/v0.11.0/schemas/semconv.schema.json": [
+        "https://raw.githubusercontent.com/open-telemetry/weaver/v0.12.0/schemas/semconv.schema.json": [
             "model/**/*.yaml"
         ]
     },

diff --git a/dependencies.Dockerfile b/dependencies.Dockerfile
@@ -3,7 +3,7 @@
 # Dependabot can keep this file up to date with latest containers.
 
 # Weaver is used to generate markdown docs, and enforce policies on the model.
-FROM otel/weaver:v0.11.0 AS weaver
+FROM otel/weaver:v0.12.0 AS weaver
 
 # OPA is used to test policies enforced by weaver.
 FROM openpolicyagent/opa:0.70.0 AS opa

diff --git a/model/profile/registry.yaml b/model/profile/registry.yaml
@@ -12,7 +12,6 @@ groups:
           Describes the interpreter or compiler of a single frame.
         examples: ['cpython']
         type:
-          allow_custom_values: true
           members:
             - id: dotnet
               brief: >