Merge branch 'main' into remove-unused-semconv

open-telemetry · May 2, 2024 · f3765a1 · f3765a1
2 parents 766c8af + 3d2d023
commit f3765a1
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
@@ -127,6 +127,10 @@
 							}
 						]
 					}
+				},
+				"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
@@ -111,6 +111,7 @@ class BaseSemanticConvention(ValidatableYamlNode):
         "attributes",
         "constraints",
         "deprecated",
+        "display_name",
     )
 
     GROUP_TYPE_NAME: str
-Original file line number
+Diff line change
@@ Expand Up / @@ -127,6 +127,10 @@ @@
     							}
     						]
     					}
+    				},
+    				"display_name": {
+    					"type": "string",
+    					"description": "the display name / title of the attribute group."
     				}
     			}
     		},
@@ Expand Down @@