From 5c264cb3036910244a0dfbf402fd5ca8a494466b Mon Sep 17 00:00:00 2001 From: Tyler Kenna Date: Fri, 15 Nov 2024 16:12:46 -0800 Subject: [PATCH] feature: Add LogRecord Support (#16) --- odddotproto/proto/common/v1/common.proto | 24 +- odddotproto/proto/common/v1/filters.proto | 20 +- odddotproto/proto/common/v1/properties.proto | 162 ++++++------ odddotproto/proto/logs/v1/flat_log.proto | 21 ++ .../proto/logs/v1/log_query_request.proto | 57 +++++ .../proto/logs/v1/log_query_response.proto | 15 ++ .../proto/logs/v1/log_query_service.proto | 16 ++ .../proto/metrics/v1/flat_metric.proto | 22 +- .../metrics/v1/metric_query_request.proto | 230 +++++++++--------- .../metrics/v1/metric_query_response.proto | 10 +- .../metrics/v1/metric_query_service.proto | 12 +- .../proto/resource/v1/resource_filters.proto | 18 +- odddotproto/proto/trace/v1/flat_span.proto | 24 +- .../proto/trace/v1/span_query_request.proto | 54 ++-- .../proto/trace/v1/span_query_response.proto | 10 +- .../proto/trace/v1/span_query_service.proto | 10 +- .../proto/trace/v1/span_reset_request.proto | 7 +- .../proto/trace/v1/span_reset_response.proto | 7 +- 18 files changed, 451 insertions(+), 268 deletions(-) create mode 100644 odddotproto/proto/logs/v1/flat_log.proto create mode 100644 odddotproto/proto/logs/v1/log_query_request.proto create mode 100644 odddotproto/proto/logs/v1/log_query_response.proto create mode 100644 odddotproto/proto/logs/v1/log_query_service.proto diff --git a/odddotproto/proto/common/v1/common.proto b/odddotproto/proto/common/v1/common.proto index e29f591..65c5151 100644 --- a/odddotproto/proto/common/v1/common.proto +++ b/odddotproto/proto/common/v1/common.proto @@ -3,19 +3,29 @@ syntax = "proto3"; package odddotnet.proto.common.v1; option csharp_namespace = "OddDotNet.Proto.Common.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.common.v1"; +option java_outer_classname = "CommonProto"; +option go_package = "go.odddotnet.io/proto/otlp/common/v1"; message Take { oneof value { - TakeFirst takeFirst = 1; - TakeAll takeAll = 2; - TakeExact takeExact = 3; + TakeFirst take_first = 1; + TakeAll take_all = 2; + TakeExact take_exact = 3; } } -message TakeFirst {} +message TakeFirst { +} -message TakeAll {} +message TakeAll { +} -message TakeExact { int32 count = 1; } +message TakeExact { + int32 count = 1; +} -message Duration { int32 milliseconds = 1; } \ No newline at end of file +message Duration { + int32 milliseconds = 1; +} \ No newline at end of file diff --git a/odddotproto/proto/common/v1/filters.proto b/odddotproto/proto/common/v1/filters.proto index b9450c6..59a3cb8 100644 --- a/odddotproto/proto/common/v1/filters.proto +++ b/odddotproto/proto/common/v1/filters.proto @@ -2,15 +2,19 @@ syntax = "proto3"; package odddotnet.proto.common.v1; -option csharp_namespace = "OddDotNet.Proto.Common.V1"; - import "odddotproto/proto/common/v1/properties.proto"; +option csharp_namespace = "OddDotNet.Proto.Common.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.common.v1"; +option java_outer_classname = "CommonProto"; +option go_package = "go.odddotnet.io/proto/otlp/common/v1"; + message InstrumentationScopeFilter { - oneof value { - odddotnet.proto.common.v1.StringProperty name = 1; - odddotnet.proto.common.v1.KeyValueProperty attribute = 2; - odddotnet.proto.common.v1.StringProperty version = 3; - odddotnet.proto.common.v1.UInt32Property droppedAttributesCount = 4; - } + oneof value { + odddotnet.proto.common.v1.StringProperty name = 1; + odddotnet.proto.common.v1.KeyValueProperty attribute = 2; + odddotnet.proto.common.v1.StringProperty version = 3; + odddotnet.proto.common.v1.UInt32Property dropped_attributes_count = 4; + } } \ No newline at end of file diff --git a/odddotproto/proto/common/v1/properties.proto b/odddotproto/proto/common/v1/properties.proto index 0c49171..705b233 100644 --- a/odddotproto/proto/common/v1/properties.proto +++ b/odddotproto/proto/common/v1/properties.proto @@ -3,94 +3,108 @@ syntax = "proto3"; package odddotnet.proto.common.v1; option csharp_namespace = "OddDotNet.Proto.Common.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.common.v1"; +option java_outer_classname = "CommonProto"; +option go_package = "go.odddotnet.io/proto/otlp/common/v1"; message StringProperty { - StringCompareAsType compareAs = 1; - optional string compare = 2; - } + StringCompareAsType compare_as = 1; + optional string compare = 2; +} - message ByteStringProperty { - ByteStringCompareAsType compareAs = 1; - optional bytes compare = 2; - } +message ByteStringProperty { + ByteStringCompareAsType compare_as = 1; + optional bytes compare = 2; +} - message BoolProperty { - BoolCompareAsType compareAs = 1; - optional bool compare = 2; - } +message BoolProperty { + BoolCompareAsType compare_as = 1; + optional bool compare = 2; +} - message UInt64Property { - NumberCompareAsType compareAs = 1; - optional fixed64 compare = 2; - } +message UInt64Property { + NumberCompareAsType compare_as = 1; + optional fixed64 compare = 2; +} - message UInt32Property { - NumberCompareAsType compareAs = 1; - optional uint32 compare = 2; - } +message UInt32Property { + NumberCompareAsType compare_as = 1; + optional uint32 compare = 2; +} - message Int64Property { - NumberCompareAsType compareAs = 1; - optional int64 compare = 2; - } +message Int64Property { + NumberCompareAsType compare_as = 1; + optional int64 compare = 2; +} - message Int32Property { - NumberCompareAsType compareAs = 1; - optional int32 compare = 2; - } +message Int32Property { + NumberCompareAsType compare_as = 1; + optional int32 compare = 2; +} - message DoubleProperty { - NumberCompareAsType compareAs = 1; - optional double compare = 2; - } +message DoubleProperty { + NumberCompareAsType compare_as = 1; + optional double compare = 2; +} - message KeyValueProperty { - string key = 1; - oneof value { - StringProperty stringValue = 2; - BoolProperty boolValue = 3; - Int64Property int64Value = 4; - DoubleProperty doubleValue = 5; - ByteStringProperty byteStringValue = 6; - } +message KeyValueProperty { + string key = 1; + oneof value { + StringProperty string_value = 2; + BoolProperty bool_value = 3; + Int64Property int_6_4_value = 4; + DoubleProperty double_value = 5; + ByteStringProperty byte_string_value = 6; } +} - enum NumberCompareAsType { - NUMBER_COMPARE_AS_TYPE_NONE = 0; - NUMBER_COMPARE_AS_TYPE_EQUALS = 1; - NUMBER_COMPARE_AS_TYPE_NOT_EQUALS = 2; - NUMBER_COMPARE_AS_TYPE_GREATER_THAN = 3; - NUMBER_COMPARE_AS_TYPE_GREATER_THAN_EQUALS = 4; - NUMBER_COMPARE_AS_TYPE_LESS_THAN = 5; - NUMBER_COMPARE_AS_TYPE_LESS_THAN_EQUALS = 6; +message AnyValueProperty { + oneof value { + StringProperty string_value = 2; + BoolProperty bool_value = 3; + Int64Property int64_value = 4; + DoubleProperty double_value = 5; + ByteStringProperty byte_string_value = 6; } +} - enum EnumCompareAsType { - ENUM_COMPARE_AS_TYPE_NONE = 0; - ENUM_COMPARE_AS_TYPE_EQUALS = 1; - ENUM_COMPARE_AS_TYPE_NOT_EQUALS = 2; - } +enum NumberCompareAsType { + NUMBER_COMPARE_AS_TYPE_NONE_UNSPECIFIED = 0; + NUMBER_COMPARE_AS_TYPE_EQUALS = 1; + NUMBER_COMPARE_AS_TYPE_NOT_EQUALS = 2; + NUMBER_COMPARE_AS_TYPE_GREATER_THAN = 3; + NUMBER_COMPARE_AS_TYPE_GREATER_THAN_EQUALS = 4; + NUMBER_COMPARE_AS_TYPE_LESS_THAN = 5; + NUMBER_COMPARE_AS_TYPE_LESS_THAN_EQUALS = 6; +} - enum BoolCompareAsType { - BOOL_COMPARE_AS_TYPE_NONE = 0; - BOOL_COMPARE_AS_TYPE_EQUALS = 1; - BOOL_COMPARE_AS_TYPE_NOT_EQUALS = 2; - } +enum EnumCompareAsType { + ENUM_COMPARE_AS_TYPE_NONE_UNSPECIFIED = 0; + ENUM_COMPARE_AS_TYPE_EQUALS = 1; + ENUM_COMPARE_AS_TYPE_NOT_EQUALS = 2; +} - enum ByteStringCompareAsType { - BYTE_STRING_COMPARE_AS_TYPE_NONE = 0; - BYTE_STRING_COMPARE_AS_TYPE_EQUALS = 1; - BYTE_STRING_COMPARE_AS_TYPE_NOT_EQUALS = 2; - BYTE_STRING_COMPARE_AS_TYPE_EMPTY = 3; - BYTE_STRING_COMPARE_AS_TYPE_NOT_EMPTY = 4; - } +enum BoolCompareAsType { + BOOL_COMPARE_AS_TYPE_NONE_UNSPECIFIED = 0; + BOOL_COMPARE_AS_TYPE_EQUALS = 1; + BOOL_COMPARE_AS_TYPE_NOT_EQUALS = 2; +} + +enum ByteStringCompareAsType { + BYTE_STRING_COMPARE_AS_TYPE_NONE_UNSPECIFIED = 0; + BYTE_STRING_COMPARE_AS_TYPE_EQUALS = 1; + BYTE_STRING_COMPARE_AS_TYPE_NOT_EQUALS = 2; + BYTE_STRING_COMPARE_AS_TYPE_EMPTY = 3; + BYTE_STRING_COMPARE_AS_TYPE_NOT_EMPTY = 4; +} - enum StringCompareAsType { - STRING_COMPARE_AS_TYPE_NONE = 0; - STRING_COMPARE_AS_TYPE_EQUALS = 1; - STRING_COMPARE_AS_TYPE_NOT_EQUALS = 2; - STRING_COMPARE_AS_TYPE_CONTAINS = 3; - STRING_COMPARE_AS_TYPE_NOT_CONTAINS = 4; - STRING_COMPARE_AS_TYPE_IS_EMPTY = 5; - STRING_COMPARE_AS_TYPE_IS_NOT_EMPTY = 6; - } \ No newline at end of file +enum StringCompareAsType { + STRING_COMPARE_AS_TYPE_NONE_UNSPECIFIED = 0; + STRING_COMPARE_AS_TYPE_EQUALS = 1; + STRING_COMPARE_AS_TYPE_NOT_EQUALS = 2; + STRING_COMPARE_AS_TYPE_CONTAINS = 3; + STRING_COMPARE_AS_TYPE_NOT_CONTAINS = 4; + STRING_COMPARE_AS_TYPE_IS_EMPTY = 5; + STRING_COMPARE_AS_TYPE_IS_NOT_EMPTY = 6; +} \ No newline at end of file diff --git a/odddotproto/proto/logs/v1/flat_log.proto b/odddotproto/proto/logs/v1/flat_log.proto new file mode 100644 index 0000000..82ff26b --- /dev/null +++ b/odddotproto/proto/logs/v1/flat_log.proto @@ -0,0 +1,21 @@ +syntax = "proto3"; + +package odddotnet.proto.logs.v1; + +import "opentelemetry/proto/common/v1/common.proto"; +import "opentelemetry/proto/resource/v1/resource.proto"; +import "opentelemetry/proto/logs/v1/logs.proto"; + +option csharp_namespace = "OddDotNet.Proto.Logs.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.logs.v1"; +option java_outer_classname = "LogsProto"; +option go_package = "go.odddotnet.io/proto/otlp/logs/v1"; + +message FlatLog { + opentelemetry.proto.logs.v1.LogRecord log = 1; + opentelemetry.proto.resource.v1.Resource resource = 2; + opentelemetry.proto.common.v1.InstrumentationScope instrumentation_scope = 3; + string resource_schema_url = 4; + string instrumentation_scope_schema_url = 5; +} diff --git a/odddotproto/proto/logs/v1/log_query_request.proto b/odddotproto/proto/logs/v1/log_query_request.proto new file mode 100644 index 0000000..cc0b50e --- /dev/null +++ b/odddotproto/proto/logs/v1/log_query_request.proto @@ -0,0 +1,57 @@ +syntax = "proto3"; + +package odddotnet.proto.logs.v1; + +import "odddotproto/proto/common/v1/common.proto"; +import "odddotproto/proto/common/v1/filters.proto"; +import "odddotproto/proto/common/v1/properties.proto"; +import "odddotproto/proto/resource/v1/resource_filters.proto"; +import "opentelemetry/proto/logs/v1/logs.proto"; + +option csharp_namespace = "OddDotNet.Proto.Logs.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.logs.v1"; +option java_outer_classname = "LogsProto"; +option go_package = "go.odddotnet.io/proto/otlp/logs/v1"; + +message LogQueryRequest { + repeated Where filters = 1; + odddotnet.proto.common.v1.Take take = 2; + optional odddotnet.proto.common.v1.Duration duration = 3; +} + +message Where { + oneof value { + PropertyFilter property = 1; + OrFilter or = 2; + odddotnet.proto.common.v1.InstrumentationScopeFilter instrumentation_scope = 3; + odddotnet.proto.resource.v1.ResourceFilter resource = 4; + odddotnet.proto.common.v1.StringProperty instrumentation_scope_schema_url = 5; + odddotnet.proto.common.v1.StringProperty resource_schema_url = 6; + } +} + +message PropertyFilter { + reserved 4; + oneof value { + odddotnet.proto.common.v1.UInt64Property time_unix_nano = 1; + odddotnet.proto.common.v1.UInt64Property observed_time_unix_nano = 11; + SeverityNumberProperty severity_number = 2; + odddotnet.proto.common.v1.StringProperty severity_text = 3; + odddotnet.proto.common.v1.AnyValueProperty body = 5; + odddotnet.proto.common.v1.KeyValueProperty attribute = 6; + odddotnet.proto.common.v1.UInt32Property dropped_attributes_count = 7; + odddotnet.proto.common.v1.UInt32Property flags = 8; + odddotnet.proto.common.v1.ByteStringProperty trace_id = 9; + odddotnet.proto.common.v1.ByteStringProperty span_id = 10; + } +} + +message OrFilter { + repeated Where filters = 1; +} + +message SeverityNumberProperty { + odddotnet.proto.common.v1.EnumCompareAsType compare_as = 1; + opentelemetry.proto.logs.v1.SeverityNumber compare = 2; +} diff --git a/odddotproto/proto/logs/v1/log_query_response.proto b/odddotproto/proto/logs/v1/log_query_response.proto new file mode 100644 index 0000000..9118a05 --- /dev/null +++ b/odddotproto/proto/logs/v1/log_query_response.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +package odddotnet.proto.logs.v1; + +import "odddotproto/proto/logs/v1/flat_log.proto"; + +option csharp_namespace = "OddDotNet.Proto.Logs.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.logs.v1"; +option java_outer_classname = "LogsProto"; +option go_package = "go.odddotnet.io/proto/otlp/logs/v1"; + +message LogQueryResponse { + repeated FlatLog logs = 1; +} diff --git a/odddotproto/proto/logs/v1/log_query_service.proto b/odddotproto/proto/logs/v1/log_query_service.proto new file mode 100644 index 0000000..da0bf05 --- /dev/null +++ b/odddotproto/proto/logs/v1/log_query_service.proto @@ -0,0 +1,16 @@ +syntax = "proto3"; + +package odddotnet.proto.logs.v1; + +import "odddotproto/proto/logs/v1/log_query_request.proto"; +import "odddotproto/proto/logs/v1/log_query_response.proto"; + +option csharp_namespace = "OddDotNet.Proto.Logs.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.logs.v1"; +option java_outer_classname = "LogsProto"; +option go_package = "go.odddotnet.io/proto/otlp/logs/v1"; + +service LogQueryService { + rpc Query(LogQueryRequest) returns (LogQueryResponse); +} \ No newline at end of file diff --git a/odddotproto/proto/metrics/v1/flat_metric.proto b/odddotproto/proto/metrics/v1/flat_metric.proto index 3d04c56..12e7a1e 100644 --- a/odddotproto/proto/metrics/v1/flat_metric.proto +++ b/odddotproto/proto/metrics/v1/flat_metric.proto @@ -2,16 +2,20 @@ syntax = "proto3"; package odddotnet.proto.metrics.v1; -option csharp_namespace = "OddDotNet.Proto.Metrics.V1"; - +import "opentelemetry/proto/common/v1/common.proto"; import "opentelemetry/proto/metrics/v1/metrics.proto"; import "opentelemetry/proto/resource/v1/resource.proto"; -import "opentelemetry/proto/common/v1/common.proto"; + +option csharp_namespace = "OddDotNet.Proto.Metrics.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.metrics.v1"; +option java_outer_classname = "MetricsProto"; +option go_package = "go.odddotnet.io/proto/otlp/metrics/v1"; message FlatMetric { - opentelemetry.proto.metrics.v1.Metric metric = 1; - opentelemetry.proto.resource.v1.Resource resource = 2; - opentelemetry.proto.common.v1.InstrumentationScope instrumentationScope = 3; - string resourceSchemaUrl = 4; - string instrumentationScopeSchemaUrl = 5; -} \ No newline at end of file + opentelemetry.proto.metrics.v1.Metric metric = 1; + opentelemetry.proto.resource.v1.Resource resource = 2; + opentelemetry.proto.common.v1.InstrumentationScope instrumentation_scope = 3; + string resource_schema_url = 4; + string instrumentation_scope_schema_url = 5; +} diff --git a/odddotproto/proto/metrics/v1/metric_query_request.proto b/odddotproto/proto/metrics/v1/metric_query_request.proto index a43a7ca..d1caa9f 100644 --- a/odddotproto/proto/metrics/v1/metric_query_request.proto +++ b/odddotproto/proto/metrics/v1/metric_query_request.proto @@ -2,13 +2,17 @@ syntax = "proto3"; package odddotnet.proto.metrics.v1; -option csharp_namespace = "OddDotNet.Proto.Metrics.V1"; - -import "opentelemetry/proto/metrics/v1/metrics.proto"; import "odddotproto/proto/common/v1/common.proto"; -import "odddotproto/proto/common/v1/properties.proto"; import "odddotproto/proto/common/v1/filters.proto"; +import "odddotproto/proto/common/v1/properties.proto"; import "odddotproto/proto/resource/v1/resource_filters.proto"; +import "opentelemetry/proto/metrics/v1/metrics.proto"; + +option csharp_namespace = "OddDotNet.Proto.Metrics.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.metrics.v1"; +option java_outer_classname = "MetricsProto"; +option go_package = "go.odddotnet.io/proto/otlp/metrics/v1"; message MetricQueryRequest { repeated Where filters = 1; @@ -17,158 +21,158 @@ message MetricQueryRequest { } message Where { - oneof value { - PropertyFilter property = 1; - OrFilter or = 2; - odddotnet.proto.common.v1.InstrumentationScopeFilter instrumentationScope = 3; - odddotnet.proto.resource.v1.ResourceFilter resource = 4; - odddotnet.proto.common.v1.StringProperty instrumentationScopeSchemaUrl = 5; - odddotnet.proto.common.v1.StringProperty ResourceSchemaUrl = 6; - } + oneof value { + PropertyFilter property = 1; + OrFilter or = 2; + odddotnet.proto.common.v1.InstrumentationScopeFilter instrumentation_scope = 3; + odddotnet.proto.resource.v1.ResourceFilter resource = 4; + odddotnet.proto.common.v1.StringProperty instrumentation_scope_schema_url = 5; + odddotnet.proto.common.v1.StringProperty resource_schema_url = 6; + } } message PropertyFilter { - reserved 4, 6, 8; - oneof value { - odddotnet.proto.common.v1.StringProperty name = 1; - odddotnet.proto.common.v1.StringProperty description = 2; - odddotnet.proto.common.v1.StringProperty unit = 3; - GaugeFilter gauge = 5; - SumFilter sum = 7; - HistogramFilter histogram = 9; - ExponentialHistogramFilter exponentialHistogram = 10; - SummaryFilter summary = 11; - odddotnet.proto.common.v1.KeyValueProperty metadata = 12; - } + reserved 4, 6, 8; + oneof value { + odddotnet.proto.common.v1.StringProperty name = 1; + odddotnet.proto.common.v1.StringProperty description = 2; + odddotnet.proto.common.v1.StringProperty unit = 3; + GaugeFilter gauge = 5; + SumFilter sum = 7; + HistogramFilter histogram = 9; + ExponentialHistogramFilter exponential_histogram = 10; + SummaryFilter summary = 11; + odddotnet.proto.common.v1.KeyValueProperty metadata = 12; + } } message GaugeFilter { - oneof value { - NumberDataPointFilter dataPoint = 1; - } + oneof value { + NumberDataPointFilter data_point = 1; + } } message SumFilter { - oneof value { - NumberDataPointFilter dataPoint = 1; - AggregationTemporalityProperty aggregationTemporality = 2; - odddotnet.proto.common.v1.BoolProperty isMonotonic = 3; - } + oneof value { + NumberDataPointFilter data_point = 1; + AggregationTemporalityProperty aggregation_temporality = 2; + odddotnet.proto.common.v1.BoolProperty is_monotonic = 3; + } } message HistogramFilter { - oneof value { - HistogramDataPointFilter dataPoint = 1; - AggregationTemporalityProperty aggregationTemporality = 2; - } + oneof value { + HistogramDataPointFilter data_point = 1; + AggregationTemporalityProperty aggregation_temporality = 2; + } } message ExponentialHistogramFilter { - oneof value { - ExponentialHistogramDataPointFilter dataPoint = 1; - AggregationTemporalityProperty aggregationTemporality = 2; - } + oneof value { + ExponentialHistogramDataPointFilter data_point = 1; + AggregationTemporalityProperty aggregation_temporality = 2; + } } message SummaryFilter { - oneof value { - SummaryDataPointFilter dataPoint = 1; - } + oneof value { + SummaryDataPointFilter data_point = 1; + } } message HistogramDataPointFilter { - reserved 1; - oneof value { - odddotnet.proto.common.v1.KeyValueProperty attribute = 9; - odddotnet.proto.common.v1.UInt64Property startTimeUnixNano = 2; - odddotnet.proto.common.v1.UInt64Property timeUnixNano = 3; - odddotnet.proto.common.v1.UInt64Property count = 4; - odddotnet.proto.common.v1.DoubleProperty sum = 5; - odddotnet.proto.common.v1.UInt64Property bucketCount = 6; - odddotnet.proto.common.v1.DoubleProperty explicitBound = 7; - ExemplarFilter exemplar = 8; - odddotnet.proto.common.v1.UInt32Property flags = 10; - odddotnet.proto.common.v1.DoubleProperty min = 11; - odddotnet.proto.common.v1.DoubleProperty max = 12; - } + reserved 1; + oneof value { + odddotnet.proto.common.v1.KeyValueProperty attribute = 9; + odddotnet.proto.common.v1.UInt64Property start_time_unix_nano = 2; + odddotnet.proto.common.v1.UInt64Property time_unix_nano = 3; + odddotnet.proto.common.v1.UInt64Property count = 4; + odddotnet.proto.common.v1.DoubleProperty sum = 5; + odddotnet.proto.common.v1.UInt64Property bucket_count = 6; + odddotnet.proto.common.v1.DoubleProperty explicit_bound = 7; + ExemplarFilter exemplar = 8; + odddotnet.proto.common.v1.UInt32Property flags = 10; + odddotnet.proto.common.v1.DoubleProperty min = 11; + odddotnet.proto.common.v1.DoubleProperty max = 12; + } } message ExponentialHistogramDataPointFilter { - oneof value { - odddotnet.proto.common.v1.KeyValueProperty attribute = 1; - odddotnet.proto.common.v1.UInt64Property startTimeUnixNano = 2; - odddotnet.proto.common.v1.UInt64Property timeUnixNano = 3; - odddotnet.proto.common.v1.UInt64Property count = 4; - odddotnet.proto.common.v1.DoubleProperty sum = 5; - odddotnet.proto.common.v1.Int32Property scale = 6; - odddotnet.proto.common.v1.UInt64Property zeroCount = 7; - BucketFilter positive = 8; - BucketFilter negative = 9; - odddotnet.proto.common.v1.UInt32Property flags = 10; - ExemplarFilter exemplar = 11; - odddotnet.proto.common.v1.DoubleProperty min = 12; - odddotnet.proto.common.v1.DoubleProperty max = 13; - odddotnet.proto.common.v1.DoubleProperty zeroThreshold = 14; - } + oneof value { + odddotnet.proto.common.v1.KeyValueProperty attribute = 1; + odddotnet.proto.common.v1.UInt64Property start_time_unix_nano = 2; + odddotnet.proto.common.v1.UInt64Property time_unix_nano = 3; + odddotnet.proto.common.v1.UInt64Property count = 4; + odddotnet.proto.common.v1.DoubleProperty sum = 5; + odddotnet.proto.common.v1.Int32Property scale = 6; + odddotnet.proto.common.v1.UInt64Property zero_count = 7; + BucketFilter positive = 8; + BucketFilter negative = 9; + odddotnet.proto.common.v1.UInt32Property flags = 10; + ExemplarFilter exemplar = 11; + odddotnet.proto.common.v1.DoubleProperty min = 12; + odddotnet.proto.common.v1.DoubleProperty max = 13; + odddotnet.proto.common.v1.DoubleProperty zero_threshold = 14; + } } message BucketFilter { - oneof value { - odddotnet.proto.common.v1.Int32Property offset = 1; - odddotnet.proto.common.v1.UInt64Property bucketCount = 2; - } + oneof value { + odddotnet.proto.common.v1.Int32Property offset = 1; + odddotnet.proto.common.v1.UInt64Property bucket_count = 2; + } } message NumberDataPointFilter { - reserved 1; - oneof value { - odddotnet.proto.common.v1.KeyValueProperty attribute = 7; - odddotnet.proto.common.v1.UInt64Property startTimeUnixNano = 2; - odddotnet.proto.common.v1.UInt64Property timeUnixNano = 3; - odddotnet.proto.common.v1.DoubleProperty valueAsDouble = 4; - odddotnet.proto.common.v1.Int64Property valueAsInt = 6; - ExemplarFilter exemplar = 5; - odddotnet.proto.common.v1.UInt32Property flags = 8; - } + reserved 1; + oneof value { + odddotnet.proto.common.v1.KeyValueProperty attribute = 7; + odddotnet.proto.common.v1.UInt64Property start_time_unix_nano = 2; + odddotnet.proto.common.v1.UInt64Property time_unix_nano = 3; + odddotnet.proto.common.v1.DoubleProperty value_as_double = 4; + odddotnet.proto.common.v1.Int64Property value_as_int = 6; + ExemplarFilter exemplar = 5; + odddotnet.proto.common.v1.UInt32Property flags = 8; + } } message SummaryDataPointFilter { - reserved 1; - oneof value { - odddotnet.proto.common.v1.KeyValueProperty attribute = 7; - odddotnet.proto.common.v1.UInt64Property startTimeUnixNano = 2; - odddotnet.proto.common.v1.UInt64Property timeUnixNano = 3; - odddotnet.proto.common.v1.UInt64Property count = 4; - odddotnet.proto.common.v1.DoubleProperty sum = 5; - ValueAtQuantileFilter quantileValue = 6; - odddotnet.proto.common.v1.UInt32Property flags = 8; - } + reserved 1; + oneof value { + odddotnet.proto.common.v1.KeyValueProperty attribute = 7; + odddotnet.proto.common.v1.UInt64Property start_time_unix_nano = 2; + odddotnet.proto.common.v1.UInt64Property time_unix_nano = 3; + odddotnet.proto.common.v1.UInt64Property count = 4; + odddotnet.proto.common.v1.DoubleProperty sum = 5; + ValueAtQuantileFilter quantile_value = 6; + odddotnet.proto.common.v1.UInt32Property flags = 8; + } } message ExemplarFilter { - oneof value { - odddotnet.proto.common.v1.KeyValueProperty filteredAttribute = 1; - odddotnet.proto.common.v1.UInt64Property timeUnixNano = 2; - odddotnet.proto.common.v1.DoubleProperty valueAsDouble = 3; - odddotnet.proto.common.v1.Int64Property valueAsInt = 4; - odddotnet.proto.common.v1.ByteStringProperty spanId = 5; - odddotnet.proto.common.v1.ByteStringProperty traceId = 6; - } + oneof value { + odddotnet.proto.common.v1.KeyValueProperty filtered_attribute = 1; + odddotnet.proto.common.v1.UInt64Property time_unix_nano = 2; + odddotnet.proto.common.v1.DoubleProperty value_as_double = 3; + odddotnet.proto.common.v1.Int64Property value_as_int = 4; + odddotnet.proto.common.v1.ByteStringProperty span_id = 5; + odddotnet.proto.common.v1.ByteStringProperty trace_id = 6; + } } message OrFilter { - repeated Where filters = 1; + repeated Where filters = 1; } message AggregationTemporalityProperty { - odddotnet.proto.common.v1.EnumCompareAsType compareAs = 1; - opentelemetry.proto.metrics.v1.AggregationTemporality compare = 2; + odddotnet.proto.common.v1.EnumCompareAsType compare_as = 1; + opentelemetry.proto.metrics.v1.AggregationTemporality compare = 2; } message ValueAtQuantileFilter { - oneof property { - odddotnet.proto.common.v1.DoubleProperty quantile = 1; - odddotnet.proto.common.v1.DoubleProperty value = 2; - } + oneof property { + odddotnet.proto.common.v1.DoubleProperty quantile = 1; + odddotnet.proto.common.v1.DoubleProperty value = 2; + } -} \ No newline at end of file +} diff --git a/odddotproto/proto/metrics/v1/metric_query_response.proto b/odddotproto/proto/metrics/v1/metric_query_response.proto index 108c875..3a7f47d 100644 --- a/odddotproto/proto/metrics/v1/metric_query_response.proto +++ b/odddotproto/proto/metrics/v1/metric_query_response.proto @@ -2,10 +2,14 @@ syntax = "proto3"; package odddotnet.proto.metrics.v1; -option csharp_namespace = "OddDotNet.Proto.Metrics.V1"; - import "odddotproto/proto/metrics/v1/flat_metric.proto"; +option csharp_namespace = "OddDotNet.Proto.Metrics.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.metrics.v1"; +option java_outer_classname = "MetricsProto"; +option go_package = "go.odddotnet.io/proto/otlp/metrics/v1"; + message MetricQueryResponse { repeated odddotnet.proto.metrics.v1.FlatMetric metrics = 1; -} \ No newline at end of file +} diff --git a/odddotproto/proto/metrics/v1/metric_query_service.proto b/odddotproto/proto/metrics/v1/metric_query_service.proto index fa88af3..17a20a1 100644 --- a/odddotproto/proto/metrics/v1/metric_query_service.proto +++ b/odddotproto/proto/metrics/v1/metric_query_service.proto @@ -2,11 +2,15 @@ syntax = "proto3"; package odddotnet.proto.metrics.v1; -option csharp_namespace = "OddDotNet.Proto.Metrics.V1"; - import "odddotproto/proto/metrics/v1/metric_query_request.proto"; import "odddotproto/proto/metrics/v1/metric_query_response.proto"; +option csharp_namespace = "OddDotNet.Proto.Metrics.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.metrics.v1"; +option java_outer_classname = "MetricsProto"; +option go_package = "go.odddotnet.io/proto/otlp/metrics/v1"; + service MetricQueryService { - rpc Query(MetricQueryRequest) returns (MetricQueryResponse); -} \ No newline at end of file + rpc Query(MetricQueryRequest) returns (MetricQueryResponse); +} diff --git a/odddotproto/proto/resource/v1/resource_filters.proto b/odddotproto/proto/resource/v1/resource_filters.proto index a5d8d99..16f5063 100644 --- a/odddotproto/proto/resource/v1/resource_filters.proto +++ b/odddotproto/proto/resource/v1/resource_filters.proto @@ -2,13 +2,17 @@ syntax = "proto3"; package odddotnet.proto.resource.v1; -option csharp_namespace = "OddDotNet.Proto.Resource.V1"; - import "odddotproto/proto/common/v1/properties.proto"; +option csharp_namespace = "OddDotNet.Proto.Resource.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.resource.v1"; +option java_outer_classname = "ResourceProto"; +option go_package = "go.odddotnet.io/proto/otlp/resource/v1"; + message ResourceFilter { - oneof value { - odddotnet.proto.common.v1.KeyValueProperty attribute = 1; - odddotnet.proto.common.v1.UInt32Property droppedAttributesCount = 2; - } -} \ No newline at end of file + oneof value { + odddotnet.proto.common.v1.KeyValueProperty attribute = 1; + odddotnet.proto.common.v1.UInt32Property dropped_attributes_count = 2; + } +} diff --git a/odddotproto/proto/trace/v1/flat_span.proto b/odddotproto/proto/trace/v1/flat_span.proto index 3a9ef95..7c874f8 100644 --- a/odddotproto/proto/trace/v1/flat_span.proto +++ b/odddotproto/proto/trace/v1/flat_span.proto @@ -2,16 +2,20 @@ syntax = "proto3"; package odddotnet.proto.trace.v1; -option csharp_namespace = "OddDotNet.Proto.Trace.V1"; - -import "opentelemetry/proto/trace/v1/trace.proto"; -import "opentelemetry/proto/resource/v1/resource.proto"; import "opentelemetry/proto/common/v1/common.proto"; +import "opentelemetry/proto/resource/v1/resource.proto"; +import "opentelemetry/proto/trace/v1/trace.proto"; + +option csharp_namespace = "OddDotNet.Proto.Trace.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.trace.v1"; +option java_outer_classname = "TraceProto"; +option go_package = "go.odddotnet.io/proto/otlp/trace/v1"; message FlatSpan { - opentelemetry.proto.trace.v1.Span span = 1; - opentelemetry.proto.resource.v1.Resource resource = 2; - opentelemetry.proto.common.v1.InstrumentationScope instrumentationScope = 3; - string resourceSchemaUrl = 4; - string instrumentationScopeSchemaUrl = 5; -} \ No newline at end of file + opentelemetry.proto.trace.v1.Span span = 1; + opentelemetry.proto.resource.v1.Resource resource = 2; + opentelemetry.proto.common.v1.InstrumentationScope instrumentation_scope = 3; + string resource_schema_url = 4; + string instrumentation_scope_schema_url = 5; +} diff --git a/odddotproto/proto/trace/v1/span_query_request.proto b/odddotproto/proto/trace/v1/span_query_request.proto index 2864f20..feb91f8 100644 --- a/odddotproto/proto/trace/v1/span_query_request.proto +++ b/odddotproto/proto/trace/v1/span_query_request.proto @@ -2,13 +2,17 @@ syntax = "proto3"; package odddotnet.proto.trace.v1; -option csharp_namespace = "OddDotNet.Proto.Trace.V1"; - import "odddotproto/proto/common/v1/common.proto"; -import "odddotproto/proto/common/v1/properties.proto"; -import "opentelemetry/proto/trace/v1/trace.proto"; import "odddotproto/proto/common/v1/filters.proto"; +import "odddotproto/proto/common/v1/properties.proto"; import "odddotproto/proto/resource/v1/resource_filters.proto"; +import "opentelemetry/proto/trace/v1/trace.proto"; + +option csharp_namespace = "OddDotNet.Proto.Trace.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.trace.v1"; +option java_outer_classname = "TraceProto"; +option go_package = "go.odddotnet.io/proto/otlp/trace/v1"; message SpanQueryRequest { repeated Where filters = 1; @@ -20,29 +24,29 @@ message Where { oneof value { PropertyFilter property = 1; OrFilter or = 2; - odddotnet.proto.common.v1.InstrumentationScopeFilter instrumentationScope = 3; + odddotnet.proto.common.v1.InstrumentationScopeFilter instrumentation_scope = 3; odddotnet.proto.resource.v1.ResourceFilter resource = 4; - odddotnet.proto.common.v1.StringProperty instrumentationScopeSchemaUrl = 5; - odddotnet.proto.common.v1.StringProperty ResourceSchemaUrl = 6; + odddotnet.proto.common.v1.StringProperty instrumentation_scope_schema_url = 5; + odddotnet.proto.common.v1.StringProperty resource_schema_url = 6; } } message PropertyFilter { oneof value { - odddotnet.proto.common.v1.ByteStringProperty traceId = 1; - odddotnet.proto.common.v1.ByteStringProperty spanId = 2; - odddotnet.proto.common.v1.StringProperty traceState = 3; - odddotnet.proto.common.v1.ByteStringProperty parentSpanId = 4; + odddotnet.proto.common.v1.ByteStringProperty trace_id = 1; + odddotnet.proto.common.v1.ByteStringProperty span_id = 2; + odddotnet.proto.common.v1.StringProperty trace_state = 3; + odddotnet.proto.common.v1.ByteStringProperty parent_span_id = 4; odddotnet.proto.common.v1.StringProperty name = 5; SpanKindProperty kind = 6; - odddotnet.proto.common.v1.UInt64Property startTimeUnixNano = 7; - odddotnet.proto.common.v1.UInt64Property endTimeUnixNano = 8; + odddotnet.proto.common.v1.UInt64Property start_time_unix_nano = 7; + odddotnet.proto.common.v1.UInt64Property end_time_unix_nano = 8; odddotnet.proto.common.v1.KeyValueProperty attribute = 9; - odddotnet.proto.common.v1.UInt32Property droppedAttributesCount = 10; + odddotnet.proto.common.v1.UInt32Property dropped_attributes_count = 10; EventFilter event = 11; - odddotnet.proto.common.v1.UInt32Property droppedEventsCount = 12; + odddotnet.proto.common.v1.UInt32Property dropped_events_count = 12; LinkFilter link = 13; - odddotnet.proto.common.v1.UInt32Property droppedLinksCount = 14; + odddotnet.proto.common.v1.UInt32Property dropped_links_count = 14; StatusFilter status = 15; odddotnet.proto.common.v1.UInt32Property flags = 16; } @@ -54,20 +58,20 @@ message OrFilter { message EventFilter { oneof value { - odddotnet.proto.common.v1.UInt64Property timeUnixNano = 1; + odddotnet.proto.common.v1.UInt64Property time_unix_nano = 1; odddotnet.proto.common.v1.StringProperty name = 2; odddotnet.proto.common.v1.KeyValueProperty attribute = 3; - odddotnet.proto.common.v1.UInt32Property droppedAttributesCount = 4; + odddotnet.proto.common.v1.UInt32Property dropped_attributes_count = 4; } } message LinkFilter { oneof value { - odddotnet.proto.common.v1.ByteStringProperty traceId = 1; - odddotnet.proto.common.v1.ByteStringProperty spanId = 2; - odddotnet.proto.common.v1.StringProperty traceState = 3; + odddotnet.proto.common.v1.ByteStringProperty trace_id = 1; + odddotnet.proto.common.v1.ByteStringProperty span_id = 2; + odddotnet.proto.common.v1.StringProperty trace_state = 3; odddotnet.proto.common.v1.KeyValueProperty attribute = 4; - odddotnet.proto.common.v1.UInt32Property droppedAttributesCount = 5; + odddotnet.proto.common.v1.UInt32Property dropped_attributes_count = 5; odddotnet.proto.common.v1.UInt32Property flags = 6; } } @@ -82,11 +86,11 @@ message StatusFilter { } message SpanStatusCodeProperty { - odddotnet.proto.common.v1.EnumCompareAsType compareAs = 1; + odddotnet.proto.common.v1.EnumCompareAsType compare_as = 1; opentelemetry.proto.trace.v1.Status.StatusCode compare = 2; } message SpanKindProperty { - odddotnet.proto.common.v1.EnumCompareAsType compareAs = 1; + odddotnet.proto.common.v1.EnumCompareAsType compare_as = 1; opentelemetry.proto.trace.v1.Span.SpanKind compare = 2; -} \ No newline at end of file +} diff --git a/odddotproto/proto/trace/v1/span_query_response.proto b/odddotproto/proto/trace/v1/span_query_response.proto index 126eac0..d50f33f 100644 --- a/odddotproto/proto/trace/v1/span_query_response.proto +++ b/odddotproto/proto/trace/v1/span_query_response.proto @@ -2,10 +2,14 @@ syntax = "proto3"; package odddotnet.proto.trace.v1; -option csharp_namespace = "OddDotNet.Proto.Trace.V1"; - import "odddotproto/proto/trace/v1/flat_span.proto"; +option csharp_namespace = "OddDotNet.Proto.Trace.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.trace.v1"; +option java_outer_classname = "TraceProto"; +option go_package = "go.odddotnet.io/proto/otlp/trace/v1"; + message SpanQueryResponse { repeated FlatSpan spans = 1; -} \ No newline at end of file +} diff --git a/odddotproto/proto/trace/v1/span_query_service.proto b/odddotproto/proto/trace/v1/span_query_service.proto index 693e907..d705ce5 100644 --- a/odddotproto/proto/trace/v1/span_query_service.proto +++ b/odddotproto/proto/trace/v1/span_query_service.proto @@ -2,14 +2,18 @@ syntax = "proto3"; package odddotnet.proto.trace.v1; -option csharp_namespace = "OddDotNet.Proto.Trace.V1"; - import "odddotproto/proto/trace/v1/span_query_request.proto"; import "odddotproto/proto/trace/v1/span_query_response.proto"; import "odddotproto/proto/trace/v1/span_reset_request.proto"; import "odddotproto/proto/trace/v1/span_reset_response.proto"; +option csharp_namespace = "OddDotNet.Proto.Trace.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.trace.v1"; +option java_outer_classname = "TraceProto"; +option go_package = "go.odddotnet.io/proto/otlp/trace/v1"; + service SpanQueryService { rpc Query(SpanQueryRequest) returns (SpanQueryResponse); rpc Reset(SpanResetRequest) returns (SpanResetResponse); -} \ No newline at end of file +} diff --git a/odddotproto/proto/trace/v1/span_reset_request.proto b/odddotproto/proto/trace/v1/span_reset_request.proto index bdd3078..a136b12 100644 --- a/odddotproto/proto/trace/v1/span_reset_request.proto +++ b/odddotproto/proto/trace/v1/span_reset_request.proto @@ -3,5 +3,10 @@ syntax = "proto3"; package odddotnet.proto.trace.v1; option csharp_namespace = "OddDotNet.Proto.Trace.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.trace.v1"; +option java_outer_classname = "TraceProto"; +option go_package = "go.odddotnet.io/proto/otlp/trace/v1"; -message SpanResetRequest{} \ No newline at end of file +message SpanResetRequest{ +} \ No newline at end of file diff --git a/odddotproto/proto/trace/v1/span_reset_response.proto b/odddotproto/proto/trace/v1/span_reset_response.proto index 0733584..8f17de8 100644 --- a/odddotproto/proto/trace/v1/span_reset_response.proto +++ b/odddotproto/proto/trace/v1/span_reset_response.proto @@ -3,5 +3,10 @@ syntax = "proto3"; package odddotnet.proto.trace.v1; option csharp_namespace = "OddDotNet.Proto.Trace.V1"; +option java_multiple_files = true; +option java_package = "io.odddotnet.proto.trace.v1"; +option java_outer_classname = "TraceProto"; +option go_package = "go.odddotnet.io/proto/otlp/trace/v1"; -message SpanResetResponse{} \ No newline at end of file +message SpanResetResponse{ +} \ No newline at end of file