Undid json formatting. Added changelog.

open-telemetry · Sep 5, 2023 · 602b90f · 602b90f
1 parent 5be0992
commit 602b90f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 72 deletions.
diff --git a/semantic-conventions/CHANGELOG.md b/semantic-conventions/CHANGELOG.md
@@ -6,6 +6,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
 

diff --git a/semantic-conventions/semconv.schema.json b/semantic-conventions/semconv.schema.json
@@ -9,32 +9,16 @@
 			"items": {
 				"anyOf": [
 					{
-						"allOf": [
-							{
-								"$ref": "#/definitions/SemanticConvention"
-							}
-						]
+						"allOf": [{"$ref": "#/definitions/SemanticConvention"}]
 					},
 					{
-						"allOf": [
-							{
-								"$ref": "#/definitions/SpanSemanticConvention"
-							}
-						]
+						"allOf": [{"$ref": "#/definitions/SpanSemanticConvention"}]
 					},
 					{
-						"allOf": [
-							{
-								"$ref": "#/definitions/EventSemanticConvention"
-							}
-						]
+						"allOf": [{"$ref": "#/definitions/EventSemanticConvention"}]
 					},
 					{
-						"allOf": [
-							{
-								"$ref": "#/definitions/MetricSemanticConvention"
-							}
-						]
+						"allOf": [{"$ref": "#/definitions/MetricSemanticConvention"}]
 					}
 				]
 			}
@@ -149,11 +133,7 @@
 			}
 		},
 		"SpanSemanticConvention": {
-			"allOf": [
-				{
-					"$ref": "#/definitions/SemanticConventionBase"
-				}
-			],
+			"allOf": [{ "$ref": "#/definitions/SemanticConventionBase" }],
 			"properties": {
 				"type": {
 					"type": "string",
@@ -173,11 +153,7 @@
 			}
 		},
 		"EventSemanticConvention": {
-			"allOf": [
-				{
-					"$ref": "#/definitions/SemanticConventionBase"
-				}
-			],
+			"allOf": [{ "$ref": "#/definitions/SemanticConventionBase" }],
 			"properties": {
 				"type": {
 					"type": "string",
@@ -189,27 +165,13 @@
 				}
 			},
 			"anyOf": [
-				{
-					"required": [
-						"prefix"
-					]
-				},
-				{
-					"required": [
-						"name"
-					]
-				}
+				{"required": ["prefix"]},
+				{"required": ["name"]}
 			]
 		},
 		"MetricGroupSemanticConvention": {
-			"allOf": [
-				{
-					"$ref": "#/definitions/SemanticConventionBase"
-				}
-			],
-			"required": [
-				"type"
-			],
+			"allOf": [{ "$ref": "#/definitions/SemanticConventionBase" }],
+			"required": ["type"],
 			"properties": {
 				"type": {
 					"type": "string",
@@ -218,11 +180,7 @@
 			}
 		},
 		"MetricSemanticConvention": {
-			"allOf": [
-				{
-					"$ref": "#/definitions/SemanticConventionBase"
-				}
-			],
+			"allOf": [{ "$ref": "#/definitions/SemanticConventionBase" }],
 			"required": [
 				"type",
 				"metric_name",
@@ -255,22 +213,13 @@
 			}
 		},
 		"SemanticConvention": {
-			"allOf": [
-				{
-					"$ref": "#/definitions/SemanticConventionBase"
-				}
-			],
-			"required": [
-				"type"
-			],
+			"allOf": [{ "$ref": "#/definitions/SemanticConventionBase" }],
+			"required": ["type"],
 			"properties": {
 				"type": {
 					"type": "string",
 					"not": {
-						"enum": [
-							"span",
-							"event"
-						]
+						"enum": ["span", "event"]
 					}
 				}
 			}
@@ -456,14 +405,10 @@
 						},
 						"examples": {
 							"anyOf": [
-								{
-									"$ref": "#/definitions/ValueType"
-								},
+								{ "$ref": "#/definitions/ValueType" },
 								{
 									"type": "array",
-									"items": {
-										"$ref": "#/definitions/ValueType"
-									}
+									"items": { "$ref": "#/definitions/ValueType" }
 								}
 							],
 							"description": "sequence/dictionary of example values for the attribute. They are optional for boolean, int, double, and enum attributes. Example values must be of the same type of the attribute. If only a single example is provided, it can directly be reported without encapsulating it into a sequence/dictionary."
@@ -487,4 +432,4 @@
 			]
 		}
 	}
-}
+}