Skip to content

Commit 7d7d37a

Browse files
authored
[shared] Bump OTLP proto files to 1.5.0 (#6039)
1 parent 2906858 commit 7d7d37a

File tree

7 files changed

+273
-336
lines changed

7 files changed

+273
-336
lines changed
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414

1515
syntax = "proto3";
1616

17-
package opentelemetry.proto.collector.profiles.v1experimental;
17+
package opentelemetry.proto.collector.profiles.v1development;
1818

19-
import "opentelemetry/proto/profiles/v1experimental/profiles.proto";
19+
import "opentelemetry/proto/profiles/v1development/profiles.proto";
2020

21-
option csharp_namespace = "OpenTelemetry.Proto.Collector.Profiles.V1Experimental";
21+
option csharp_namespace = "OpenTelemetry.Proto.Collector.Profiles.V1Development";
2222
option java_multiple_files = true;
23-
option java_package = "io.opentelemetry.proto.collector.profiles.v1experimental";
23+
option java_package = "io.opentelemetry.proto.collector.profiles.v1development";
2424
option java_outer_classname = "ProfilesServiceProto";
25-
option go_package = "go.opentelemetry.io/proto/otlp/collector/profiles/v1experimental";
25+
option go_package = "go.opentelemetry.io/proto/otlp/collector/profiles/v1development";
2626

2727
// Service that can be used to push profiles between one Application instrumented with
2828
// OpenTelemetry and a collector, or between a collector and a central collector.
@@ -38,7 +38,7 @@ message ExportProfilesServiceRequest {
3838
// element. Intermediary nodes (such as OpenTelemetry Collector) that receive
3939
// data from multiple origins typically batch the data before forwarding further and
4040
// in that case this array will contain multiple elements.
41-
repeated opentelemetry.proto.profiles.v1experimental.ResourceProfiles resource_profiles = 1;
41+
repeated opentelemetry.proto.profiles.v1development.ResourceProfiles resource_profiles = 1;
4242
}
4343

4444
message ExportProfilesServiceResponse {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ type: google.api.Service
44
config_version: 3
55
http:
66
rules:
7-
- selector: opentelemetry.proto.collector.profiles.v1experimental.ProfilesService.Export
8-
post: /v1experimental/profiles
7+
- selector: opentelemetry.proto.collector.profiles.v1development.ProfilesService.Export
8+
post: /v1development/profiles
99
body: "*"

src/Shared/Proto/opentelemetry/proto/logs/v1/logs.proto

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ message ResourceLogs {
5656
repeated ScopeLogs scope_logs = 2;
5757

5858
// The Schema URL, if known. This is the identifier of the Schema that the resource data
59-
// is recorded in. To learn more about Schema URL see
59+
// is recorded in. Notably, the last part of the URL path is the version number of the
60+
// schema: http[s]://server[:port]/path/<version>. To learn more about Schema URL see
6061
// https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
6162
// This schema_url applies to the data in the "resource" field. It does not apply
6263
// to the data in the "scope_logs" field which have their own schema_url field.
@@ -74,7 +75,8 @@ message ScopeLogs {
7475
repeated LogRecord log_records = 2;
7576

7677
// The Schema URL, if known. This is the identifier of the Schema that the log data
77-
// is recorded in. To learn more about Schema URL see
78+
// is recorded in. Notably, the last part of the URL path is the version number of the
79+
// schema: http[s]://server[:port]/path/<version>. To learn more about Schema URL see
7880
// https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
7981
// This schema_url applies to all logs in the "logs" field.
8082
string schema_url = 3;
@@ -208,4 +210,18 @@ message LogRecord {
208210
// - the field is not present,
209211
// - the field contains an invalid value.
210212
bytes span_id = 10;
213+
214+
// A unique identifier of event category/type.
215+
// All events with the same event_name are expected to conform to the same
216+
// schema for both their attributes and their body.
217+
//
218+
// Recommended to be fully qualified and short (no longer than 256 characters).
219+
//
220+
// Presence of event_name on the log record identifies this record
221+
// as an event.
222+
//
223+
// [Optional].
224+
//
225+
// Status: [Development]
226+
string event_name = 12;
211227
}

src/Shared/Proto/opentelemetry/proto/metrics/v1/metrics.proto

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,24 @@ option go_package = "go.opentelemetry.io/proto/otlp/metrics/v1";
2929
// storage, OR can be embedded by other protocols that transfer OTLP metrics
3030
// data but do not implement the OTLP protocol.
3131
//
32+
// MetricsData
33+
// └─── ResourceMetrics
34+
// ├── Resource
35+
// ├── SchemaURL
36+
// └── ScopeMetrics
37+
// ├── Scope
38+
// ├── SchemaURL
39+
// └── Metric
40+
// ├── Name
41+
// ├── Description
42+
// ├── Unit
43+
// └── data
44+
// ├── Gauge
45+
// ├── Sum
46+
// ├── Histogram
47+
// ├── ExponentialHistogram
48+
// └── Summary
49+
//
3250
// The main difference between this message and collector protocol is that
3351
// in this message there will not be any "control" or "metadata" specific to
3452
// OTLP protocol.
@@ -56,7 +74,8 @@ message ResourceMetrics {
5674
repeated ScopeMetrics scope_metrics = 2;
5775

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

7695
// The Schema URL, if known. This is the identifier of the Schema that the metric data
77-
// is recorded in. To learn more about Schema URL see
96+
// is recorded in. Notably, the last part of the URL path is the version number of the
97+
// schema: http[s]://server[:port]/path/<version>. To learn more about Schema URL see
7898
// https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
7999
// This schema_url applies to all metrics in the "metrics" field.
80100
string schema_url = 3;
@@ -85,7 +105,6 @@ message ScopeMetrics {
85105
//
86106
// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/data-model.md
87107
//
88-
//
89108
// The data model and relation between entities is shown in the
90109
// diagram below. Here, "DataPoint" is the term used to refer to any
91110
// one of the specific data point value types, and "points" is the term used
@@ -97,7 +116,7 @@ message ScopeMetrics {
97116
// - DataPoint contains timestamps, attributes, and one of the possible value type
98117
// fields.
99118
//
100-
// Metric
119+
// Metric
101120
// +------------+
102121
// |name |
103122
// |description |
@@ -251,6 +270,9 @@ message ExponentialHistogram {
251270
// data type. These data points cannot always be merged in a meaningful way.
252271
// While they can be useful in some applications, histogram data points are
253272
// recommended for new applications.
273+
// Summary metrics do not have an aggregation temporality field. This is
274+
// because the count and sum fields of a SummaryDataPoint are assumed to be
275+
// cumulative values.
254276
message Summary {
255277
repeated SummaryDataPoint data_points = 1;
256278
}
@@ -589,7 +611,8 @@ message ExponentialHistogramDataPoint {
589611
}
590612

591613
// SummaryDataPoint is a single data point in a timeseries that describes the
592-
// time-varying values of a Summary metric.
614+
// time-varying values of a Summary metric. The count and sum fields represent
615+
// cumulative values.
593616
message SummaryDataPoint {
594617
reserved 1;
595618

0 commit comments

Comments
 (0)