Merge branch 'main' into v21

semantic-conventions/CHANGELOG.md

@@ -8,6 +8,8 @@ Please update the changelog as part of any significant pull request.
 
 - Render template-type attributes from yaml files
   ([#186](https://github.com/open-telemetry/build-tools/pull/186))
+- Fix conditionally_required definition in semconv.schema.json
+  ([#201](https://github.com/open-telemetry/build-tools/pull/201))
 
 ## v0.20.0
 

semantic-conventions/semconv.schema.json

@@ -349,7 +349,7 @@
 				{
 					"properties": {
 						"requirement_level": {
-							"description": "specifies the attribute requirement level. Can be 'required', 'conditionally_required', 'recommended', or 'opt_in'. When omitted, the attribute is 'recommended'. When set to 'conditionally_required', the string provided as <condition> MUST specify the conditions under which the attribute is required.",
+							"description": "specifies the attribute requirement level. Can be 'required', 'conditionally_required', 'recommended', or 'opt_in'. When omitted, the attribute is 'recommended'. When set to 'conditionally_required', the string provided MUST specify the conditions under which the attribute is required.",
 							"oneOf": [
 								{
 									"const": "required"
@@ -361,7 +361,7 @@
 										"conditionally_required"
 									],
 									"properties": {
-										"condition": {
+										"conditionally_required": {
 											"type": "string"
 										}
 									}