Merge branch 'main' into remove-constraints

open-telemetry · May 2, 2024 · 075074e · 075074e
2 parents 184920c + 3d2d023
commit 075074e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/semantic-conventions/semconv.schema.json b/semantic-conventions/semconv.schema.json
@@ -83,6 +83,10 @@
 						"$ref": "#/definitions/Attribute"
 					},
 					"description": "list of attributes that belong to the semconv"
+				},
+				"display_name": {
+					"type": "string",
+					"description": "the display name / title of the attribute group."
 				}
 			}
 		},

diff --git a/semantic-conventions/src/opentelemetry/semconv/model/semantic_convention.py b/semantic-conventions/src/opentelemetry/semconv/model/semantic_convention.py
@@ -110,6 +110,7 @@ class BaseSemanticConvention(ValidatableYamlNode):
         "extends",
         "attributes",
         "deprecated",
+        "display_name",
     )
 
     GROUP_TYPE_NAME: str