generate resolved schema and diff for stable and dev versions

Author: Liudmila Molkova

Makefile

@@ -367,3 +367,42 @@ generate-schema-next:
 		--output /home/weaver/target
 		# --param next_version=$(NEXT_SEMCONV_VERSION)		
 	$(TOOLS_DIR)/scripts/generate-schema-next.sh $(NEXT_SEMCONV_VERSION) $(LATEST_RELEASED_SEMCONV_VERSION) $(TOOLS_DIR)/bin/schema-diff.yaml
+
+SCHEMAS_PATH = $(PWD)/schemas
+.PHONY: generate-schema-v2-dev
+generate-schema-v2-dev:
+	$(DOCKER_RUN) --rm \
+	$(DOCKER_USER_IS_HOST_USER_ARG) \
+	--mount 'type=bind,source=$(PWD)/internal/tools/scripts,target=/home/weaver/templates,readonly' \
+	--mount 'type=bind,source=$(PWD)/model,target=/home/weaver/source,readonly' \
+	--mount 'type=bind,source=$(SCHEMAS_PATH),target=/home/weaver/target' \
+	$(WEAVER_CONTAINER) registry generate \
+		--registry=/home/weaver/source \
+		--templates=/home/weaver/templates \
+		--param next_version=$(NEXT_SEMCONV_VERSION) \
+		--config=/home/weaver/templates/registry/schema-v2-weaver.yaml \
+		. \
+		/home/weaver/target
+
+	# TODO: diff does not have indication about stability, so we can only generate 
+	# dev diff
+	$(DOCKER_RUN) --rm \
+	$(DOCKER_USER_IS_HOST_USER_ARG) \
+	--mount 'type=bind,source=$(PWD)/internal/tools/scripts,target=/home/weaver/templates,readonly' \
+	--mount 'type=bind,source=$(PWD)/model,target=/home/weaver/source,readonly' \
+	--mount 'type=bind,source=$(SCHEMAS_PATH),target=/home/weaver/target' \
+	$(WEAVER_CONTAINER) registry diff \
+		--registry=/home/weaver/source \
+		--baseline-registry=https://github.com/open-telemetry/semantic-conventions/archive/refs/tags/v$(LATEST_RELEASED_SEMCONV_VERSION).zip[model] \
+		--diff-format yaml \
+		--diff-template /home/weaver/templates/schema-v2-diff \
+		--output /home/weaver/target
+	
+	# TODO: these commands should not be necessary:
+	$(SED) -i 's/semconv_version: unversioned/semconv_version: $(NEXT_SEMCONV_VERSION)/' $(SCHEMAS_PATH)/next-version-dev/schema-diff.yaml
+
+	rm -rf $(SCHEMAS_PATH)/${NEXT_SEMCONV_VERSION}-dev
+	mv $(SCHEMAS_PATH)/next-version-dev $(SCHEMAS_PATH)/${NEXT_SEMCONV_VERSION}-dev
+
+	rm -rf $(SCHEMAS_PATH)/${NEXT_SEMCONV_VERSION}
+	mv $(SCHEMAS_PATH)/next-version $(SCHEMAS_PATH)/${NEXT_SEMCONV_VERSION}

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.15.3@sha256:a84032d6eb95b81972d19de61f6ddc394a26976c1c1697cf9318bef4b4106976 AS weaver
+FROM otel/weaver:v0.15.2@sha256:b13acea09f721774daba36344861f689ac4bb8d6ecd94c4600b4d590c8fb34b9 AS weaver
 
 # OPA is used to test policies enforced by weaver.
 FROM openpolicyagent/opa:1.5.1@sha256:7d30d984125161b7f30599c6bdf80a6f2301dbbd526725714c231aad8179e4b9 AS opa

internal/tools/scripts/registry/schema-v2-weaver.yaml

@@ -0,0 +1,50 @@
+templates:
+  - pattern: schema.j2
+    filter: .
+    application_mode: single
+    file_name: next-version-dev/schema.yaml # how to parametrize this?
+  - pattern: schema.j2
+    filter: >
+      def filter_members:
+        if type == "array" then
+          map(select(.stability == "stable") | filter_members)
+        elif type == "object" then
+          if has("members") and (.members | type == "array") then
+            .members |= filter_members
+          else
+            .
+          end
+        else
+          .
+        end;
+
+      .groups |= map(
+        select(
+          (.stability == "stable") or
+          (
+            .type == "attribute_group" and
+            (.attributes | map(select(.stability == "stable")) | length > 0)
+          )
+        )
+        |
+        if .attributes then
+          .attributes |= map(
+            select(.stability == "stable")
+            |
+            if (.type | type == "object") and (.type.members) then
+              .type |= filter_members
+            else
+              .
+            end
+          )
+        else
+          .
+        end
+      )
+    application_mode: single
+    file_name: next-version/schema.yaml
+
+whitespace_control:
+  trim_blocks: true
+  lstrip_blocks: true
+  keep_trailing_newline: true

internal/tools/scripts/registry/schema.j2

@@ -0,0 +1,5 @@
+# TODO: toyaml generates some scrabbled output
+{#{{ ctx | toyaml }}#}
+
+{{ ctx | tojson(indent=true) }}
+

internal/tools/scripts/schema-v2-diff/yaml/schema-diff.j2

@@ -0,0 +1 @@
+{{ ctx | toyaml }}

internal/tools/scripts/schema-v2-diff/yaml/weaver.yaml

@@ -0,0 +1,9 @@
+templates:
+  - pattern: schema-diff.j2
+    filter: .
+    application_mode: single
+    file_name: next-version-dev/schema-diff.yaml # how to parametrize this?
+whitespace_control:
+  trim_blocks: true
+  lstrip_blocks: true
+  keep_trailing_newline: true

schemas/1.36.0-dev/schema-diff.yaml

@@ -0,0 +1,20 @@
+baseline:
+  semconv_version: v1.35.0
+changes:
+  events: []
+  metrics:
+  - name: metric.otel.sdk.span.ended.count
+    note: Obsoleted.
+    type: obsoleted
+  - name: metric.otel.sdk.span.started
+    type: added
+  - name: metric.otel.sdk.span.ended
+    note: Obsoleted.
+    type: obsoleted
+  registry_attributes:
+  - name: otel.span.parent.origin
+    type: added
+  resources: []
+  spans: []
+head:
+  semconv_version: 1.36.0