Merge branch 'main' into patch-6

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 The full list of changes can be found in the compare view for the respective release at <https://github.com/open-telemetry/opentelemetry-proto/releases>.
 
+### Added
+
+- logs: Add top-level `event_name` field to log records instead of `event.name` attribute. [#600](https://github.com/open-telemetry/opentelemetry-proto/pull/600)
+
 ## 1.4.0 - 2024-11-20
 
 ### Added

opentelemetry/proto/logs/v1/logs.proto

@@ -56,7 +56,8 @@ message ResourceLogs {
   repeated ScopeLogs scope_logs = 2;
 
   // The Schema URL, if known. This is the identifier of the Schema that the resource data
-  // is recorded in. To learn more about Schema URL see
+  // is recorded in. Notably, the last part of the URL path is the version number of the
+  // schema: http[s]://server[:port]/path/<version>. To learn more about Schema URL see
   // https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
   // This schema_url applies to the data in the "resource" field. It does not apply
   // to the data in the "scope_logs" field which have their own schema_url field.
@@ -74,7 +75,8 @@ message ScopeLogs {
   repeated LogRecord log_records = 2;
 
   // The Schema URL, if known. This is the identifier of the Schema that the log data
-  // is recorded in. To learn more about Schema URL see
+  // is recorded in. Notably, the last part of the URL path is the version number of the
+  // schema: http[s]://server[:port]/path/<version>. To learn more about Schema URL see
   // https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
   // This schema_url applies to all logs in the "logs" field.
   string schema_url = 3;
@@ -208,4 +210,18 @@ message LogRecord {
   //   - the field is not present,
   //   - the field contains an invalid value.
   bytes span_id = 10;
+
+  // A unique identifier of event category/type.
+  // All events with the same event_name are expected to conform to the same
+  // schema for both their attributes and their body.
+  //
+  // Recommended to be fully qualified and short (no longer than 256 characters).
+  //
+  // Presence of event_name on the log record identifies this record
+  // as an event.
+  //
+  // [Optional].
+  //
+  // Status: [Development]
+  string event_name = 12;
 }

opentelemetry/proto/metrics/v1/metrics.proto

@@ -74,7 +74,8 @@ message ResourceMetrics {
   repeated ScopeMetrics scope_metrics = 2;
 
   // The Schema URL, if known. This is the identifier of the Schema that the resource data
-  // is recorded in. To learn more about Schema URL see
+  // is recorded in. Notably, the last part of the URL path is the version number of the
+  // schema: http[s]://server[:port]/path/<version>. To learn more about Schema URL see
   // https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
   // This schema_url applies to the data in the "resource" field. It does not apply
   // to the data in the "scope_metrics" field which have their own schema_url field.
@@ -92,7 +93,8 @@ message ScopeMetrics {
   repeated Metric metrics = 2;
 
   // The Schema URL, if known. This is the identifier of the Schema that the metric data
-  // is recorded in. To learn more about Schema URL see
+  // is recorded in. Notably, the last part of the URL path is the version number of the
+  // schema: http[s]://server[:port]/path/<version>. To learn more about Schema URL see
   // https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
   // This schema_url applies to all metrics in the "metrics" field.
   string schema_url = 3;

opentelemetry/proto/profiles/v1development/profiles.proto

@@ -122,7 +122,8 @@ message ResourceProfiles {
   repeated ScopeProfiles scope_profiles = 2;
 
   // The Schema URL, if known. This is the identifier of the Schema that the resource data
-  // is recorded in. To learn more about Schema URL see
+  // is recorded in. Notably, the last part of the URL path is the version number of the
+  // schema: http[s]://server[:port]/path/<version>. To learn more about Schema URL see
   // https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
   // This schema_url applies to the data in the "resource" field. It does not apply
   // to the data in the "scope_profiles" field which have their own schema_url field.
@@ -140,7 +141,8 @@ message ScopeProfiles {
   repeated Profile profiles = 2;
 
   // The Schema URL, if known. This is the identifier of the Schema that the profile data
-  // is recorded in. To learn more about Schema URL see
+  // is recorded in. Notably, the last part of the URL path is the version number of the
+  // schema: http[s]://server[:port]/path/<version>. To learn more about Schema URL see
   // https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
   // This schema_url applies to all profiles in the "profiles" field.
   string schema_url = 3;

opentelemetry/proto/trace/v1/trace.proto

@@ -56,7 +56,8 @@ message ResourceSpans {
   repeated ScopeSpans scope_spans = 2;
 
   // The Schema URL, if known. This is the identifier of the Schema that the resource data
-  // is recorded in. To learn more about Schema URL see
+  // is recorded in. Notably, the last part of the URL path is the version number of the
+  // schema: http[s]://server[:port]/path/<version>. To learn more about Schema URL see
   // https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
   // This schema_url applies to the data in the "resource" field. It does not apply
   // to the data in the "scope_spans" field which have their own schema_url field.
@@ -74,7 +75,8 @@ message ScopeSpans {
   repeated Span spans = 2;
 
   // The Schema URL, if known. This is the identifier of the Schema that the span data
-  // is recorded in. To learn more about Schema URL see
+  // is recorded in. Notably, the last part of the URL path is the version number of the
+  // schema: http[s]://server[:port]/path/<version>. To learn more about Schema URL see
   // https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
   // This schema_url applies to all spans and span events in the "spans" field.
   string schema_url = 3;