From d4497cde3b4694297a65e76098b329c9847d02e6 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 25 May 2021 15:53:31 -0700 Subject: [PATCH 1/2] bump proto to 0.9.0 --- .../trace/v1/trace_service_pb2_grpc.py | 6 +- .../proto/common/v1/common_pb2.py | 37 +- .../proto/common/v1/common_pb2.pyi | 9 +- .../opentelemetry/proto/logs/v1/logs_pb2.py | 56 ++- .../opentelemetry/proto/logs/v1/logs_pb2.pyi | 10 + .../metrics_config_service_pb2.py | 267 +++++++++++ .../metrics_config_service_pb2.pyi | 88 ++++ .../metrics_config_service_pb2_grpc.py | 82 ++++ .../proto/metrics/v1/metrics_pb2.py | 451 +++++++++++------- .../proto/metrics/v1/metrics_pb2.pyi | 150 +++--- .../opentelemetry/proto/trace/v1/trace_pb2.py | 50 +- .../proto/trace/v1/trace_pb2.pyi | 10 +- scripts/proto_codegen.sh | 2 +- 13 files changed, 931 insertions(+), 287 deletions(-) create mode 100644 opentelemetry-proto/src/opentelemetry/proto/metrics/experimental/metrics_config_service_pb2.py create mode 100644 opentelemetry-proto/src/opentelemetry/proto/metrics/experimental/metrics_config_service_pb2.pyi create mode 100644 opentelemetry-proto/src/opentelemetry/proto/metrics/experimental/metrics_config_service_pb2_grpc.py diff --git a/opentelemetry-proto/src/opentelemetry/proto/collector/trace/v1/trace_service_pb2_grpc.py b/opentelemetry-proto/src/opentelemetry/proto/collector/trace/v1/trace_service_pb2_grpc.py index 1d86433946e..3b9efef6d67 100644 --- a/opentelemetry-proto/src/opentelemetry/proto/collector/trace/v1/trace_service_pb2_grpc.py +++ b/opentelemetry-proto/src/opentelemetry/proto/collector/trace/v1/trace_service_pb2_grpc.py @@ -6,7 +6,7 @@ class TraceServiceStub(object): """Service that can be used to push spans between one Application instrumented with - OpenTelemetry and an collector, or between an collector and a central collector (in this + OpenTelemetry and a collector, or between a collector and a central collector (in this case spans are sent/received to/from multiple Applications). """ @@ -25,7 +25,7 @@ def __init__(self, channel): class TraceServiceServicer(object): """Service that can be used to push spans between one Application instrumented with - OpenTelemetry and an collector, or between an collector and a central collector (in this + OpenTelemetry and a collector, or between a collector and a central collector (in this case spans are sent/received to/from multiple Applications). """ @@ -54,7 +54,7 @@ def add_TraceServiceServicer_to_server(servicer, server): # This class is part of an EXPERIMENTAL API. class TraceService(object): """Service that can be used to push spans between one Application instrumented with - OpenTelemetry and an collector, or between an collector and a central collector (in this + OpenTelemetry and a collector, or between a collector and a central collector (in this case spans are sent/received to/from multiple Applications). """ diff --git a/opentelemetry-proto/src/opentelemetry/proto/common/v1/common_pb2.py b/opentelemetry-proto/src/opentelemetry/proto/common/v1/common_pb2.py index 21501a30c01..5371e9facf3 100644 --- a/opentelemetry-proto/src/opentelemetry/proto/common/v1/common_pb2.py +++ b/opentelemetry-proto/src/opentelemetry/proto/common/v1/common_pb2.py @@ -18,7 +18,7 @@ package='opentelemetry.proto.common.v1', syntax='proto3', serialized_options=b'\n io.opentelemetry.proto.common.v1B\013CommonProtoP\001Z>github.com/open-telemetry/opentelemetry-proto/gen/go/common/v1', - serialized_pb=b'\n*opentelemetry/proto/common/v1/common.proto\x12\x1dopentelemetry.proto.common.v1\"\xf5\x01\n\x08\x41nyValue\x12\x16\n\x0cstring_value\x18\x01 \x01(\tH\x00\x12\x14\n\nbool_value\x18\x02 \x01(\x08H\x00\x12\x13\n\tint_value\x18\x03 \x01(\x03H\x00\x12\x16\n\x0c\x64ouble_value\x18\x04 \x01(\x01H\x00\x12@\n\x0b\x61rray_value\x18\x05 \x01(\x0b\x32).opentelemetry.proto.common.v1.ArrayValueH\x00\x12\x43\n\x0ckvlist_value\x18\x06 \x01(\x0b\x32+.opentelemetry.proto.common.v1.KeyValueListH\x00\x42\x07\n\x05value\"E\n\nArrayValue\x12\x37\n\x06values\x18\x01 \x03(\x0b\x32\'.opentelemetry.proto.common.v1.AnyValue\"G\n\x0cKeyValueList\x12\x37\n\x06values\x18\x01 \x03(\x0b\x32\'.opentelemetry.proto.common.v1.KeyValue\"O\n\x08KeyValue\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x36\n\x05value\x18\x02 \x01(\x0b\x32\'.opentelemetry.proto.common.v1.AnyValue\",\n\x0eStringKeyValue\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"7\n\x16InstrumentationLibrary\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\tBq\n io.opentelemetry.proto.common.v1B\x0b\x43ommonProtoP\x01Z>github.com/open-telemetry/opentelemetry-proto/gen/go/common/v1b\x06proto3' + serialized_pb=b'\n*opentelemetry/proto/common/v1/common.proto\x12\x1dopentelemetry.proto.common.v1\"\x8c\x02\n\x08\x41nyValue\x12\x16\n\x0cstring_value\x18\x01 \x01(\tH\x00\x12\x14\n\nbool_value\x18\x02 \x01(\x08H\x00\x12\x13\n\tint_value\x18\x03 \x01(\x03H\x00\x12\x16\n\x0c\x64ouble_value\x18\x04 \x01(\x01H\x00\x12@\n\x0b\x61rray_value\x18\x05 \x01(\x0b\x32).opentelemetry.proto.common.v1.ArrayValueH\x00\x12\x43\n\x0ckvlist_value\x18\x06 \x01(\x0b\x32+.opentelemetry.proto.common.v1.KeyValueListH\x00\x12\x15\n\x0b\x62ytes_value\x18\x07 \x01(\x0cH\x00\x42\x07\n\x05value\"E\n\nArrayValue\x12\x37\n\x06values\x18\x01 \x03(\x0b\x32\'.opentelemetry.proto.common.v1.AnyValue\"G\n\x0cKeyValueList\x12\x37\n\x06values\x18\x01 \x03(\x0b\x32\'.opentelemetry.proto.common.v1.KeyValue\"O\n\x08KeyValue\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x36\n\x05value\x18\x02 \x01(\x0b\x32\'.opentelemetry.proto.common.v1.AnyValue\"0\n\x0eStringKeyValue\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x18\x01\"7\n\x16InstrumentationLibrary\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\tBq\n io.opentelemetry.proto.common.v1B\x0b\x43ommonProtoP\x01Z>github.com/open-telemetry/opentelemetry-proto/gen/go/common/v1b\x06proto3' ) @@ -73,6 +73,13 @@ message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='bytes_value', full_name='opentelemetry.proto.common.v1.AnyValue.bytes_value', index=6, + number=7, type=12, cpp_type=9, label=1, + has_default_value=False, default_value=b"", + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -89,7 +96,7 @@ index=0, containing_type=None, fields=[]), ], serialized_start=78, - serialized_end=323, + serialized_end=346, ) @@ -119,8 +126,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=325, - serialized_end=394, + serialized_start=348, + serialized_end=417, ) @@ -150,8 +157,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=396, - serialized_end=467, + serialized_start=419, + serialized_end=490, ) @@ -188,8 +195,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=469, - serialized_end=548, + serialized_start=492, + serialized_end=571, ) @@ -220,14 +227,14 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + serialized_options=b'\030\001', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=550, - serialized_end=594, + serialized_start=573, + serialized_end=621, ) @@ -264,8 +271,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=596, - serialized_end=651, + serialized_start=623, + serialized_end=678, ) _ANYVALUE.fields_by_name['array_value'].message_type = _ARRAYVALUE @@ -288,6 +295,9 @@ _ANYVALUE.oneofs_by_name['value'].fields.append( _ANYVALUE.fields_by_name['kvlist_value']) _ANYVALUE.fields_by_name['kvlist_value'].containing_oneof = _ANYVALUE.oneofs_by_name['value'] +_ANYVALUE.oneofs_by_name['value'].fields.append( + _ANYVALUE.fields_by_name['bytes_value']) +_ANYVALUE.fields_by_name['bytes_value'].containing_oneof = _ANYVALUE.oneofs_by_name['value'] _ARRAYVALUE.fields_by_name['values'].message_type = _ANYVALUE _KEYVALUELIST.fields_by_name['values'].message_type = _KEYVALUE _KEYVALUE.fields_by_name['value'].message_type = _ANYVALUE @@ -343,4 +353,5 @@ DESCRIPTOR._options = None +_STRINGKEYVALUE._options = None # @@protoc_insertion_point(module_scope) diff --git a/opentelemetry-proto/src/opentelemetry/proto/common/v1/common_pb2.pyi b/opentelemetry-proto/src/opentelemetry/proto/common/v1/common_pb2.pyi index 7afb08ab9aa..144df2d4a08 100644 --- a/opentelemetry-proto/src/opentelemetry/proto/common/v1/common_pb2.pyi +++ b/opentelemetry-proto/src/opentelemetry/proto/common/v1/common_pb2.pyi @@ -19,10 +19,12 @@ class AnyValue(google.protobuf.message.Message): DOUBLE_VALUE_FIELD_NUMBER: builtins.int ARRAY_VALUE_FIELD_NUMBER: builtins.int KVLIST_VALUE_FIELD_NUMBER: builtins.int + BYTES_VALUE_FIELD_NUMBER: builtins.int string_value: typing.Text = ... bool_value: builtins.bool = ... int_value: builtins.int = ... double_value: builtins.float = ... + bytes_value: builtins.bytes = ... @property def array_value(self) -> global___ArrayValue: ... @@ -38,10 +40,11 @@ class AnyValue(google.protobuf.message.Message): double_value : builtins.float = ..., array_value : typing.Optional[global___ArrayValue] = ..., kvlist_value : typing.Optional[global___KeyValueList] = ..., + bytes_value : builtins.bytes = ..., ) -> None: ... - def HasField(self, field_name: typing_extensions.Literal[u"array_value",b"array_value",u"bool_value",b"bool_value",u"double_value",b"double_value",u"int_value",b"int_value",u"kvlist_value",b"kvlist_value",u"string_value",b"string_value",u"value",b"value"]) -> builtins.bool: ... - def ClearField(self, field_name: typing_extensions.Literal[u"array_value",b"array_value",u"bool_value",b"bool_value",u"double_value",b"double_value",u"int_value",b"int_value",u"kvlist_value",b"kvlist_value",u"string_value",b"string_value",u"value",b"value"]) -> None: ... - def WhichOneof(self, oneof_group: typing_extensions.Literal[u"value",b"value"]) -> typing_extensions.Literal["string_value","bool_value","int_value","double_value","array_value","kvlist_value"]: ... + def HasField(self, field_name: typing_extensions.Literal[u"array_value",b"array_value",u"bool_value",b"bool_value",u"bytes_value",b"bytes_value",u"double_value",b"double_value",u"int_value",b"int_value",u"kvlist_value",b"kvlist_value",u"string_value",b"string_value",u"value",b"value"]) -> builtins.bool: ... + def ClearField(self, field_name: typing_extensions.Literal[u"array_value",b"array_value",u"bool_value",b"bool_value",u"bytes_value",b"bytes_value",u"double_value",b"double_value",u"int_value",b"int_value",u"kvlist_value",b"kvlist_value",u"string_value",b"string_value",u"value",b"value"]) -> None: ... + def WhichOneof(self, oneof_group: typing_extensions.Literal[u"value",b"value"]) -> typing_extensions.Literal["string_value","bool_value","int_value","double_value","array_value","kvlist_value","bytes_value"]: ... global___AnyValue = AnyValue class ArrayValue(google.protobuf.message.Message): diff --git a/opentelemetry-proto/src/opentelemetry/proto/logs/v1/logs_pb2.py b/opentelemetry-proto/src/opentelemetry/proto/logs/v1/logs_pb2.py index 184f6ae8b2f..b9a8468d6c0 100644 --- a/opentelemetry-proto/src/opentelemetry/proto/logs/v1/logs_pb2.py +++ b/opentelemetry-proto/src/opentelemetry/proto/logs/v1/logs_pb2.py @@ -26,7 +26,7 @@ package="opentelemetry.proto.logs.v1", syntax="proto3", serialized_options=b"\n\036io.opentelemetry.proto.logs.v1B\tLogsProtoP\001Z None: ... def HasField( self, field_name: typing_extensions.Literal["resource", b"resource"] @@ -130,6 +133,8 @@ class ResourceLogs(google.protobuf.message.Message): b"instrumentation_library_logs", "resource", b"resource", + "schema_url", + b"schema_url", ], ) -> None: ... @@ -139,6 +144,8 @@ class InstrumentationLibraryLogs(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... INSTRUMENTATION_LIBRARY_FIELD_NUMBER: builtins.int LOGS_FIELD_NUMBER: builtins.int + SCHEMA_URL_FIELD_NUMBER: builtins.int + schema_url: typing.Text = ... @property def instrumentation_library( self, @@ -156,6 +163,7 @@ class InstrumentationLibraryLogs(google.protobuf.message.Message): opentelemetry.proto.common.v1.common_pb2.InstrumentationLibrary ] = ..., logs: typing.Optional[typing.Iterable[global___LogRecord]] = ..., + schema_url: typing.Text = ..., ) -> None: ... def HasField( self, @@ -170,6 +178,8 @@ class InstrumentationLibraryLogs(google.protobuf.message.Message): b"instrumentation_library", "logs", b"logs", + "schema_url", + b"schema_url", ], ) -> None: ... diff --git a/opentelemetry-proto/src/opentelemetry/proto/metrics/experimental/metrics_config_service_pb2.py b/opentelemetry-proto/src/opentelemetry/proto/metrics/experimental/metrics_config_service_pb2.py new file mode 100644 index 00000000000..8f1b43c3d2f --- /dev/null +++ b/opentelemetry-proto/src/opentelemetry/proto/metrics/experimental/metrics_config_service_pb2.py @@ -0,0 +1,267 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: opentelemetry/proto/metrics/experimental/metrics_config_service.proto + +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + +from opentelemetry.proto.resource.v1 import resource_pb2 as opentelemetry_dot_proto_dot_resource_dot_v1_dot_resource__pb2 + + +DESCRIPTOR = _descriptor.FileDescriptor( + name='opentelemetry/proto/metrics/experimental/metrics_config_service.proto', + package='opentelemetry.proto.metrics.experimental', + syntax='proto3', + serialized_options=b'\n+io.opentelemetry.proto.metrics.experimentalB\030MetricConfigServiceProtoP\001ZIgithub.com/open-telemetry/opentelemetry-proto/gen/go/metrics/experimental', + serialized_pb=b'\nEopentelemetry/proto/metrics/experimental/metrics_config_service.proto\x12(opentelemetry.proto.metrics.experimental\x1a.opentelemetry/proto/resource/v1/resource.proto\"r\n\x13MetricConfigRequest\x12;\n\x08resource\x18\x01 \x01(\x0b\x32).opentelemetry.proto.resource.v1.Resource\x12\x1e\n\x16last_known_fingerprint\x18\x02 \x01(\x0c\"\xe0\x03\n\x14MetricConfigResponse\x12\x13\n\x0b\x66ingerprint\x18\x01 \x01(\x0c\x12Z\n\tschedules\x18\x02 \x03(\x0b\x32G.opentelemetry.proto.metrics.experimental.MetricConfigResponse.Schedule\x12\x1f\n\x17suggested_wait_time_sec\x18\x03 \x01(\x05\x1a\xb5\x02\n\x08Schedule\x12k\n\x12\x65xclusion_patterns\x18\x01 \x03(\x0b\x32O.opentelemetry.proto.metrics.experimental.MetricConfigResponse.Schedule.Pattern\x12k\n\x12inclusion_patterns\x18\x02 \x03(\x0b\x32O.opentelemetry.proto.metrics.experimental.MetricConfigResponse.Schedule.Pattern\x12\x12\n\nperiod_sec\x18\x03 \x01(\x05\x1a;\n\x07Pattern\x12\x10\n\x06\x65quals\x18\x01 \x01(\tH\x00\x12\x15\n\x0bstarts_with\x18\x02 \x01(\tH\x00\x42\x07\n\x05match2\xa1\x01\n\x0cMetricConfig\x12\x90\x01\n\x0fGetMetricConfig\x12=.opentelemetry.proto.metrics.experimental.MetricConfigRequest\x1a>.opentelemetry.proto.metrics.experimental.MetricConfigResponseB\x94\x01\n+io.opentelemetry.proto.metrics.experimentalB\x18MetricConfigServiceProtoP\x01ZIgithub.com/open-telemetry/opentelemetry-proto/gen/go/metrics/experimentalb\x06proto3' + , + dependencies=[opentelemetry_dot_proto_dot_resource_dot_v1_dot_resource__pb2.DESCRIPTOR,]) + + + + +_METRICCONFIGREQUEST = _descriptor.Descriptor( + name='MetricConfigRequest', + full_name='opentelemetry.proto.metrics.experimental.MetricConfigRequest', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='resource', full_name='opentelemetry.proto.metrics.experimental.MetricConfigRequest.resource', index=0, + number=1, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='last_known_fingerprint', full_name='opentelemetry.proto.metrics.experimental.MetricConfigRequest.last_known_fingerprint', index=1, + number=2, type=12, cpp_type=9, label=1, + has_default_value=False, default_value=b"", + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + serialized_options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=163, + serialized_end=277, +) + + +_METRICCONFIGRESPONSE_SCHEDULE_PATTERN = _descriptor.Descriptor( + name='Pattern', + full_name='opentelemetry.proto.metrics.experimental.MetricConfigResponse.Schedule.Pattern', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='equals', full_name='opentelemetry.proto.metrics.experimental.MetricConfigResponse.Schedule.Pattern.equals', index=0, + number=1, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='starts_with', full_name='opentelemetry.proto.metrics.experimental.MetricConfigResponse.Schedule.Pattern.starts_with', index=1, + number=2, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + serialized_options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + _descriptor.OneofDescriptor( + name='match', full_name='opentelemetry.proto.metrics.experimental.MetricConfigResponse.Schedule.Pattern.match', + index=0, containing_type=None, fields=[]), + ], + serialized_start=701, + serialized_end=760, +) + +_METRICCONFIGRESPONSE_SCHEDULE = _descriptor.Descriptor( + name='Schedule', + full_name='opentelemetry.proto.metrics.experimental.MetricConfigResponse.Schedule', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='exclusion_patterns', full_name='opentelemetry.proto.metrics.experimental.MetricConfigResponse.Schedule.exclusion_patterns', index=0, + number=1, type=11, cpp_type=10, label=3, + has_default_value=False, default_value=[], + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='inclusion_patterns', full_name='opentelemetry.proto.metrics.experimental.MetricConfigResponse.Schedule.inclusion_patterns', index=1, + number=2, type=11, cpp_type=10, label=3, + has_default_value=False, default_value=[], + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='period_sec', full_name='opentelemetry.proto.metrics.experimental.MetricConfigResponse.Schedule.period_sec', index=2, + number=3, type=5, cpp_type=1, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[_METRICCONFIGRESPONSE_SCHEDULE_PATTERN, ], + enum_types=[ + ], + serialized_options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=451, + serialized_end=760, +) + +_METRICCONFIGRESPONSE = _descriptor.Descriptor( + name='MetricConfigResponse', + full_name='opentelemetry.proto.metrics.experimental.MetricConfigResponse', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='fingerprint', full_name='opentelemetry.proto.metrics.experimental.MetricConfigResponse.fingerprint', index=0, + number=1, type=12, cpp_type=9, label=1, + has_default_value=False, default_value=b"", + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='schedules', full_name='opentelemetry.proto.metrics.experimental.MetricConfigResponse.schedules', index=1, + number=2, type=11, cpp_type=10, label=3, + has_default_value=False, default_value=[], + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='suggested_wait_time_sec', full_name='opentelemetry.proto.metrics.experimental.MetricConfigResponse.suggested_wait_time_sec', index=2, + number=3, type=5, cpp_type=1, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[_METRICCONFIGRESPONSE_SCHEDULE, ], + enum_types=[ + ], + serialized_options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=280, + serialized_end=760, +) + +_METRICCONFIGREQUEST.fields_by_name['resource'].message_type = opentelemetry_dot_proto_dot_resource_dot_v1_dot_resource__pb2._RESOURCE +_METRICCONFIGRESPONSE_SCHEDULE_PATTERN.containing_type = _METRICCONFIGRESPONSE_SCHEDULE +_METRICCONFIGRESPONSE_SCHEDULE_PATTERN.oneofs_by_name['match'].fields.append( + _METRICCONFIGRESPONSE_SCHEDULE_PATTERN.fields_by_name['equals']) +_METRICCONFIGRESPONSE_SCHEDULE_PATTERN.fields_by_name['equals'].containing_oneof = _METRICCONFIGRESPONSE_SCHEDULE_PATTERN.oneofs_by_name['match'] +_METRICCONFIGRESPONSE_SCHEDULE_PATTERN.oneofs_by_name['match'].fields.append( + _METRICCONFIGRESPONSE_SCHEDULE_PATTERN.fields_by_name['starts_with']) +_METRICCONFIGRESPONSE_SCHEDULE_PATTERN.fields_by_name['starts_with'].containing_oneof = _METRICCONFIGRESPONSE_SCHEDULE_PATTERN.oneofs_by_name['match'] +_METRICCONFIGRESPONSE_SCHEDULE.fields_by_name['exclusion_patterns'].message_type = _METRICCONFIGRESPONSE_SCHEDULE_PATTERN +_METRICCONFIGRESPONSE_SCHEDULE.fields_by_name['inclusion_patterns'].message_type = _METRICCONFIGRESPONSE_SCHEDULE_PATTERN +_METRICCONFIGRESPONSE_SCHEDULE.containing_type = _METRICCONFIGRESPONSE +_METRICCONFIGRESPONSE.fields_by_name['schedules'].message_type = _METRICCONFIGRESPONSE_SCHEDULE +DESCRIPTOR.message_types_by_name['MetricConfigRequest'] = _METRICCONFIGREQUEST +DESCRIPTOR.message_types_by_name['MetricConfigResponse'] = _METRICCONFIGRESPONSE +_sym_db.RegisterFileDescriptor(DESCRIPTOR) + +MetricConfigRequest = _reflection.GeneratedProtocolMessageType('MetricConfigRequest', (_message.Message,), { + 'DESCRIPTOR' : _METRICCONFIGREQUEST, + '__module__' : 'opentelemetry.proto.metrics.experimental.metrics_config_service_pb2' + # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.experimental.MetricConfigRequest) + }) +_sym_db.RegisterMessage(MetricConfigRequest) + +MetricConfigResponse = _reflection.GeneratedProtocolMessageType('MetricConfigResponse', (_message.Message,), { + + 'Schedule' : _reflection.GeneratedProtocolMessageType('Schedule', (_message.Message,), { + + 'Pattern' : _reflection.GeneratedProtocolMessageType('Pattern', (_message.Message,), { + 'DESCRIPTOR' : _METRICCONFIGRESPONSE_SCHEDULE_PATTERN, + '__module__' : 'opentelemetry.proto.metrics.experimental.metrics_config_service_pb2' + # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.experimental.MetricConfigResponse.Schedule.Pattern) + }) + , + 'DESCRIPTOR' : _METRICCONFIGRESPONSE_SCHEDULE, + '__module__' : 'opentelemetry.proto.metrics.experimental.metrics_config_service_pb2' + # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.experimental.MetricConfigResponse.Schedule) + }) + , + 'DESCRIPTOR' : _METRICCONFIGRESPONSE, + '__module__' : 'opentelemetry.proto.metrics.experimental.metrics_config_service_pb2' + # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.experimental.MetricConfigResponse) + }) +_sym_db.RegisterMessage(MetricConfigResponse) +_sym_db.RegisterMessage(MetricConfigResponse.Schedule) +_sym_db.RegisterMessage(MetricConfigResponse.Schedule.Pattern) + + +DESCRIPTOR._options = None + +_METRICCONFIG = _descriptor.ServiceDescriptor( + name='MetricConfig', + full_name='opentelemetry.proto.metrics.experimental.MetricConfig', + file=DESCRIPTOR, + index=0, + serialized_options=None, + serialized_start=763, + serialized_end=924, + methods=[ + _descriptor.MethodDescriptor( + name='GetMetricConfig', + full_name='opentelemetry.proto.metrics.experimental.MetricConfig.GetMetricConfig', + index=0, + containing_service=None, + input_type=_METRICCONFIGREQUEST, + output_type=_METRICCONFIGRESPONSE, + serialized_options=None, + ), +]) +_sym_db.RegisterServiceDescriptor(_METRICCONFIG) + +DESCRIPTOR.services_by_name['MetricConfig'] = _METRICCONFIG + +# @@protoc_insertion_point(module_scope) diff --git a/opentelemetry-proto/src/opentelemetry/proto/metrics/experimental/metrics_config_service_pb2.pyi b/opentelemetry-proto/src/opentelemetry/proto/metrics/experimental/metrics_config_service_pb2.pyi new file mode 100644 index 00000000000..7218e032647 --- /dev/null +++ b/opentelemetry-proto/src/opentelemetry/proto/metrics/experimental/metrics_config_service_pb2.pyi @@ -0,0 +1,88 @@ +""" +@generated by mypy-protobuf. Do not edit manually! +isort:skip_file +""" +import builtins +import google.protobuf.descriptor +import google.protobuf.internal.containers +import google.protobuf.message +import opentelemetry.proto.resource.v1.resource_pb2 +import typing +import typing_extensions + +DESCRIPTOR: google.protobuf.descriptor.FileDescriptor = ... + +class MetricConfigRequest(google.protobuf.message.Message): + DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... + RESOURCE_FIELD_NUMBER: builtins.int + LAST_KNOWN_FINGERPRINT_FIELD_NUMBER: builtins.int + last_known_fingerprint: builtins.bytes = ... + + @property + def resource(self) -> opentelemetry.proto.resource.v1.resource_pb2.Resource: ... + + def __init__(self, + *, + resource : typing.Optional[opentelemetry.proto.resource.v1.resource_pb2.Resource] = ..., + last_known_fingerprint : builtins.bytes = ..., + ) -> None: ... + def HasField(self, field_name: typing_extensions.Literal[u"resource",b"resource"]) -> builtins.bool: ... + def ClearField(self, field_name: typing_extensions.Literal[u"last_known_fingerprint",b"last_known_fingerprint",u"resource",b"resource"]) -> None: ... +global___MetricConfigRequest = MetricConfigRequest + +class MetricConfigResponse(google.protobuf.message.Message): + DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... + class Schedule(google.protobuf.message.Message): + DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... + class Pattern(google.protobuf.message.Message): + DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... + EQUALS_FIELD_NUMBER: builtins.int + STARTS_WITH_FIELD_NUMBER: builtins.int + equals: typing.Text = ... + starts_with: typing.Text = ... + + def __init__(self, + *, + equals : typing.Text = ..., + starts_with : typing.Text = ..., + ) -> None: ... + def HasField(self, field_name: typing_extensions.Literal[u"equals",b"equals",u"match",b"match",u"starts_with",b"starts_with"]) -> builtins.bool: ... + def ClearField(self, field_name: typing_extensions.Literal[u"equals",b"equals",u"match",b"match",u"starts_with",b"starts_with"]) -> None: ... + def WhichOneof(self, oneof_group: typing_extensions.Literal[u"match",b"match"]) -> typing_extensions.Literal["equals","starts_with"]: ... + + EXCLUSION_PATTERNS_FIELD_NUMBER: builtins.int + INCLUSION_PATTERNS_FIELD_NUMBER: builtins.int + PERIOD_SEC_FIELD_NUMBER: builtins.int + period_sec: builtins.int = ... + + @property + def exclusion_patterns(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___MetricConfigResponse.Schedule.Pattern]: ... + + @property + def inclusion_patterns(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___MetricConfigResponse.Schedule.Pattern]: ... + + def __init__(self, + *, + exclusion_patterns : typing.Optional[typing.Iterable[global___MetricConfigResponse.Schedule.Pattern]] = ..., + inclusion_patterns : typing.Optional[typing.Iterable[global___MetricConfigResponse.Schedule.Pattern]] = ..., + period_sec : builtins.int = ..., + ) -> None: ... + def ClearField(self, field_name: typing_extensions.Literal[u"exclusion_patterns",b"exclusion_patterns",u"inclusion_patterns",b"inclusion_patterns",u"period_sec",b"period_sec"]) -> None: ... + + FINGERPRINT_FIELD_NUMBER: builtins.int + SCHEDULES_FIELD_NUMBER: builtins.int + SUGGESTED_WAIT_TIME_SEC_FIELD_NUMBER: builtins.int + fingerprint: builtins.bytes = ... + suggested_wait_time_sec: builtins.int = ... + + @property + def schedules(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___MetricConfigResponse.Schedule]: ... + + def __init__(self, + *, + fingerprint : builtins.bytes = ..., + schedules : typing.Optional[typing.Iterable[global___MetricConfigResponse.Schedule]] = ..., + suggested_wait_time_sec : builtins.int = ..., + ) -> None: ... + def ClearField(self, field_name: typing_extensions.Literal[u"fingerprint",b"fingerprint",u"schedules",b"schedules",u"suggested_wait_time_sec",b"suggested_wait_time_sec"]) -> None: ... +global___MetricConfigResponse = MetricConfigResponse diff --git a/opentelemetry-proto/src/opentelemetry/proto/metrics/experimental/metrics_config_service_pb2_grpc.py b/opentelemetry-proto/src/opentelemetry/proto/metrics/experimental/metrics_config_service_pb2_grpc.py new file mode 100644 index 00000000000..829bf587123 --- /dev/null +++ b/opentelemetry-proto/src/opentelemetry/proto/metrics/experimental/metrics_config_service_pb2_grpc.py @@ -0,0 +1,82 @@ +# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! +import grpc + +from opentelemetry.proto.metrics.experimental import metrics_config_service_pb2 as opentelemetry_dot_proto_dot_metrics_dot_experimental_dot_metrics__config__service__pb2 + + +class MetricConfigStub(object): + """MetricConfig is a service that enables updating metric schedules, trace + parameters, and other configurations on the SDK without having to restart the + instrumented application. The collector can also serve as the configuration + service, acting as a bridge between third-party configuration services and + the SDK, piping updated configs from a third-party source to an instrumented + application. + """ + + def __init__(self, channel): + """Constructor. + + Args: + channel: A grpc.Channel. + """ + self.GetMetricConfig = channel.unary_unary( + '/opentelemetry.proto.metrics.experimental.MetricConfig/GetMetricConfig', + request_serializer=opentelemetry_dot_proto_dot_metrics_dot_experimental_dot_metrics__config__service__pb2.MetricConfigRequest.SerializeToString, + response_deserializer=opentelemetry_dot_proto_dot_metrics_dot_experimental_dot_metrics__config__service__pb2.MetricConfigResponse.FromString, + ) + + +class MetricConfigServicer(object): + """MetricConfig is a service that enables updating metric schedules, trace + parameters, and other configurations on the SDK without having to restart the + instrumented application. The collector can also serve as the configuration + service, acting as a bridge between third-party configuration services and + the SDK, piping updated configs from a third-party source to an instrumented + application. + """ + + def GetMetricConfig(self, request, context): + """Missing associated documentation comment in .proto file""" + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + + +def add_MetricConfigServicer_to_server(servicer, server): + rpc_method_handlers = { + 'GetMetricConfig': grpc.unary_unary_rpc_method_handler( + servicer.GetMetricConfig, + request_deserializer=opentelemetry_dot_proto_dot_metrics_dot_experimental_dot_metrics__config__service__pb2.MetricConfigRequest.FromString, + response_serializer=opentelemetry_dot_proto_dot_metrics_dot_experimental_dot_metrics__config__service__pb2.MetricConfigResponse.SerializeToString, + ), + } + generic_handler = grpc.method_handlers_generic_handler( + 'opentelemetry.proto.metrics.experimental.MetricConfig', rpc_method_handlers) + server.add_generic_rpc_handlers((generic_handler,)) + + + # This class is part of an EXPERIMENTAL API. +class MetricConfig(object): + """MetricConfig is a service that enables updating metric schedules, trace + parameters, and other configurations on the SDK without having to restart the + instrumented application. The collector can also serve as the configuration + service, acting as a bridge between third-party configuration services and + the SDK, piping updated configs from a third-party source to an instrumented + application. + """ + + @staticmethod + def GetMetricConfig(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary(request, target, '/opentelemetry.proto.metrics.experimental.MetricConfig/GetMetricConfig', + opentelemetry_dot_proto_dot_metrics_dot_experimental_dot_metrics__config__service__pb2.MetricConfigRequest.SerializeToString, + opentelemetry_dot_proto_dot_metrics_dot_experimental_dot_metrics__config__service__pb2.MetricConfigResponse.FromString, + options, channel_credentials, + call_credentials, compression, wait_for_ready, timeout, metadata) diff --git a/opentelemetry-proto/src/opentelemetry/proto/metrics/v1/metrics_pb2.py b/opentelemetry-proto/src/opentelemetry/proto/metrics/v1/metrics_pb2.py index 4e98c560fdb..77ad3c5c911 100644 --- a/opentelemetry-proto/src/opentelemetry/proto/metrics/v1/metrics_pb2.py +++ b/opentelemetry-proto/src/opentelemetry/proto/metrics/v1/metrics_pb2.py @@ -21,7 +21,7 @@ package='opentelemetry.proto.metrics.v1', syntax='proto3', serialized_options=b'\n!io.opentelemetry.proto.metrics.v1B\014MetricsProtoP\001Z?github.com/open-telemetry/opentelemetry-proto/gen/go/metrics/v1', - serialized_pb=b'\n,opentelemetry/proto/metrics/v1/metrics.proto\x12\x1eopentelemetry.proto.metrics.v1\x1a*opentelemetry/proto/common/v1/common.proto\x1a.opentelemetry/proto/resource/v1/resource.proto\"\xb6\x01\n\x0fResourceMetrics\x12;\n\x08resource\x18\x01 \x01(\x0b\x32).opentelemetry.proto.resource.v1.Resource\x12\x66\n\x1finstrumentation_library_metrics\x18\x02 \x03(\x0b\x32=.opentelemetry.proto.metrics.v1.InstrumentationLibraryMetrics\"\xb0\x01\n\x1dInstrumentationLibraryMetrics\x12V\n\x17instrumentation_library\x18\x01 \x01(\x0b\x32\x35.opentelemetry.proto.common.v1.InstrumentationLibrary\x12\x37\n\x07metrics\x18\x02 \x03(\x0b\x32&.opentelemetry.proto.metrics.v1.Metric\"\x9e\x04\n\x06Metric\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t\x12\x0c\n\x04unit\x18\x03 \x01(\t\x12=\n\tint_gauge\x18\x04 \x01(\x0b\x32(.opentelemetry.proto.metrics.v1.IntGaugeH\x00\x12\x43\n\x0c\x64ouble_gauge\x18\x05 \x01(\x0b\x32+.opentelemetry.proto.metrics.v1.DoubleGaugeH\x00\x12\x39\n\x07int_sum\x18\x06 \x01(\x0b\x32&.opentelemetry.proto.metrics.v1.IntSumH\x00\x12?\n\ndouble_sum\x18\x07 \x01(\x0b\x32).opentelemetry.proto.metrics.v1.DoubleSumH\x00\x12\x45\n\rint_histogram\x18\x08 \x01(\x0b\x32,.opentelemetry.proto.metrics.v1.IntHistogramH\x00\x12K\n\x10\x64ouble_histogram\x18\t \x01(\x0b\x32/.opentelemetry.proto.metrics.v1.DoubleHistogramH\x00\x12G\n\x0e\x64ouble_summary\x18\x0b \x01(\x0b\x32-.opentelemetry.proto.metrics.v1.DoubleSummaryH\x00\x42\x06\n\x04\x64\x61ta\"M\n\x08IntGauge\x12\x41\n\x0b\x64\x61ta_points\x18\x01 \x03(\x0b\x32,.opentelemetry.proto.metrics.v1.IntDataPoint\"S\n\x0b\x44oubleGauge\x12\x44\n\x0b\x64\x61ta_points\x18\x01 \x03(\x0b\x32/.opentelemetry.proto.metrics.v1.DoubleDataPoint\"\xba\x01\n\x06IntSum\x12\x41\n\x0b\x64\x61ta_points\x18\x01 \x03(\x0b\x32,.opentelemetry.proto.metrics.v1.IntDataPoint\x12W\n\x17\x61ggregation_temporality\x18\x02 \x01(\x0e\x32\x36.opentelemetry.proto.metrics.v1.AggregationTemporality\x12\x14\n\x0cis_monotonic\x18\x03 \x01(\x08\"\xc0\x01\n\tDoubleSum\x12\x44\n\x0b\x64\x61ta_points\x18\x01 \x03(\x0b\x32/.opentelemetry.proto.metrics.v1.DoubleDataPoint\x12W\n\x17\x61ggregation_temporality\x18\x02 \x01(\x0e\x32\x36.opentelemetry.proto.metrics.v1.AggregationTemporality\x12\x14\n\x0cis_monotonic\x18\x03 \x01(\x08\"\xb3\x01\n\x0cIntHistogram\x12J\n\x0b\x64\x61ta_points\x18\x01 \x03(\x0b\x32\x35.opentelemetry.proto.metrics.v1.IntHistogramDataPoint\x12W\n\x17\x61ggregation_temporality\x18\x02 \x01(\x0e\x32\x36.opentelemetry.proto.metrics.v1.AggregationTemporality\"\xb9\x01\n\x0f\x44oubleHistogram\x12M\n\x0b\x64\x61ta_points\x18\x01 \x03(\x0b\x32\x38.opentelemetry.proto.metrics.v1.DoubleHistogramDataPoint\x12W\n\x17\x61ggregation_temporality\x18\x02 \x01(\x0e\x32\x36.opentelemetry.proto.metrics.v1.AggregationTemporality\"\\\n\rDoubleSummary\x12K\n\x0b\x64\x61ta_points\x18\x01 \x03(\x0b\x32\x36.opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint\"\xd2\x01\n\x0cIntDataPoint\x12=\n\x06labels\x18\x01 \x03(\x0b\x32-.opentelemetry.proto.common.v1.StringKeyValue\x12\x1c\n\x14start_time_unix_nano\x18\x02 \x01(\x06\x12\x16\n\x0etime_unix_nano\x18\x03 \x01(\x06\x12\r\n\x05value\x18\x04 \x01(\x10\x12>\n\texemplars\x18\x05 \x03(\x0b\x32+.opentelemetry.proto.metrics.v1.IntExemplar\"\xd8\x01\n\x0f\x44oubleDataPoint\x12=\n\x06labels\x18\x01 \x03(\x0b\x32-.opentelemetry.proto.common.v1.StringKeyValue\x12\x1c\n\x14start_time_unix_nano\x18\x02 \x01(\x06\x12\x16\n\x0etime_unix_nano\x18\x03 \x01(\x06\x12\r\n\x05value\x18\x04 \x01(\x01\x12\x41\n\texemplars\x18\x05 \x03(\x0b\x32..opentelemetry.proto.metrics.v1.DoubleExemplar\"\x98\x02\n\x15IntHistogramDataPoint\x12=\n\x06labels\x18\x01 \x03(\x0b\x32-.opentelemetry.proto.common.v1.StringKeyValue\x12\x1c\n\x14start_time_unix_nano\x18\x02 \x01(\x06\x12\x16\n\x0etime_unix_nano\x18\x03 \x01(\x06\x12\r\n\x05\x63ount\x18\x04 \x01(\x06\x12\x0b\n\x03sum\x18\x05 \x01(\x10\x12\x15\n\rbucket_counts\x18\x06 \x03(\x06\x12\x17\n\x0f\x65xplicit_bounds\x18\x07 \x03(\x01\x12>\n\texemplars\x18\x08 \x03(\x0b\x32+.opentelemetry.proto.metrics.v1.IntExemplar\"\x9e\x02\n\x18\x44oubleHistogramDataPoint\x12=\n\x06labels\x18\x01 \x03(\x0b\x32-.opentelemetry.proto.common.v1.StringKeyValue\x12\x1c\n\x14start_time_unix_nano\x18\x02 \x01(\x06\x12\x16\n\x0etime_unix_nano\x18\x03 \x01(\x06\x12\r\n\x05\x63ount\x18\x04 \x01(\x06\x12\x0b\n\x03sum\x18\x05 \x01(\x01\x12\x15\n\rbucket_counts\x18\x06 \x03(\x06\x12\x17\n\x0f\x65xplicit_bounds\x18\x07 \x03(\x01\x12\x41\n\texemplars\x18\x08 \x03(\x0b\x32..opentelemetry.proto.metrics.v1.DoubleExemplar\"\xbe\x02\n\x16\x44oubleSummaryDataPoint\x12=\n\x06labels\x18\x01 \x03(\x0b\x32-.opentelemetry.proto.common.v1.StringKeyValue\x12\x1c\n\x14start_time_unix_nano\x18\x02 \x01(\x06\x12\x16\n\x0etime_unix_nano\x18\x03 \x01(\x06\x12\r\n\x05\x63ount\x18\x04 \x01(\x06\x12\x0b\n\x03sum\x18\x05 \x01(\x01\x12_\n\x0fquantile_values\x18\x06 \x03(\x0b\x32\x46.opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint.ValueAtQuantile\x1a\x32\n\x0fValueAtQuantile\x12\x10\n\x08quantile\x18\x01 \x01(\x01\x12\r\n\x05value\x18\x02 \x01(\x01\"\x9f\x01\n\x0bIntExemplar\x12\x46\n\x0f\x66iltered_labels\x18\x01 \x03(\x0b\x32-.opentelemetry.proto.common.v1.StringKeyValue\x12\x16\n\x0etime_unix_nano\x18\x02 \x01(\x06\x12\r\n\x05value\x18\x03 \x01(\x10\x12\x0f\n\x07span_id\x18\x04 \x01(\x0c\x12\x10\n\x08trace_id\x18\x05 \x01(\x0c\"\xa2\x01\n\x0e\x44oubleExemplar\x12\x46\n\x0f\x66iltered_labels\x18\x01 \x03(\x0b\x32-.opentelemetry.proto.common.v1.StringKeyValue\x12\x16\n\x0etime_unix_nano\x18\x02 \x01(\x06\x12\r\n\x05value\x18\x03 \x01(\x01\x12\x0f\n\x07span_id\x18\x04 \x01(\x0c\x12\x10\n\x08trace_id\x18\x05 \x01(\x0c*\x8c\x01\n\x16\x41ggregationTemporality\x12\'\n#AGGREGATION_TEMPORALITY_UNSPECIFIED\x10\x00\x12!\n\x1d\x41GGREGATION_TEMPORALITY_DELTA\x10\x01\x12&\n\"AGGREGATION_TEMPORALITY_CUMULATIVE\x10\x02\x42t\n!io.opentelemetry.proto.metrics.v1B\x0cMetricsProtoP\x01Z?github.com/open-telemetry/opentelemetry-proto/gen/go/metrics/v1b\x06proto3' + serialized_pb=b'\n,opentelemetry/proto/metrics/v1/metrics.proto\x12\x1eopentelemetry.proto.metrics.v1\x1a*opentelemetry/proto/common/v1/common.proto\x1a.opentelemetry/proto/resource/v1/resource.proto\"\xca\x01\n\x0fResourceMetrics\x12;\n\x08resource\x18\x01 \x01(\x0b\x32).opentelemetry.proto.resource.v1.Resource\x12\x66\n\x1finstrumentation_library_metrics\x18\x02 \x03(\x0b\x32=.opentelemetry.proto.metrics.v1.InstrumentationLibraryMetrics\x12\x12\n\nschema_url\x18\x03 \x01(\t\"\xc4\x01\n\x1dInstrumentationLibraryMetrics\x12V\n\x17instrumentation_library\x18\x01 \x01(\x0b\x32\x35.opentelemetry.proto.common.v1.InstrumentationLibrary\x12\x37\n\x07metrics\x18\x02 \x03(\x0b\x32&.opentelemetry.proto.metrics.v1.Metric\x12\x12\n\nschema_url\x18\x03 \x01(\t\"\xf6\x03\n\x06Metric\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t\x12\x0c\n\x04unit\x18\x03 \x01(\t\x12\x41\n\tint_gauge\x18\x04 \x01(\x0b\x32(.opentelemetry.proto.metrics.v1.IntGaugeB\x02\x18\x01H\x00\x12\x36\n\x05gauge\x18\x05 \x01(\x0b\x32%.opentelemetry.proto.metrics.v1.GaugeH\x00\x12=\n\x07int_sum\x18\x06 \x01(\x0b\x32&.opentelemetry.proto.metrics.v1.IntSumB\x02\x18\x01H\x00\x12\x32\n\x03sum\x18\x07 \x01(\x0b\x32#.opentelemetry.proto.metrics.v1.SumH\x00\x12I\n\rint_histogram\x18\x08 \x01(\x0b\x32,.opentelemetry.proto.metrics.v1.IntHistogramB\x02\x18\x01H\x00\x12>\n\thistogram\x18\t \x01(\x0b\x32).opentelemetry.proto.metrics.v1.HistogramH\x00\x12:\n\x07summary\x18\x0b \x01(\x0b\x32\'.opentelemetry.proto.metrics.v1.SummaryH\x00\x42\x06\n\x04\x64\x61ta\"Q\n\x08IntGauge\x12\x41\n\x0b\x64\x61ta_points\x18\x01 \x03(\x0b\x32,.opentelemetry.proto.metrics.v1.IntDataPoint:\x02\x18\x01\"M\n\x05Gauge\x12\x44\n\x0b\x64\x61ta_points\x18\x01 \x03(\x0b\x32/.opentelemetry.proto.metrics.v1.NumberDataPoint\"\xbe\x01\n\x06IntSum\x12\x41\n\x0b\x64\x61ta_points\x18\x01 \x03(\x0b\x32,.opentelemetry.proto.metrics.v1.IntDataPoint\x12W\n\x17\x61ggregation_temporality\x18\x02 \x01(\x0e\x32\x36.opentelemetry.proto.metrics.v1.AggregationTemporality\x12\x14\n\x0cis_monotonic\x18\x03 \x01(\x08:\x02\x18\x01\"\xba\x01\n\x03Sum\x12\x44\n\x0b\x64\x61ta_points\x18\x01 \x03(\x0b\x32/.opentelemetry.proto.metrics.v1.NumberDataPoint\x12W\n\x17\x61ggregation_temporality\x18\x02 \x01(\x0e\x32\x36.opentelemetry.proto.metrics.v1.AggregationTemporality\x12\x14\n\x0cis_monotonic\x18\x03 \x01(\x08\"\xb7\x01\n\x0cIntHistogram\x12J\n\x0b\x64\x61ta_points\x18\x01 \x03(\x0b\x32\x35.opentelemetry.proto.metrics.v1.IntHistogramDataPoint\x12W\n\x17\x61ggregation_temporality\x18\x02 \x01(\x0e\x32\x36.opentelemetry.proto.metrics.v1.AggregationTemporality:\x02\x18\x01\"\xad\x01\n\tHistogram\x12G\n\x0b\x64\x61ta_points\x18\x01 \x03(\x0b\x32\x32.opentelemetry.proto.metrics.v1.HistogramDataPoint\x12W\n\x17\x61ggregation_temporality\x18\x02 \x01(\x0e\x32\x36.opentelemetry.proto.metrics.v1.AggregationTemporality\"P\n\x07Summary\x12\x45\n\x0b\x64\x61ta_points\x18\x01 \x03(\x0b\x32\x30.opentelemetry.proto.metrics.v1.SummaryDataPoint\"\xd6\x01\n\x0cIntDataPoint\x12=\n\x06labels\x18\x01 \x03(\x0b\x32-.opentelemetry.proto.common.v1.StringKeyValue\x12\x1c\n\x14start_time_unix_nano\x18\x02 \x01(\x06\x12\x16\n\x0etime_unix_nano\x18\x03 \x01(\x06\x12\r\n\x05value\x18\x04 \x01(\x10\x12>\n\texemplars\x18\x05 \x03(\x0b\x32+.opentelemetry.proto.metrics.v1.IntExemplar:\x02\x18\x01\"\xb4\x02\n\x0fNumberDataPoint\x12;\n\nattributes\x18\x07 \x03(\x0b\x32\'.opentelemetry.proto.common.v1.KeyValue\x12\x41\n\x06labels\x18\x01 \x03(\x0b\x32-.opentelemetry.proto.common.v1.StringKeyValueB\x02\x18\x01\x12\x1c\n\x14start_time_unix_nano\x18\x02 \x01(\x06\x12\x16\n\x0etime_unix_nano\x18\x03 \x01(\x06\x12\x13\n\tas_double\x18\x04 \x01(\x01H\x00\x12\x10\n\x06\x61s_int\x18\x06 \x01(\x10H\x00\x12;\n\texemplars\x18\x05 \x03(\x0b\x32(.opentelemetry.proto.metrics.v1.ExemplarB\x07\n\x05value\"\x9c\x02\n\x15IntHistogramDataPoint\x12=\n\x06labels\x18\x01 \x03(\x0b\x32-.opentelemetry.proto.common.v1.StringKeyValue\x12\x1c\n\x14start_time_unix_nano\x18\x02 \x01(\x06\x12\x16\n\x0etime_unix_nano\x18\x03 \x01(\x06\x12\r\n\x05\x63ount\x18\x04 \x01(\x06\x12\x0b\n\x03sum\x18\x05 \x01(\x10\x12\x15\n\rbucket_counts\x18\x06 \x03(\x06\x12\x17\n\x0f\x65xplicit_bounds\x18\x07 \x03(\x01\x12>\n\texemplars\x18\x08 \x03(\x0b\x32+.opentelemetry.proto.metrics.v1.IntExemplar:\x02\x18\x01\"\xd3\x02\n\x12HistogramDataPoint\x12;\n\nattributes\x18\t \x03(\x0b\x32\'.opentelemetry.proto.common.v1.KeyValue\x12\x41\n\x06labels\x18\x01 \x03(\x0b\x32-.opentelemetry.proto.common.v1.StringKeyValueB\x02\x18\x01\x12\x1c\n\x14start_time_unix_nano\x18\x02 \x01(\x06\x12\x16\n\x0etime_unix_nano\x18\x03 \x01(\x06\x12\r\n\x05\x63ount\x18\x04 \x01(\x06\x12\x0b\n\x03sum\x18\x05 \x01(\x01\x12\x15\n\rbucket_counts\x18\x06 \x03(\x06\x12\x17\n\x0f\x65xplicit_bounds\x18\x07 \x03(\x01\x12;\n\texemplars\x18\x08 \x03(\x0b\x32(.opentelemetry.proto.metrics.v1.Exemplar\"\xf3\x02\n\x10SummaryDataPoint\x12;\n\nattributes\x18\x07 \x03(\x0b\x32\'.opentelemetry.proto.common.v1.KeyValue\x12\x41\n\x06labels\x18\x01 \x03(\x0b\x32-.opentelemetry.proto.common.v1.StringKeyValueB\x02\x18\x01\x12\x1c\n\x14start_time_unix_nano\x18\x02 \x01(\x06\x12\x16\n\x0etime_unix_nano\x18\x03 \x01(\x06\x12\r\n\x05\x63ount\x18\x04 \x01(\x06\x12\x0b\n\x03sum\x18\x05 \x01(\x01\x12Y\n\x0fquantile_values\x18\x06 \x03(\x0b\x32@.opentelemetry.proto.metrics.v1.SummaryDataPoint.ValueAtQuantile\x1a\x32\n\x0fValueAtQuantile\x12\x10\n\x08quantile\x18\x01 \x01(\x01\x12\r\n\x05value\x18\x02 \x01(\x01\"\xa3\x01\n\x0bIntExemplar\x12\x46\n\x0f\x66iltered_labels\x18\x01 \x03(\x0b\x32-.opentelemetry.proto.common.v1.StringKeyValue\x12\x16\n\x0etime_unix_nano\x18\x02 \x01(\x06\x12\r\n\x05value\x18\x03 \x01(\x10\x12\x0f\n\x07span_id\x18\x04 \x01(\x0c\x12\x10\n\x08trace_id\x18\x05 \x01(\x0c:\x02\x18\x01\"\x87\x02\n\x08\x45xemplar\x12\x44\n\x13\x66iltered_attributes\x18\x07 \x03(\x0b\x32\'.opentelemetry.proto.common.v1.KeyValue\x12J\n\x0f\x66iltered_labels\x18\x01 \x03(\x0b\x32-.opentelemetry.proto.common.v1.StringKeyValueB\x02\x18\x01\x12\x16\n\x0etime_unix_nano\x18\x02 \x01(\x06\x12\x13\n\tas_double\x18\x03 \x01(\x01H\x00\x12\x10\n\x06\x61s_int\x18\x06 \x01(\x10H\x00\x12\x0f\n\x07span_id\x18\x04 \x01(\x0c\x12\x10\n\x08trace_id\x18\x05 \x01(\x0c\x42\x07\n\x05value*\x8c\x01\n\x16\x41ggregationTemporality\x12\'\n#AGGREGATION_TEMPORALITY_UNSPECIFIED\x10\x00\x12!\n\x1d\x41GGREGATION_TEMPORALITY_DELTA\x10\x01\x12&\n\"AGGREGATION_TEMPORALITY_CUMULATIVE\x10\x02\x42t\n!io.opentelemetry.proto.metrics.v1B\x0cMetricsProtoP\x01Z?github.com/open-telemetry/opentelemetry-proto/gen/go/metrics/v1b\x06proto3' , dependencies=[opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2.DESCRIPTOR,opentelemetry_dot_proto_dot_resource_dot_v1_dot_resource__pb2.DESCRIPTOR,]) @@ -46,8 +46,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=3746, - serialized_end=3886, + serialized_start=4033, + serialized_end=4173, ) _sym_db.RegisterEnumDescriptor(_AGGREGATIONTEMPORALITY) @@ -79,6 +79,13 @@ message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='schema_url', full_name='opentelemetry.proto.metrics.v1.ResourceMetrics.schema_url', index=2, + number=3, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -92,7 +99,7 @@ oneofs=[ ], serialized_start=173, - serialized_end=355, + serialized_end=375, ) @@ -117,6 +124,13 @@ message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='schema_url', full_name='opentelemetry.proto.metrics.v1.InstrumentationLibraryMetrics.schema_url', index=2, + number=3, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -129,8 +143,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=358, - serialized_end=534, + serialized_start=378, + serialized_end=574, ) @@ -168,9 +182,9 @@ has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), + serialized_options=b'\030\001', file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='double_gauge', full_name='opentelemetry.proto.metrics.v1.Metric.double_gauge', index=4, + name='gauge', full_name='opentelemetry.proto.metrics.v1.Metric.gauge', index=4, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -182,9 +196,9 @@ has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), + serialized_options=b'\030\001', file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='double_sum', full_name='opentelemetry.proto.metrics.v1.Metric.double_sum', index=6, + name='sum', full_name='opentelemetry.proto.metrics.v1.Metric.sum', index=6, number=7, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -196,16 +210,16 @@ has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), + serialized_options=b'\030\001', file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='double_histogram', full_name='opentelemetry.proto.metrics.v1.Metric.double_histogram', index=8, + name='histogram', full_name='opentelemetry.proto.metrics.v1.Metric.histogram', index=8, number=9, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='double_summary', full_name='opentelemetry.proto.metrics.v1.Metric.double_summary', index=9, + name='summary', full_name='opentelemetry.proto.metrics.v1.Metric.summary', index=9, number=11, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -226,7 +240,7 @@ name='data', full_name='opentelemetry.proto.metrics.v1.Metric.data', index=0, containing_type=None, fields=[]), ], - serialized_start=537, + serialized_start=577, serialized_end=1079, ) @@ -251,26 +265,26 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + serialized_options=b'\030\001', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[ ], serialized_start=1081, - serialized_end=1158, + serialized_end=1162, ) -_DOUBLEGAUGE = _descriptor.Descriptor( - name='DoubleGauge', - full_name='opentelemetry.proto.metrics.v1.DoubleGauge', +_GAUGE = _descriptor.Descriptor( + name='Gauge', + full_name='opentelemetry.proto.metrics.v1.Gauge', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='data_points', full_name='opentelemetry.proto.metrics.v1.DoubleGauge.data_points', index=0, + name='data_points', full_name='opentelemetry.proto.metrics.v1.Gauge.data_points', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -288,8 +302,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1160, - serialized_end=1243, + serialized_start=1164, + serialized_end=1241, ) @@ -327,40 +341,40 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + serialized_options=b'\030\001', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=1246, - serialized_end=1432, + serialized_start=1244, + serialized_end=1434, ) -_DOUBLESUM = _descriptor.Descriptor( - name='DoubleSum', - full_name='opentelemetry.proto.metrics.v1.DoubleSum', +_SUM = _descriptor.Descriptor( + name='Sum', + full_name='opentelemetry.proto.metrics.v1.Sum', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='data_points', full_name='opentelemetry.proto.metrics.v1.DoubleSum.data_points', index=0, + name='data_points', full_name='opentelemetry.proto.metrics.v1.Sum.data_points', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='aggregation_temporality', full_name='opentelemetry.proto.metrics.v1.DoubleSum.aggregation_temporality', index=1, + name='aggregation_temporality', full_name='opentelemetry.proto.metrics.v1.Sum.aggregation_temporality', index=1, number=2, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='is_monotonic', full_name='opentelemetry.proto.metrics.v1.DoubleSum.is_monotonic', index=2, + name='is_monotonic', full_name='opentelemetry.proto.metrics.v1.Sum.is_monotonic', index=2, number=3, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, @@ -378,8 +392,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1435, - serialized_end=1627, + serialized_start=1437, + serialized_end=1623, ) @@ -410,33 +424,33 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + serialized_options=b'\030\001', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=1630, + serialized_start=1626, serialized_end=1809, ) -_DOUBLEHISTOGRAM = _descriptor.Descriptor( - name='DoubleHistogram', - full_name='opentelemetry.proto.metrics.v1.DoubleHistogram', +_HISTOGRAM = _descriptor.Descriptor( + name='Histogram', + full_name='opentelemetry.proto.metrics.v1.Histogram', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='data_points', full_name='opentelemetry.proto.metrics.v1.DoubleHistogram.data_points', index=0, + name='data_points', full_name='opentelemetry.proto.metrics.v1.Histogram.data_points', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='aggregation_temporality', full_name='opentelemetry.proto.metrics.v1.DoubleHistogram.aggregation_temporality', index=1, + name='aggregation_temporality', full_name='opentelemetry.proto.metrics.v1.Histogram.aggregation_temporality', index=1, number=2, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -455,19 +469,19 @@ oneofs=[ ], serialized_start=1812, - serialized_end=1997, + serialized_end=1985, ) -_DOUBLESUMMARY = _descriptor.Descriptor( - name='DoubleSummary', - full_name='opentelemetry.proto.metrics.v1.DoubleSummary', +_SUMMARY = _descriptor.Descriptor( + name='Summary', + full_name='opentelemetry.proto.metrics.v1.Summary', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='data_points', full_name='opentelemetry.proto.metrics.v1.DoubleSummary.data_points', index=0, + name='data_points', full_name='opentelemetry.proto.metrics.v1.Summary.data_points', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -485,8 +499,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1999, - serialized_end=2091, + serialized_start=1987, + serialized_end=2067, ) @@ -538,54 +552,68 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + serialized_options=b'\030\001', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=2094, - serialized_end=2304, + serialized_start=2070, + serialized_end=2284, ) -_DOUBLEDATAPOINT = _descriptor.Descriptor( - name='DoubleDataPoint', - full_name='opentelemetry.proto.metrics.v1.DoubleDataPoint', +_NUMBERDATAPOINT = _descriptor.Descriptor( + name='NumberDataPoint', + full_name='opentelemetry.proto.metrics.v1.NumberDataPoint', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='labels', full_name='opentelemetry.proto.metrics.v1.DoubleDataPoint.labels', index=0, - number=1, type=11, cpp_type=10, label=3, + name='attributes', full_name='opentelemetry.proto.metrics.v1.NumberDataPoint.attributes', index=0, + number=7, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='start_time_unix_nano', full_name='opentelemetry.proto.metrics.v1.DoubleDataPoint.start_time_unix_nano', index=1, + name='labels', full_name='opentelemetry.proto.metrics.v1.NumberDataPoint.labels', index=1, + number=1, type=11, cpp_type=10, label=3, + has_default_value=False, default_value=[], + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=b'\030\001', file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='start_time_unix_nano', full_name='opentelemetry.proto.metrics.v1.NumberDataPoint.start_time_unix_nano', index=2, number=2, type=6, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='time_unix_nano', full_name='opentelemetry.proto.metrics.v1.DoubleDataPoint.time_unix_nano', index=2, + name='time_unix_nano', full_name='opentelemetry.proto.metrics.v1.NumberDataPoint.time_unix_nano', index=3, number=3, type=6, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='value', full_name='opentelemetry.proto.metrics.v1.DoubleDataPoint.value', index=3, + name='as_double', full_name='opentelemetry.proto.metrics.v1.NumberDataPoint.as_double', index=4, number=4, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='exemplars', full_name='opentelemetry.proto.metrics.v1.DoubleDataPoint.exemplars', index=4, + name='as_int', full_name='opentelemetry.proto.metrics.v1.NumberDataPoint.as_int', index=5, + number=6, type=16, cpp_type=2, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='exemplars', full_name='opentelemetry.proto.metrics.v1.NumberDataPoint.exemplars', index=6, number=5, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -602,9 +630,12 @@ syntax='proto3', extension_ranges=[], oneofs=[ + _descriptor.OneofDescriptor( + name='value', full_name='opentelemetry.proto.metrics.v1.NumberDataPoint.value', + index=0, containing_type=None, fields=[]), ], - serialized_start=2307, - serialized_end=2523, + serialized_start=2287, + serialized_end=2595, ) @@ -677,75 +708,82 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + serialized_options=b'\030\001', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=2526, - serialized_end=2806, + serialized_start=2598, + serialized_end=2882, ) -_DOUBLEHISTOGRAMDATAPOINT = _descriptor.Descriptor( - name='DoubleHistogramDataPoint', - full_name='opentelemetry.proto.metrics.v1.DoubleHistogramDataPoint', +_HISTOGRAMDATAPOINT = _descriptor.Descriptor( + name='HistogramDataPoint', + full_name='opentelemetry.proto.metrics.v1.HistogramDataPoint', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='labels', full_name='opentelemetry.proto.metrics.v1.DoubleHistogramDataPoint.labels', index=0, - number=1, type=11, cpp_type=10, label=3, + name='attributes', full_name='opentelemetry.proto.metrics.v1.HistogramDataPoint.attributes', index=0, + number=9, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='start_time_unix_nano', full_name='opentelemetry.proto.metrics.v1.DoubleHistogramDataPoint.start_time_unix_nano', index=1, + name='labels', full_name='opentelemetry.proto.metrics.v1.HistogramDataPoint.labels', index=1, + number=1, type=11, cpp_type=10, label=3, + has_default_value=False, default_value=[], + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=b'\030\001', file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='start_time_unix_nano', full_name='opentelemetry.proto.metrics.v1.HistogramDataPoint.start_time_unix_nano', index=2, number=2, type=6, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='time_unix_nano', full_name='opentelemetry.proto.metrics.v1.DoubleHistogramDataPoint.time_unix_nano', index=2, + name='time_unix_nano', full_name='opentelemetry.proto.metrics.v1.HistogramDataPoint.time_unix_nano', index=3, number=3, type=6, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='count', full_name='opentelemetry.proto.metrics.v1.DoubleHistogramDataPoint.count', index=3, + name='count', full_name='opentelemetry.proto.metrics.v1.HistogramDataPoint.count', index=4, number=4, type=6, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='sum', full_name='opentelemetry.proto.metrics.v1.DoubleHistogramDataPoint.sum', index=4, + name='sum', full_name='opentelemetry.proto.metrics.v1.HistogramDataPoint.sum', index=5, number=5, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='bucket_counts', full_name='opentelemetry.proto.metrics.v1.DoubleHistogramDataPoint.bucket_counts', index=5, + name='bucket_counts', full_name='opentelemetry.proto.metrics.v1.HistogramDataPoint.bucket_counts', index=6, number=6, type=6, cpp_type=4, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='explicit_bounds', full_name='opentelemetry.proto.metrics.v1.DoubleHistogramDataPoint.explicit_bounds', index=6, + name='explicit_bounds', full_name='opentelemetry.proto.metrics.v1.HistogramDataPoint.explicit_bounds', index=7, number=7, type=1, cpp_type=5, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='exemplars', full_name='opentelemetry.proto.metrics.v1.DoubleHistogramDataPoint.exemplars', index=7, + name='exemplars', full_name='opentelemetry.proto.metrics.v1.HistogramDataPoint.exemplars', index=8, number=8, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -763,27 +801,27 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2809, - serialized_end=3095, + serialized_start=2885, + serialized_end=3224, ) -_DOUBLESUMMARYDATAPOINT_VALUEATQUANTILE = _descriptor.Descriptor( +_SUMMARYDATAPOINT_VALUEATQUANTILE = _descriptor.Descriptor( name='ValueAtQuantile', - full_name='opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint.ValueAtQuantile', + full_name='opentelemetry.proto.metrics.v1.SummaryDataPoint.ValueAtQuantile', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='quantile', full_name='opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint.ValueAtQuantile.quantile', index=0, + name='quantile', full_name='opentelemetry.proto.metrics.v1.SummaryDataPoint.ValueAtQuantile.quantile', index=0, number=1, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='value', full_name='opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint.ValueAtQuantile.value', index=1, + name='value', full_name='opentelemetry.proto.metrics.v1.SummaryDataPoint.ValueAtQuantile.value', index=1, number=2, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, @@ -801,54 +839,61 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3366, - serialized_end=3416, + serialized_start=3548, + serialized_end=3598, ) -_DOUBLESUMMARYDATAPOINT = _descriptor.Descriptor( - name='DoubleSummaryDataPoint', - full_name='opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint', +_SUMMARYDATAPOINT = _descriptor.Descriptor( + name='SummaryDataPoint', + full_name='opentelemetry.proto.metrics.v1.SummaryDataPoint', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='labels', full_name='opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint.labels', index=0, - number=1, type=11, cpp_type=10, label=3, + name='attributes', full_name='opentelemetry.proto.metrics.v1.SummaryDataPoint.attributes', index=0, + number=7, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='start_time_unix_nano', full_name='opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint.start_time_unix_nano', index=1, + name='labels', full_name='opentelemetry.proto.metrics.v1.SummaryDataPoint.labels', index=1, + number=1, type=11, cpp_type=10, label=3, + has_default_value=False, default_value=[], + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=b'\030\001', file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='start_time_unix_nano', full_name='opentelemetry.proto.metrics.v1.SummaryDataPoint.start_time_unix_nano', index=2, number=2, type=6, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='time_unix_nano', full_name='opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint.time_unix_nano', index=2, + name='time_unix_nano', full_name='opentelemetry.proto.metrics.v1.SummaryDataPoint.time_unix_nano', index=3, number=3, type=6, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='count', full_name='opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint.count', index=3, + name='count', full_name='opentelemetry.proto.metrics.v1.SummaryDataPoint.count', index=4, number=4, type=6, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='sum', full_name='opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint.sum', index=4, + name='sum', full_name='opentelemetry.proto.metrics.v1.SummaryDataPoint.sum', index=5, number=5, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='quantile_values', full_name='opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint.quantile_values', index=5, + name='quantile_values', full_name='opentelemetry.proto.metrics.v1.SummaryDataPoint.quantile_values', index=6, number=6, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -857,7 +902,7 @@ ], extensions=[ ], - nested_types=[_DOUBLESUMMARYDATAPOINT_VALUEATQUANTILE, ], + nested_types=[_SUMMARYDATAPOINT_VALUEATQUANTILE, ], enum_types=[ ], serialized_options=None, @@ -866,8 +911,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3098, - serialized_end=3416, + serialized_start=3227, + serialized_end=3598, ) @@ -919,54 +964,68 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + serialized_options=b'\030\001', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=3419, - serialized_end=3578, + serialized_start=3601, + serialized_end=3764, ) -_DOUBLEEXEMPLAR = _descriptor.Descriptor( - name='DoubleExemplar', - full_name='opentelemetry.proto.metrics.v1.DoubleExemplar', +_EXEMPLAR = _descriptor.Descriptor( + name='Exemplar', + full_name='opentelemetry.proto.metrics.v1.Exemplar', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='filtered_labels', full_name='opentelemetry.proto.metrics.v1.DoubleExemplar.filtered_labels', index=0, - number=1, type=11, cpp_type=10, label=3, + name='filtered_attributes', full_name='opentelemetry.proto.metrics.v1.Exemplar.filtered_attributes', index=0, + number=7, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='time_unix_nano', full_name='opentelemetry.proto.metrics.v1.DoubleExemplar.time_unix_nano', index=1, + name='filtered_labels', full_name='opentelemetry.proto.metrics.v1.Exemplar.filtered_labels', index=1, + number=1, type=11, cpp_type=10, label=3, + has_default_value=False, default_value=[], + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=b'\030\001', file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='time_unix_nano', full_name='opentelemetry.proto.metrics.v1.Exemplar.time_unix_nano', index=2, number=2, type=6, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='value', full_name='opentelemetry.proto.metrics.v1.DoubleExemplar.value', index=2, + name='as_double', full_name='opentelemetry.proto.metrics.v1.Exemplar.as_double', index=3, number=3, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='span_id', full_name='opentelemetry.proto.metrics.v1.DoubleExemplar.span_id', index=3, + name='as_int', full_name='opentelemetry.proto.metrics.v1.Exemplar.as_int', index=4, + number=6, type=16, cpp_type=2, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='span_id', full_name='opentelemetry.proto.metrics.v1.Exemplar.span_id', index=5, number=4, type=12, cpp_type=9, label=1, has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='trace_id', full_name='opentelemetry.proto.metrics.v1.DoubleExemplar.trace_id', index=4, + name='trace_id', full_name='opentelemetry.proto.metrics.v1.Exemplar.trace_id', index=6, number=5, type=12, cpp_type=9, label=1, has_default_value=False, default_value=b"", message_type=None, enum_type=None, containing_type=None, @@ -983,9 +1042,12 @@ syntax='proto3', extension_ranges=[], oneofs=[ + _descriptor.OneofDescriptor( + name='value', full_name='opentelemetry.proto.metrics.v1.Exemplar.value', + index=0, containing_type=None, fields=[]), ], - serialized_start=3581, - serialized_end=3743, + serialized_start=3767, + serialized_end=4030, ) _RESOURCEMETRICS.fields_by_name['resource'].message_type = opentelemetry_dot_proto_dot_resource_dot_v1_dot_resource__pb2._RESOURCE @@ -993,74 +1055,90 @@ _INSTRUMENTATIONLIBRARYMETRICS.fields_by_name['instrumentation_library'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._INSTRUMENTATIONLIBRARY _INSTRUMENTATIONLIBRARYMETRICS.fields_by_name['metrics'].message_type = _METRIC _METRIC.fields_by_name['int_gauge'].message_type = _INTGAUGE -_METRIC.fields_by_name['double_gauge'].message_type = _DOUBLEGAUGE +_METRIC.fields_by_name['gauge'].message_type = _GAUGE _METRIC.fields_by_name['int_sum'].message_type = _INTSUM -_METRIC.fields_by_name['double_sum'].message_type = _DOUBLESUM +_METRIC.fields_by_name['sum'].message_type = _SUM _METRIC.fields_by_name['int_histogram'].message_type = _INTHISTOGRAM -_METRIC.fields_by_name['double_histogram'].message_type = _DOUBLEHISTOGRAM -_METRIC.fields_by_name['double_summary'].message_type = _DOUBLESUMMARY +_METRIC.fields_by_name['histogram'].message_type = _HISTOGRAM +_METRIC.fields_by_name['summary'].message_type = _SUMMARY _METRIC.oneofs_by_name['data'].fields.append( _METRIC.fields_by_name['int_gauge']) _METRIC.fields_by_name['int_gauge'].containing_oneof = _METRIC.oneofs_by_name['data'] _METRIC.oneofs_by_name['data'].fields.append( - _METRIC.fields_by_name['double_gauge']) -_METRIC.fields_by_name['double_gauge'].containing_oneof = _METRIC.oneofs_by_name['data'] + _METRIC.fields_by_name['gauge']) +_METRIC.fields_by_name['gauge'].containing_oneof = _METRIC.oneofs_by_name['data'] _METRIC.oneofs_by_name['data'].fields.append( _METRIC.fields_by_name['int_sum']) _METRIC.fields_by_name['int_sum'].containing_oneof = _METRIC.oneofs_by_name['data'] _METRIC.oneofs_by_name['data'].fields.append( - _METRIC.fields_by_name['double_sum']) -_METRIC.fields_by_name['double_sum'].containing_oneof = _METRIC.oneofs_by_name['data'] + _METRIC.fields_by_name['sum']) +_METRIC.fields_by_name['sum'].containing_oneof = _METRIC.oneofs_by_name['data'] _METRIC.oneofs_by_name['data'].fields.append( _METRIC.fields_by_name['int_histogram']) _METRIC.fields_by_name['int_histogram'].containing_oneof = _METRIC.oneofs_by_name['data'] _METRIC.oneofs_by_name['data'].fields.append( - _METRIC.fields_by_name['double_histogram']) -_METRIC.fields_by_name['double_histogram'].containing_oneof = _METRIC.oneofs_by_name['data'] + _METRIC.fields_by_name['histogram']) +_METRIC.fields_by_name['histogram'].containing_oneof = _METRIC.oneofs_by_name['data'] _METRIC.oneofs_by_name['data'].fields.append( - _METRIC.fields_by_name['double_summary']) -_METRIC.fields_by_name['double_summary'].containing_oneof = _METRIC.oneofs_by_name['data'] + _METRIC.fields_by_name['summary']) +_METRIC.fields_by_name['summary'].containing_oneof = _METRIC.oneofs_by_name['data'] _INTGAUGE.fields_by_name['data_points'].message_type = _INTDATAPOINT -_DOUBLEGAUGE.fields_by_name['data_points'].message_type = _DOUBLEDATAPOINT +_GAUGE.fields_by_name['data_points'].message_type = _NUMBERDATAPOINT _INTSUM.fields_by_name['data_points'].message_type = _INTDATAPOINT _INTSUM.fields_by_name['aggregation_temporality'].enum_type = _AGGREGATIONTEMPORALITY -_DOUBLESUM.fields_by_name['data_points'].message_type = _DOUBLEDATAPOINT -_DOUBLESUM.fields_by_name['aggregation_temporality'].enum_type = _AGGREGATIONTEMPORALITY +_SUM.fields_by_name['data_points'].message_type = _NUMBERDATAPOINT +_SUM.fields_by_name['aggregation_temporality'].enum_type = _AGGREGATIONTEMPORALITY _INTHISTOGRAM.fields_by_name['data_points'].message_type = _INTHISTOGRAMDATAPOINT _INTHISTOGRAM.fields_by_name['aggregation_temporality'].enum_type = _AGGREGATIONTEMPORALITY -_DOUBLEHISTOGRAM.fields_by_name['data_points'].message_type = _DOUBLEHISTOGRAMDATAPOINT -_DOUBLEHISTOGRAM.fields_by_name['aggregation_temporality'].enum_type = _AGGREGATIONTEMPORALITY -_DOUBLESUMMARY.fields_by_name['data_points'].message_type = _DOUBLESUMMARYDATAPOINT +_HISTOGRAM.fields_by_name['data_points'].message_type = _HISTOGRAMDATAPOINT +_HISTOGRAM.fields_by_name['aggregation_temporality'].enum_type = _AGGREGATIONTEMPORALITY +_SUMMARY.fields_by_name['data_points'].message_type = _SUMMARYDATAPOINT _INTDATAPOINT.fields_by_name['labels'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._STRINGKEYVALUE _INTDATAPOINT.fields_by_name['exemplars'].message_type = _INTEXEMPLAR -_DOUBLEDATAPOINT.fields_by_name['labels'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._STRINGKEYVALUE -_DOUBLEDATAPOINT.fields_by_name['exemplars'].message_type = _DOUBLEEXEMPLAR +_NUMBERDATAPOINT.fields_by_name['attributes'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._KEYVALUE +_NUMBERDATAPOINT.fields_by_name['labels'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._STRINGKEYVALUE +_NUMBERDATAPOINT.fields_by_name['exemplars'].message_type = _EXEMPLAR +_NUMBERDATAPOINT.oneofs_by_name['value'].fields.append( + _NUMBERDATAPOINT.fields_by_name['as_double']) +_NUMBERDATAPOINT.fields_by_name['as_double'].containing_oneof = _NUMBERDATAPOINT.oneofs_by_name['value'] +_NUMBERDATAPOINT.oneofs_by_name['value'].fields.append( + _NUMBERDATAPOINT.fields_by_name['as_int']) +_NUMBERDATAPOINT.fields_by_name['as_int'].containing_oneof = _NUMBERDATAPOINT.oneofs_by_name['value'] _INTHISTOGRAMDATAPOINT.fields_by_name['labels'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._STRINGKEYVALUE _INTHISTOGRAMDATAPOINT.fields_by_name['exemplars'].message_type = _INTEXEMPLAR -_DOUBLEHISTOGRAMDATAPOINT.fields_by_name['labels'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._STRINGKEYVALUE -_DOUBLEHISTOGRAMDATAPOINT.fields_by_name['exemplars'].message_type = _DOUBLEEXEMPLAR -_DOUBLESUMMARYDATAPOINT_VALUEATQUANTILE.containing_type = _DOUBLESUMMARYDATAPOINT -_DOUBLESUMMARYDATAPOINT.fields_by_name['labels'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._STRINGKEYVALUE -_DOUBLESUMMARYDATAPOINT.fields_by_name['quantile_values'].message_type = _DOUBLESUMMARYDATAPOINT_VALUEATQUANTILE +_HISTOGRAMDATAPOINT.fields_by_name['attributes'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._KEYVALUE +_HISTOGRAMDATAPOINT.fields_by_name['labels'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._STRINGKEYVALUE +_HISTOGRAMDATAPOINT.fields_by_name['exemplars'].message_type = _EXEMPLAR +_SUMMARYDATAPOINT_VALUEATQUANTILE.containing_type = _SUMMARYDATAPOINT +_SUMMARYDATAPOINT.fields_by_name['attributes'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._KEYVALUE +_SUMMARYDATAPOINT.fields_by_name['labels'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._STRINGKEYVALUE +_SUMMARYDATAPOINT.fields_by_name['quantile_values'].message_type = _SUMMARYDATAPOINT_VALUEATQUANTILE _INTEXEMPLAR.fields_by_name['filtered_labels'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._STRINGKEYVALUE -_DOUBLEEXEMPLAR.fields_by_name['filtered_labels'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._STRINGKEYVALUE +_EXEMPLAR.fields_by_name['filtered_attributes'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._KEYVALUE +_EXEMPLAR.fields_by_name['filtered_labels'].message_type = opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2._STRINGKEYVALUE +_EXEMPLAR.oneofs_by_name['value'].fields.append( + _EXEMPLAR.fields_by_name['as_double']) +_EXEMPLAR.fields_by_name['as_double'].containing_oneof = _EXEMPLAR.oneofs_by_name['value'] +_EXEMPLAR.oneofs_by_name['value'].fields.append( + _EXEMPLAR.fields_by_name['as_int']) +_EXEMPLAR.fields_by_name['as_int'].containing_oneof = _EXEMPLAR.oneofs_by_name['value'] DESCRIPTOR.message_types_by_name['ResourceMetrics'] = _RESOURCEMETRICS DESCRIPTOR.message_types_by_name['InstrumentationLibraryMetrics'] = _INSTRUMENTATIONLIBRARYMETRICS DESCRIPTOR.message_types_by_name['Metric'] = _METRIC DESCRIPTOR.message_types_by_name['IntGauge'] = _INTGAUGE -DESCRIPTOR.message_types_by_name['DoubleGauge'] = _DOUBLEGAUGE +DESCRIPTOR.message_types_by_name['Gauge'] = _GAUGE DESCRIPTOR.message_types_by_name['IntSum'] = _INTSUM -DESCRIPTOR.message_types_by_name['DoubleSum'] = _DOUBLESUM +DESCRIPTOR.message_types_by_name['Sum'] = _SUM DESCRIPTOR.message_types_by_name['IntHistogram'] = _INTHISTOGRAM -DESCRIPTOR.message_types_by_name['DoubleHistogram'] = _DOUBLEHISTOGRAM -DESCRIPTOR.message_types_by_name['DoubleSummary'] = _DOUBLESUMMARY +DESCRIPTOR.message_types_by_name['Histogram'] = _HISTOGRAM +DESCRIPTOR.message_types_by_name['Summary'] = _SUMMARY DESCRIPTOR.message_types_by_name['IntDataPoint'] = _INTDATAPOINT -DESCRIPTOR.message_types_by_name['DoubleDataPoint'] = _DOUBLEDATAPOINT +DESCRIPTOR.message_types_by_name['NumberDataPoint'] = _NUMBERDATAPOINT DESCRIPTOR.message_types_by_name['IntHistogramDataPoint'] = _INTHISTOGRAMDATAPOINT -DESCRIPTOR.message_types_by_name['DoubleHistogramDataPoint'] = _DOUBLEHISTOGRAMDATAPOINT -DESCRIPTOR.message_types_by_name['DoubleSummaryDataPoint'] = _DOUBLESUMMARYDATAPOINT +DESCRIPTOR.message_types_by_name['HistogramDataPoint'] = _HISTOGRAMDATAPOINT +DESCRIPTOR.message_types_by_name['SummaryDataPoint'] = _SUMMARYDATAPOINT DESCRIPTOR.message_types_by_name['IntExemplar'] = _INTEXEMPLAR -DESCRIPTOR.message_types_by_name['DoubleExemplar'] = _DOUBLEEXEMPLAR +DESCRIPTOR.message_types_by_name['Exemplar'] = _EXEMPLAR DESCRIPTOR.enum_types_by_name['AggregationTemporality'] = _AGGREGATIONTEMPORALITY _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -1092,12 +1170,12 @@ }) _sym_db.RegisterMessage(IntGauge) -DoubleGauge = _reflection.GeneratedProtocolMessageType('DoubleGauge', (_message.Message,), { - 'DESCRIPTOR' : _DOUBLEGAUGE, +Gauge = _reflection.GeneratedProtocolMessageType('Gauge', (_message.Message,), { + 'DESCRIPTOR' : _GAUGE, '__module__' : 'opentelemetry.proto.metrics.v1.metrics_pb2' - # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.DoubleGauge) + # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.Gauge) }) -_sym_db.RegisterMessage(DoubleGauge) +_sym_db.RegisterMessage(Gauge) IntSum = _reflection.GeneratedProtocolMessageType('IntSum', (_message.Message,), { 'DESCRIPTOR' : _INTSUM, @@ -1106,12 +1184,12 @@ }) _sym_db.RegisterMessage(IntSum) -DoubleSum = _reflection.GeneratedProtocolMessageType('DoubleSum', (_message.Message,), { - 'DESCRIPTOR' : _DOUBLESUM, +Sum = _reflection.GeneratedProtocolMessageType('Sum', (_message.Message,), { + 'DESCRIPTOR' : _SUM, '__module__' : 'opentelemetry.proto.metrics.v1.metrics_pb2' - # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.DoubleSum) + # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.Sum) }) -_sym_db.RegisterMessage(DoubleSum) +_sym_db.RegisterMessage(Sum) IntHistogram = _reflection.GeneratedProtocolMessageType('IntHistogram', (_message.Message,), { 'DESCRIPTOR' : _INTHISTOGRAM, @@ -1120,19 +1198,19 @@ }) _sym_db.RegisterMessage(IntHistogram) -DoubleHistogram = _reflection.GeneratedProtocolMessageType('DoubleHistogram', (_message.Message,), { - 'DESCRIPTOR' : _DOUBLEHISTOGRAM, +Histogram = _reflection.GeneratedProtocolMessageType('Histogram', (_message.Message,), { + 'DESCRIPTOR' : _HISTOGRAM, '__module__' : 'opentelemetry.proto.metrics.v1.metrics_pb2' - # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.DoubleHistogram) + # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.Histogram) }) -_sym_db.RegisterMessage(DoubleHistogram) +_sym_db.RegisterMessage(Histogram) -DoubleSummary = _reflection.GeneratedProtocolMessageType('DoubleSummary', (_message.Message,), { - 'DESCRIPTOR' : _DOUBLESUMMARY, +Summary = _reflection.GeneratedProtocolMessageType('Summary', (_message.Message,), { + 'DESCRIPTOR' : _SUMMARY, '__module__' : 'opentelemetry.proto.metrics.v1.metrics_pb2' - # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.DoubleSummary) + # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.Summary) }) -_sym_db.RegisterMessage(DoubleSummary) +_sym_db.RegisterMessage(Summary) IntDataPoint = _reflection.GeneratedProtocolMessageType('IntDataPoint', (_message.Message,), { 'DESCRIPTOR' : _INTDATAPOINT, @@ -1141,12 +1219,12 @@ }) _sym_db.RegisterMessage(IntDataPoint) -DoubleDataPoint = _reflection.GeneratedProtocolMessageType('DoubleDataPoint', (_message.Message,), { - 'DESCRIPTOR' : _DOUBLEDATAPOINT, +NumberDataPoint = _reflection.GeneratedProtocolMessageType('NumberDataPoint', (_message.Message,), { + 'DESCRIPTOR' : _NUMBERDATAPOINT, '__module__' : 'opentelemetry.proto.metrics.v1.metrics_pb2' - # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.DoubleDataPoint) + # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.NumberDataPoint) }) -_sym_db.RegisterMessage(DoubleDataPoint) +_sym_db.RegisterMessage(NumberDataPoint) IntHistogramDataPoint = _reflection.GeneratedProtocolMessageType('IntHistogramDataPoint', (_message.Message,), { 'DESCRIPTOR' : _INTHISTOGRAMDATAPOINT, @@ -1155,27 +1233,27 @@ }) _sym_db.RegisterMessage(IntHistogramDataPoint) -DoubleHistogramDataPoint = _reflection.GeneratedProtocolMessageType('DoubleHistogramDataPoint', (_message.Message,), { - 'DESCRIPTOR' : _DOUBLEHISTOGRAMDATAPOINT, +HistogramDataPoint = _reflection.GeneratedProtocolMessageType('HistogramDataPoint', (_message.Message,), { + 'DESCRIPTOR' : _HISTOGRAMDATAPOINT, '__module__' : 'opentelemetry.proto.metrics.v1.metrics_pb2' - # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.DoubleHistogramDataPoint) + # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.HistogramDataPoint) }) -_sym_db.RegisterMessage(DoubleHistogramDataPoint) +_sym_db.RegisterMessage(HistogramDataPoint) -DoubleSummaryDataPoint = _reflection.GeneratedProtocolMessageType('DoubleSummaryDataPoint', (_message.Message,), { +SummaryDataPoint = _reflection.GeneratedProtocolMessageType('SummaryDataPoint', (_message.Message,), { 'ValueAtQuantile' : _reflection.GeneratedProtocolMessageType('ValueAtQuantile', (_message.Message,), { - 'DESCRIPTOR' : _DOUBLESUMMARYDATAPOINT_VALUEATQUANTILE, + 'DESCRIPTOR' : _SUMMARYDATAPOINT_VALUEATQUANTILE, '__module__' : 'opentelemetry.proto.metrics.v1.metrics_pb2' - # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint.ValueAtQuantile) + # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.SummaryDataPoint.ValueAtQuantile) }) , - 'DESCRIPTOR' : _DOUBLESUMMARYDATAPOINT, + 'DESCRIPTOR' : _SUMMARYDATAPOINT, '__module__' : 'opentelemetry.proto.metrics.v1.metrics_pb2' - # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint) + # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.SummaryDataPoint) }) -_sym_db.RegisterMessage(DoubleSummaryDataPoint) -_sym_db.RegisterMessage(DoubleSummaryDataPoint.ValueAtQuantile) +_sym_db.RegisterMessage(SummaryDataPoint) +_sym_db.RegisterMessage(SummaryDataPoint.ValueAtQuantile) IntExemplar = _reflection.GeneratedProtocolMessageType('IntExemplar', (_message.Message,), { 'DESCRIPTOR' : _INTEXEMPLAR, @@ -1184,13 +1262,26 @@ }) _sym_db.RegisterMessage(IntExemplar) -DoubleExemplar = _reflection.GeneratedProtocolMessageType('DoubleExemplar', (_message.Message,), { - 'DESCRIPTOR' : _DOUBLEEXEMPLAR, +Exemplar = _reflection.GeneratedProtocolMessageType('Exemplar', (_message.Message,), { + 'DESCRIPTOR' : _EXEMPLAR, '__module__' : 'opentelemetry.proto.metrics.v1.metrics_pb2' - # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.DoubleExemplar) + # @@protoc_insertion_point(class_scope:opentelemetry.proto.metrics.v1.Exemplar) }) -_sym_db.RegisterMessage(DoubleExemplar) +_sym_db.RegisterMessage(Exemplar) DESCRIPTOR._options = None +_METRIC.fields_by_name['int_gauge']._options = None +_METRIC.fields_by_name['int_sum']._options = None +_METRIC.fields_by_name['int_histogram']._options = None +_INTGAUGE._options = None +_INTSUM._options = None +_INTHISTOGRAM._options = None +_INTDATAPOINT._options = None +_NUMBERDATAPOINT.fields_by_name['labels']._options = None +_INTHISTOGRAMDATAPOINT._options = None +_HISTOGRAMDATAPOINT.fields_by_name['labels']._options = None +_SUMMARYDATAPOINT.fields_by_name['labels']._options = None +_INTEXEMPLAR._options = None +_EXEMPLAR.fields_by_name['filtered_labels']._options = None # @@protoc_insertion_point(module_scope) diff --git a/opentelemetry-proto/src/opentelemetry/proto/metrics/v1/metrics_pb2.pyi b/opentelemetry-proto/src/opentelemetry/proto/metrics/v1/metrics_pb2.pyi index d4e03f3a398..fb181488cd2 100644 --- a/opentelemetry-proto/src/opentelemetry/proto/metrics/v1/metrics_pb2.pyi +++ b/opentelemetry-proto/src/opentelemetry/proto/metrics/v1/metrics_pb2.pyi @@ -30,6 +30,8 @@ class ResourceMetrics(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... RESOURCE_FIELD_NUMBER: builtins.int INSTRUMENTATION_LIBRARY_METRICS_FIELD_NUMBER: builtins.int + SCHEMA_URL_FIELD_NUMBER: builtins.int + schema_url: typing.Text = ... @property def resource(self) -> opentelemetry.proto.resource.v1.resource_pb2.Resource: ... @@ -41,15 +43,18 @@ class ResourceMetrics(google.protobuf.message.Message): *, resource : typing.Optional[opentelemetry.proto.resource.v1.resource_pb2.Resource] = ..., instrumentation_library_metrics : typing.Optional[typing.Iterable[global___InstrumentationLibraryMetrics]] = ..., + schema_url : typing.Text = ..., ) -> None: ... def HasField(self, field_name: typing_extensions.Literal[u"resource",b"resource"]) -> builtins.bool: ... - def ClearField(self, field_name: typing_extensions.Literal[u"instrumentation_library_metrics",b"instrumentation_library_metrics",u"resource",b"resource"]) -> None: ... + def ClearField(self, field_name: typing_extensions.Literal[u"instrumentation_library_metrics",b"instrumentation_library_metrics",u"resource",b"resource",u"schema_url",b"schema_url"]) -> None: ... global___ResourceMetrics = ResourceMetrics class InstrumentationLibraryMetrics(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... INSTRUMENTATION_LIBRARY_FIELD_NUMBER: builtins.int METRICS_FIELD_NUMBER: builtins.int + SCHEMA_URL_FIELD_NUMBER: builtins.int + schema_url: typing.Text = ... @property def instrumentation_library(self) -> opentelemetry.proto.common.v1.common_pb2.InstrumentationLibrary: ... @@ -61,9 +66,10 @@ class InstrumentationLibraryMetrics(google.protobuf.message.Message): *, instrumentation_library : typing.Optional[opentelemetry.proto.common.v1.common_pb2.InstrumentationLibrary] = ..., metrics : typing.Optional[typing.Iterable[global___Metric]] = ..., + schema_url : typing.Text = ..., ) -> None: ... def HasField(self, field_name: typing_extensions.Literal[u"instrumentation_library",b"instrumentation_library"]) -> builtins.bool: ... - def ClearField(self, field_name: typing_extensions.Literal[u"instrumentation_library",b"instrumentation_library",u"metrics",b"metrics"]) -> None: ... + def ClearField(self, field_name: typing_extensions.Literal[u"instrumentation_library",b"instrumentation_library",u"metrics",b"metrics",u"schema_url",b"schema_url"]) -> None: ... global___InstrumentationLibraryMetrics = InstrumentationLibraryMetrics class Metric(google.protobuf.message.Message): @@ -72,12 +78,12 @@ class Metric(google.protobuf.message.Message): DESCRIPTION_FIELD_NUMBER: builtins.int UNIT_FIELD_NUMBER: builtins.int INT_GAUGE_FIELD_NUMBER: builtins.int - DOUBLE_GAUGE_FIELD_NUMBER: builtins.int + GAUGE_FIELD_NUMBER: builtins.int INT_SUM_FIELD_NUMBER: builtins.int - DOUBLE_SUM_FIELD_NUMBER: builtins.int + SUM_FIELD_NUMBER: builtins.int INT_HISTOGRAM_FIELD_NUMBER: builtins.int - DOUBLE_HISTOGRAM_FIELD_NUMBER: builtins.int - DOUBLE_SUMMARY_FIELD_NUMBER: builtins.int + HISTOGRAM_FIELD_NUMBER: builtins.int + SUMMARY_FIELD_NUMBER: builtins.int name: typing.Text = ... description: typing.Text = ... unit: typing.Text = ... @@ -86,22 +92,22 @@ class Metric(google.protobuf.message.Message): def int_gauge(self) -> global___IntGauge: ... @property - def double_gauge(self) -> global___DoubleGauge: ... + def gauge(self) -> global___Gauge: ... @property def int_sum(self) -> global___IntSum: ... @property - def double_sum(self) -> global___DoubleSum: ... + def sum(self) -> global___Sum: ... @property def int_histogram(self) -> global___IntHistogram: ... @property - def double_histogram(self) -> global___DoubleHistogram: ... + def histogram(self) -> global___Histogram: ... @property - def double_summary(self) -> global___DoubleSummary: ... + def summary(self) -> global___Summary: ... def __init__(self, *, @@ -109,16 +115,16 @@ class Metric(google.protobuf.message.Message): description : typing.Text = ..., unit : typing.Text = ..., int_gauge : typing.Optional[global___IntGauge] = ..., - double_gauge : typing.Optional[global___DoubleGauge] = ..., + gauge : typing.Optional[global___Gauge] = ..., int_sum : typing.Optional[global___IntSum] = ..., - double_sum : typing.Optional[global___DoubleSum] = ..., + sum : typing.Optional[global___Sum] = ..., int_histogram : typing.Optional[global___IntHistogram] = ..., - double_histogram : typing.Optional[global___DoubleHistogram] = ..., - double_summary : typing.Optional[global___DoubleSummary] = ..., + histogram : typing.Optional[global___Histogram] = ..., + summary : typing.Optional[global___Summary] = ..., ) -> None: ... - def HasField(self, field_name: typing_extensions.Literal[u"data",b"data",u"double_gauge",b"double_gauge",u"double_histogram",b"double_histogram",u"double_sum",b"double_sum",u"double_summary",b"double_summary",u"int_gauge",b"int_gauge",u"int_histogram",b"int_histogram",u"int_sum",b"int_sum"]) -> builtins.bool: ... - def ClearField(self, field_name: typing_extensions.Literal[u"data",b"data",u"description",b"description",u"double_gauge",b"double_gauge",u"double_histogram",b"double_histogram",u"double_sum",b"double_sum",u"double_summary",b"double_summary",u"int_gauge",b"int_gauge",u"int_histogram",b"int_histogram",u"int_sum",b"int_sum",u"name",b"name",u"unit",b"unit"]) -> None: ... - def WhichOneof(self, oneof_group: typing_extensions.Literal[u"data",b"data"]) -> typing_extensions.Literal["int_gauge","double_gauge","int_sum","double_sum","int_histogram","double_histogram","double_summary"]: ... + def HasField(self, field_name: typing_extensions.Literal[u"data",b"data",u"gauge",b"gauge",u"histogram",b"histogram",u"int_gauge",b"int_gauge",u"int_histogram",b"int_histogram",u"int_sum",b"int_sum",u"sum",b"sum",u"summary",b"summary"]) -> builtins.bool: ... + def ClearField(self, field_name: typing_extensions.Literal[u"data",b"data",u"description",b"description",u"gauge",b"gauge",u"histogram",b"histogram",u"int_gauge",b"int_gauge",u"int_histogram",b"int_histogram",u"int_sum",b"int_sum",u"name",b"name",u"sum",b"sum",u"summary",b"summary",u"unit",b"unit"]) -> None: ... + def WhichOneof(self, oneof_group: typing_extensions.Literal[u"data",b"data"]) -> typing_extensions.Literal["int_gauge","gauge","int_sum","sum","int_histogram","histogram","summary"]: ... global___Metric = Metric class IntGauge(google.protobuf.message.Message): @@ -135,19 +141,19 @@ class IntGauge(google.protobuf.message.Message): def ClearField(self, field_name: typing_extensions.Literal[u"data_points",b"data_points"]) -> None: ... global___IntGauge = IntGauge -class DoubleGauge(google.protobuf.message.Message): +class Gauge(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... DATA_POINTS_FIELD_NUMBER: builtins.int @property - def data_points(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___DoubleDataPoint]: ... + def data_points(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___NumberDataPoint]: ... def __init__(self, *, - data_points : typing.Optional[typing.Iterable[global___DoubleDataPoint]] = ..., + data_points : typing.Optional[typing.Iterable[global___NumberDataPoint]] = ..., ) -> None: ... def ClearField(self, field_name: typing_extensions.Literal[u"data_points",b"data_points"]) -> None: ... -global___DoubleGauge = DoubleGauge +global___Gauge = Gauge class IntSum(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... @@ -169,7 +175,7 @@ class IntSum(google.protobuf.message.Message): def ClearField(self, field_name: typing_extensions.Literal[u"aggregation_temporality",b"aggregation_temporality",u"data_points",b"data_points",u"is_monotonic",b"is_monotonic"]) -> None: ... global___IntSum = IntSum -class DoubleSum(google.protobuf.message.Message): +class Sum(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... DATA_POINTS_FIELD_NUMBER: builtins.int AGGREGATION_TEMPORALITY_FIELD_NUMBER: builtins.int @@ -178,16 +184,16 @@ class DoubleSum(google.protobuf.message.Message): is_monotonic: builtins.bool = ... @property - def data_points(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___DoubleDataPoint]: ... + def data_points(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___NumberDataPoint]: ... def __init__(self, *, - data_points : typing.Optional[typing.Iterable[global___DoubleDataPoint]] = ..., + data_points : typing.Optional[typing.Iterable[global___NumberDataPoint]] = ..., aggregation_temporality : global___AggregationTemporality.V = ..., is_monotonic : builtins.bool = ..., ) -> None: ... def ClearField(self, field_name: typing_extensions.Literal[u"aggregation_temporality",b"aggregation_temporality",u"data_points",b"data_points",u"is_monotonic",b"is_monotonic"]) -> None: ... -global___DoubleSum = DoubleSum +global___Sum = Sum class IntHistogram(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... @@ -206,36 +212,36 @@ class IntHistogram(google.protobuf.message.Message): def ClearField(self, field_name: typing_extensions.Literal[u"aggregation_temporality",b"aggregation_temporality",u"data_points",b"data_points"]) -> None: ... global___IntHistogram = IntHistogram -class DoubleHistogram(google.protobuf.message.Message): +class Histogram(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... DATA_POINTS_FIELD_NUMBER: builtins.int AGGREGATION_TEMPORALITY_FIELD_NUMBER: builtins.int aggregation_temporality: global___AggregationTemporality.V = ... @property - def data_points(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___DoubleHistogramDataPoint]: ... + def data_points(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___HistogramDataPoint]: ... def __init__(self, *, - data_points : typing.Optional[typing.Iterable[global___DoubleHistogramDataPoint]] = ..., + data_points : typing.Optional[typing.Iterable[global___HistogramDataPoint]] = ..., aggregation_temporality : global___AggregationTemporality.V = ..., ) -> None: ... def ClearField(self, field_name: typing_extensions.Literal[u"aggregation_temporality",b"aggregation_temporality",u"data_points",b"data_points"]) -> None: ... -global___DoubleHistogram = DoubleHistogram +global___Histogram = Histogram -class DoubleSummary(google.protobuf.message.Message): +class Summary(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... DATA_POINTS_FIELD_NUMBER: builtins.int @property - def data_points(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___DoubleSummaryDataPoint]: ... + def data_points(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___SummaryDataPoint]: ... def __init__(self, *, - data_points : typing.Optional[typing.Iterable[global___DoubleSummaryDataPoint]] = ..., + data_points : typing.Optional[typing.Iterable[global___SummaryDataPoint]] = ..., ) -> None: ... def ClearField(self, field_name: typing_extensions.Literal[u"data_points",b"data_points"]) -> None: ... -global___DoubleSummary = DoubleSummary +global___Summary = Summary class IntDataPoint(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... @@ -265,33 +271,43 @@ class IntDataPoint(google.protobuf.message.Message): def ClearField(self, field_name: typing_extensions.Literal[u"exemplars",b"exemplars",u"labels",b"labels",u"start_time_unix_nano",b"start_time_unix_nano",u"time_unix_nano",b"time_unix_nano",u"value",b"value"]) -> None: ... global___IntDataPoint = IntDataPoint -class DoubleDataPoint(google.protobuf.message.Message): +class NumberDataPoint(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... + ATTRIBUTES_FIELD_NUMBER: builtins.int LABELS_FIELD_NUMBER: builtins.int START_TIME_UNIX_NANO_FIELD_NUMBER: builtins.int TIME_UNIX_NANO_FIELD_NUMBER: builtins.int - VALUE_FIELD_NUMBER: builtins.int + AS_DOUBLE_FIELD_NUMBER: builtins.int + AS_INT_FIELD_NUMBER: builtins.int EXEMPLARS_FIELD_NUMBER: builtins.int start_time_unix_nano: builtins.int = ... time_unix_nano: builtins.int = ... - value: builtins.float = ... + as_double: builtins.float = ... + as_int: builtins.int = ... + + @property + def attributes(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[opentelemetry.proto.common.v1.common_pb2.KeyValue]: ... @property def labels(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[opentelemetry.proto.common.v1.common_pb2.StringKeyValue]: ... @property - def exemplars(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___DoubleExemplar]: ... + def exemplars(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___Exemplar]: ... def __init__(self, *, + attributes : typing.Optional[typing.Iterable[opentelemetry.proto.common.v1.common_pb2.KeyValue]] = ..., labels : typing.Optional[typing.Iterable[opentelemetry.proto.common.v1.common_pb2.StringKeyValue]] = ..., start_time_unix_nano : builtins.int = ..., time_unix_nano : builtins.int = ..., - value : builtins.float = ..., - exemplars : typing.Optional[typing.Iterable[global___DoubleExemplar]] = ..., + as_double : builtins.float = ..., + as_int : builtins.int = ..., + exemplars : typing.Optional[typing.Iterable[global___Exemplar]] = ..., ) -> None: ... - def ClearField(self, field_name: typing_extensions.Literal[u"exemplars",b"exemplars",u"labels",b"labels",u"start_time_unix_nano",b"start_time_unix_nano",u"time_unix_nano",b"time_unix_nano",u"value",b"value"]) -> None: ... -global___DoubleDataPoint = DoubleDataPoint + def HasField(self, field_name: typing_extensions.Literal[u"as_double",b"as_double",u"as_int",b"as_int",u"value",b"value"]) -> builtins.bool: ... + def ClearField(self, field_name: typing_extensions.Literal[u"as_double",b"as_double",u"as_int",b"as_int",u"attributes",b"attributes",u"exemplars",b"exemplars",u"labels",b"labels",u"start_time_unix_nano",b"start_time_unix_nano",u"time_unix_nano",b"time_unix_nano",u"value",b"value"]) -> None: ... + def WhichOneof(self, oneof_group: typing_extensions.Literal[u"value",b"value"]) -> typing_extensions.Literal["as_double","as_int"]: ... +global___NumberDataPoint = NumberDataPoint class IntHistogramDataPoint(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... @@ -330,8 +346,9 @@ class IntHistogramDataPoint(google.protobuf.message.Message): def ClearField(self, field_name: typing_extensions.Literal[u"bucket_counts",b"bucket_counts",u"count",b"count",u"exemplars",b"exemplars",u"explicit_bounds",b"explicit_bounds",u"labels",b"labels",u"start_time_unix_nano",b"start_time_unix_nano",u"sum",b"sum",u"time_unix_nano",b"time_unix_nano"]) -> None: ... global___IntHistogramDataPoint = IntHistogramDataPoint -class DoubleHistogramDataPoint(google.protobuf.message.Message): +class HistogramDataPoint(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... + ATTRIBUTES_FIELD_NUMBER: builtins.int LABELS_FIELD_NUMBER: builtins.int START_TIME_UNIX_NANO_FIELD_NUMBER: builtins.int TIME_UNIX_NANO_FIELD_NUMBER: builtins.int @@ -347,14 +364,18 @@ class DoubleHistogramDataPoint(google.protobuf.message.Message): bucket_counts: google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.int] = ... explicit_bounds: google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.float] = ... + @property + def attributes(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[opentelemetry.proto.common.v1.common_pb2.KeyValue]: ... + @property def labels(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[opentelemetry.proto.common.v1.common_pb2.StringKeyValue]: ... @property - def exemplars(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___DoubleExemplar]: ... + def exemplars(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___Exemplar]: ... def __init__(self, *, + attributes : typing.Optional[typing.Iterable[opentelemetry.proto.common.v1.common_pb2.KeyValue]] = ..., labels : typing.Optional[typing.Iterable[opentelemetry.proto.common.v1.common_pb2.StringKeyValue]] = ..., start_time_unix_nano : builtins.int = ..., time_unix_nano : builtins.int = ..., @@ -362,12 +383,12 @@ class DoubleHistogramDataPoint(google.protobuf.message.Message): sum : builtins.float = ..., bucket_counts : typing.Optional[typing.Iterable[builtins.int]] = ..., explicit_bounds : typing.Optional[typing.Iterable[builtins.float]] = ..., - exemplars : typing.Optional[typing.Iterable[global___DoubleExemplar]] = ..., + exemplars : typing.Optional[typing.Iterable[global___Exemplar]] = ..., ) -> None: ... - def ClearField(self, field_name: typing_extensions.Literal[u"bucket_counts",b"bucket_counts",u"count",b"count",u"exemplars",b"exemplars",u"explicit_bounds",b"explicit_bounds",u"labels",b"labels",u"start_time_unix_nano",b"start_time_unix_nano",u"sum",b"sum",u"time_unix_nano",b"time_unix_nano"]) -> None: ... -global___DoubleHistogramDataPoint = DoubleHistogramDataPoint + def ClearField(self, field_name: typing_extensions.Literal[u"attributes",b"attributes",u"bucket_counts",b"bucket_counts",u"count",b"count",u"exemplars",b"exemplars",u"explicit_bounds",b"explicit_bounds",u"labels",b"labels",u"start_time_unix_nano",b"start_time_unix_nano",u"sum",b"sum",u"time_unix_nano",b"time_unix_nano"]) -> None: ... +global___HistogramDataPoint = HistogramDataPoint -class DoubleSummaryDataPoint(google.protobuf.message.Message): +class SummaryDataPoint(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... class ValueAtQuantile(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... @@ -383,6 +404,7 @@ class DoubleSummaryDataPoint(google.protobuf.message.Message): ) -> None: ... def ClearField(self, field_name: typing_extensions.Literal[u"quantile",b"quantile",u"value",b"value"]) -> None: ... + ATTRIBUTES_FIELD_NUMBER: builtins.int LABELS_FIELD_NUMBER: builtins.int START_TIME_UNIX_NANO_FIELD_NUMBER: builtins.int TIME_UNIX_NANO_FIELD_NUMBER: builtins.int @@ -394,23 +416,27 @@ class DoubleSummaryDataPoint(google.protobuf.message.Message): count: builtins.int = ... sum: builtins.float = ... + @property + def attributes(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[opentelemetry.proto.common.v1.common_pb2.KeyValue]: ... + @property def labels(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[opentelemetry.proto.common.v1.common_pb2.StringKeyValue]: ... @property - def quantile_values(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___DoubleSummaryDataPoint.ValueAtQuantile]: ... + def quantile_values(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___SummaryDataPoint.ValueAtQuantile]: ... def __init__(self, *, + attributes : typing.Optional[typing.Iterable[opentelemetry.proto.common.v1.common_pb2.KeyValue]] = ..., labels : typing.Optional[typing.Iterable[opentelemetry.proto.common.v1.common_pb2.StringKeyValue]] = ..., start_time_unix_nano : builtins.int = ..., time_unix_nano : builtins.int = ..., count : builtins.int = ..., sum : builtins.float = ..., - quantile_values : typing.Optional[typing.Iterable[global___DoubleSummaryDataPoint.ValueAtQuantile]] = ..., + quantile_values : typing.Optional[typing.Iterable[global___SummaryDataPoint.ValueAtQuantile]] = ..., ) -> None: ... - def ClearField(self, field_name: typing_extensions.Literal[u"count",b"count",u"labels",b"labels",u"quantile_values",b"quantile_values",u"start_time_unix_nano",b"start_time_unix_nano",u"sum",b"sum",u"time_unix_nano",b"time_unix_nano"]) -> None: ... -global___DoubleSummaryDataPoint = DoubleSummaryDataPoint + def ClearField(self, field_name: typing_extensions.Literal[u"attributes",b"attributes",u"count",b"count",u"labels",b"labels",u"quantile_values",b"quantile_values",u"start_time_unix_nano",b"start_time_unix_nano",u"sum",b"sum",u"time_unix_nano",b"time_unix_nano"]) -> None: ... +global___SummaryDataPoint = SummaryDataPoint class IntExemplar(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... @@ -438,28 +464,38 @@ class IntExemplar(google.protobuf.message.Message): def ClearField(self, field_name: typing_extensions.Literal[u"filtered_labels",b"filtered_labels",u"span_id",b"span_id",u"time_unix_nano",b"time_unix_nano",u"trace_id",b"trace_id",u"value",b"value"]) -> None: ... global___IntExemplar = IntExemplar -class DoubleExemplar(google.protobuf.message.Message): +class Exemplar(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... + FILTERED_ATTRIBUTES_FIELD_NUMBER: builtins.int FILTERED_LABELS_FIELD_NUMBER: builtins.int TIME_UNIX_NANO_FIELD_NUMBER: builtins.int - VALUE_FIELD_NUMBER: builtins.int + AS_DOUBLE_FIELD_NUMBER: builtins.int + AS_INT_FIELD_NUMBER: builtins.int SPAN_ID_FIELD_NUMBER: builtins.int TRACE_ID_FIELD_NUMBER: builtins.int time_unix_nano: builtins.int = ... - value: builtins.float = ... + as_double: builtins.float = ... + as_int: builtins.int = ... span_id: builtins.bytes = ... trace_id: builtins.bytes = ... + @property + def filtered_attributes(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[opentelemetry.proto.common.v1.common_pb2.KeyValue]: ... + @property def filtered_labels(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[opentelemetry.proto.common.v1.common_pb2.StringKeyValue]: ... def __init__(self, *, + filtered_attributes : typing.Optional[typing.Iterable[opentelemetry.proto.common.v1.common_pb2.KeyValue]] = ..., filtered_labels : typing.Optional[typing.Iterable[opentelemetry.proto.common.v1.common_pb2.StringKeyValue]] = ..., time_unix_nano : builtins.int = ..., - value : builtins.float = ..., + as_double : builtins.float = ..., + as_int : builtins.int = ..., span_id : builtins.bytes = ..., trace_id : builtins.bytes = ..., ) -> None: ... - def ClearField(self, field_name: typing_extensions.Literal[u"filtered_labels",b"filtered_labels",u"span_id",b"span_id",u"time_unix_nano",b"time_unix_nano",u"trace_id",b"trace_id",u"value",b"value"]) -> None: ... -global___DoubleExemplar = DoubleExemplar + def HasField(self, field_name: typing_extensions.Literal[u"as_double",b"as_double",u"as_int",b"as_int",u"value",b"value"]) -> builtins.bool: ... + def ClearField(self, field_name: typing_extensions.Literal[u"as_double",b"as_double",u"as_int",b"as_int",u"filtered_attributes",b"filtered_attributes",u"filtered_labels",b"filtered_labels",u"span_id",b"span_id",u"time_unix_nano",b"time_unix_nano",u"trace_id",b"trace_id",u"value",b"value"]) -> None: ... + def WhichOneof(self, oneof_group: typing_extensions.Literal[u"value",b"value"]) -> typing_extensions.Literal["as_double","as_int"]: ... +global___Exemplar = Exemplar diff --git a/opentelemetry-proto/src/opentelemetry/proto/trace/v1/trace_pb2.py b/opentelemetry-proto/src/opentelemetry/proto/trace/v1/trace_pb2.py index d5937acb502..b5ae44795c9 100644 --- a/opentelemetry-proto/src/opentelemetry/proto/trace/v1/trace_pb2.py +++ b/opentelemetry-proto/src/opentelemetry/proto/trace/v1/trace_pb2.py @@ -20,7 +20,7 @@ package='opentelemetry.proto.trace.v1', syntax='proto3', serialized_options=b'\n\037io.opentelemetry.proto.trace.v1B\nTraceProtoP\001Z=github.com/open-telemetry/opentelemetry-proto/gen/go/trace/v1', - serialized_pb=b'\n(opentelemetry/proto/trace/v1/trace.proto\x12\x1copentelemetry.proto.trace.v1\x1a*opentelemetry/proto/common/v1/common.proto\x1a.opentelemetry/proto/resource/v1/resource.proto\"\xae\x01\n\rResourceSpans\x12;\n\x08resource\x18\x01 \x01(\x0b\x32).opentelemetry.proto.resource.v1.Resource\x12`\n\x1dinstrumentation_library_spans\x18\x02 \x03(\x0b\x32\x39.opentelemetry.proto.trace.v1.InstrumentationLibrarySpans\"\xa8\x01\n\x1bInstrumentationLibrarySpans\x12V\n\x17instrumentation_library\x18\x01 \x01(\x0b\x32\x35.opentelemetry.proto.common.v1.InstrumentationLibrary\x12\x31\n\x05spans\x18\x02 \x03(\x0b\x32\".opentelemetry.proto.trace.v1.Span\"\xe6\x07\n\x04Span\x12\x10\n\x08trace_id\x18\x01 \x01(\x0c\x12\x0f\n\x07span_id\x18\x02 \x01(\x0c\x12\x13\n\x0btrace_state\x18\x03 \x01(\t\x12\x16\n\x0eparent_span_id\x18\x04 \x01(\x0c\x12\x0c\n\x04name\x18\x05 \x01(\t\x12\x39\n\x04kind\x18\x06 \x01(\x0e\x32+.opentelemetry.proto.trace.v1.Span.SpanKind\x12\x1c\n\x14start_time_unix_nano\x18\x07 \x01(\x06\x12\x1a\n\x12\x65nd_time_unix_nano\x18\x08 \x01(\x06\x12;\n\nattributes\x18\t \x03(\x0b\x32\'.opentelemetry.proto.common.v1.KeyValue\x12 \n\x18\x64ropped_attributes_count\x18\n \x01(\r\x12\x38\n\x06\x65vents\x18\x0b \x03(\x0b\x32(.opentelemetry.proto.trace.v1.Span.Event\x12\x1c\n\x14\x64ropped_events_count\x18\x0c \x01(\r\x12\x36\n\x05links\x18\r \x03(\x0b\x32\'.opentelemetry.proto.trace.v1.Span.Link\x12\x1b\n\x13\x64ropped_links_count\x18\x0e \x01(\r\x12\x34\n\x06status\x18\x0f \x01(\x0b\x32$.opentelemetry.proto.trace.v1.Status\x1a\x8c\x01\n\x05\x45vent\x12\x16\n\x0etime_unix_nano\x18\x01 \x01(\x06\x12\x0c\n\x04name\x18\x02 \x01(\t\x12;\n\nattributes\x18\x03 \x03(\x0b\x32\'.opentelemetry.proto.common.v1.KeyValue\x12 \n\x18\x64ropped_attributes_count\x18\x04 \x01(\r\x1a\x9d\x01\n\x04Link\x12\x10\n\x08trace_id\x18\x01 \x01(\x0c\x12\x0f\n\x07span_id\x18\x02 \x01(\x0c\x12\x13\n\x0btrace_state\x18\x03 \x01(\t\x12;\n\nattributes\x18\x04 \x03(\x0b\x32\'.opentelemetry.proto.common.v1.KeyValue\x12 \n\x18\x64ropped_attributes_count\x18\x05 \x01(\r\"\x99\x01\n\x08SpanKind\x12\x19\n\x15SPAN_KIND_UNSPECIFIED\x10\x00\x12\x16\n\x12SPAN_KIND_INTERNAL\x10\x01\x12\x14\n\x10SPAN_KIND_SERVER\x10\x02\x12\x14\n\x10SPAN_KIND_CLIENT\x10\x03\x12\x16\n\x12SPAN_KIND_PRODUCER\x10\x04\x12\x16\n\x12SPAN_KIND_CONSUMER\x10\x05\"\xdd\x07\n\x06Status\x12V\n\x0f\x64\x65precated_code\x18\x01 \x01(\x0e\x32\x39.opentelemetry.proto.trace.v1.Status.DeprecatedStatusCodeB\x02\x18\x01\x12\x0f\n\x07message\x18\x02 \x01(\t\x12=\n\x04\x63ode\x18\x03 \x01(\x0e\x32/.opentelemetry.proto.trace.v1.Status.StatusCode\"\xda\x05\n\x14\x44\x65precatedStatusCode\x12\x1d\n\x19\x44\x45PRECATED_STATUS_CODE_OK\x10\x00\x12$\n DEPRECATED_STATUS_CODE_CANCELLED\x10\x01\x12(\n$DEPRECATED_STATUS_CODE_UNKNOWN_ERROR\x10\x02\x12+\n\'DEPRECATED_STATUS_CODE_INVALID_ARGUMENT\x10\x03\x12,\n(DEPRECATED_STATUS_CODE_DEADLINE_EXCEEDED\x10\x04\x12$\n DEPRECATED_STATUS_CODE_NOT_FOUND\x10\x05\x12)\n%DEPRECATED_STATUS_CODE_ALREADY_EXISTS\x10\x06\x12,\n(DEPRECATED_STATUS_CODE_PERMISSION_DENIED\x10\x07\x12-\n)DEPRECATED_STATUS_CODE_RESOURCE_EXHAUSTED\x10\x08\x12.\n*DEPRECATED_STATUS_CODE_FAILED_PRECONDITION\x10\t\x12\"\n\x1e\x44\x45PRECATED_STATUS_CODE_ABORTED\x10\n\x12\'\n#DEPRECATED_STATUS_CODE_OUT_OF_RANGE\x10\x0b\x12(\n$DEPRECATED_STATUS_CODE_UNIMPLEMENTED\x10\x0c\x12)\n%DEPRECATED_STATUS_CODE_INTERNAL_ERROR\x10\r\x12&\n\"DEPRECATED_STATUS_CODE_UNAVAILABLE\x10\x0e\x12$\n DEPRECATED_STATUS_CODE_DATA_LOSS\x10\x0f\x12*\n&DEPRECATED_STATUS_CODE_UNAUTHENTICATED\x10\x10\"N\n\nStatusCode\x12\x15\n\x11STATUS_CODE_UNSET\x10\x00\x12\x12\n\x0eSTATUS_CODE_OK\x10\x01\x12\x15\n\x11STATUS_CODE_ERROR\x10\x02\x42n\n\x1fio.opentelemetry.proto.trace.v1B\nTraceProtoP\x01Z=github.com/open-telemetry/opentelemetry-proto/gen/go/trace/v1b\x06proto3' + serialized_pb=b'\n(opentelemetry/proto/trace/v1/trace.proto\x12\x1copentelemetry.proto.trace.v1\x1a*opentelemetry/proto/common/v1/common.proto\x1a.opentelemetry/proto/resource/v1/resource.proto\"\xc2\x01\n\rResourceSpans\x12;\n\x08resource\x18\x01 \x01(\x0b\x32).opentelemetry.proto.resource.v1.Resource\x12`\n\x1dinstrumentation_library_spans\x18\x02 \x03(\x0b\x32\x39.opentelemetry.proto.trace.v1.InstrumentationLibrarySpans\x12\x12\n\nschema_url\x18\x03 \x01(\t\"\xbc\x01\n\x1bInstrumentationLibrarySpans\x12V\n\x17instrumentation_library\x18\x01 \x01(\x0b\x32\x35.opentelemetry.proto.common.v1.InstrumentationLibrary\x12\x31\n\x05spans\x18\x02 \x03(\x0b\x32\".opentelemetry.proto.trace.v1.Span\x12\x12\n\nschema_url\x18\x03 \x01(\t\"\xe6\x07\n\x04Span\x12\x10\n\x08trace_id\x18\x01 \x01(\x0c\x12\x0f\n\x07span_id\x18\x02 \x01(\x0c\x12\x13\n\x0btrace_state\x18\x03 \x01(\t\x12\x16\n\x0eparent_span_id\x18\x04 \x01(\x0c\x12\x0c\n\x04name\x18\x05 \x01(\t\x12\x39\n\x04kind\x18\x06 \x01(\x0e\x32+.opentelemetry.proto.trace.v1.Span.SpanKind\x12\x1c\n\x14start_time_unix_nano\x18\x07 \x01(\x06\x12\x1a\n\x12\x65nd_time_unix_nano\x18\x08 \x01(\x06\x12;\n\nattributes\x18\t \x03(\x0b\x32\'.opentelemetry.proto.common.v1.KeyValue\x12 \n\x18\x64ropped_attributes_count\x18\n \x01(\r\x12\x38\n\x06\x65vents\x18\x0b \x03(\x0b\x32(.opentelemetry.proto.trace.v1.Span.Event\x12\x1c\n\x14\x64ropped_events_count\x18\x0c \x01(\r\x12\x36\n\x05links\x18\r \x03(\x0b\x32\'.opentelemetry.proto.trace.v1.Span.Link\x12\x1b\n\x13\x64ropped_links_count\x18\x0e \x01(\r\x12\x34\n\x06status\x18\x0f \x01(\x0b\x32$.opentelemetry.proto.trace.v1.Status\x1a\x8c\x01\n\x05\x45vent\x12\x16\n\x0etime_unix_nano\x18\x01 \x01(\x06\x12\x0c\n\x04name\x18\x02 \x01(\t\x12;\n\nattributes\x18\x03 \x03(\x0b\x32\'.opentelemetry.proto.common.v1.KeyValue\x12 \n\x18\x64ropped_attributes_count\x18\x04 \x01(\r\x1a\x9d\x01\n\x04Link\x12\x10\n\x08trace_id\x18\x01 \x01(\x0c\x12\x0f\n\x07span_id\x18\x02 \x01(\x0c\x12\x13\n\x0btrace_state\x18\x03 \x01(\t\x12;\n\nattributes\x18\x04 \x03(\x0b\x32\'.opentelemetry.proto.common.v1.KeyValue\x12 \n\x18\x64ropped_attributes_count\x18\x05 \x01(\r\"\x99\x01\n\x08SpanKind\x12\x19\n\x15SPAN_KIND_UNSPECIFIED\x10\x00\x12\x16\n\x12SPAN_KIND_INTERNAL\x10\x01\x12\x14\n\x10SPAN_KIND_SERVER\x10\x02\x12\x14\n\x10SPAN_KIND_CLIENT\x10\x03\x12\x16\n\x12SPAN_KIND_PRODUCER\x10\x04\x12\x16\n\x12SPAN_KIND_CONSUMER\x10\x05\"\xdd\x07\n\x06Status\x12V\n\x0f\x64\x65precated_code\x18\x01 \x01(\x0e\x32\x39.opentelemetry.proto.trace.v1.Status.DeprecatedStatusCodeB\x02\x18\x01\x12\x0f\n\x07message\x18\x02 \x01(\t\x12=\n\x04\x63ode\x18\x03 \x01(\x0e\x32/.opentelemetry.proto.trace.v1.Status.StatusCode\"\xda\x05\n\x14\x44\x65precatedStatusCode\x12\x1d\n\x19\x44\x45PRECATED_STATUS_CODE_OK\x10\x00\x12$\n DEPRECATED_STATUS_CODE_CANCELLED\x10\x01\x12(\n$DEPRECATED_STATUS_CODE_UNKNOWN_ERROR\x10\x02\x12+\n\'DEPRECATED_STATUS_CODE_INVALID_ARGUMENT\x10\x03\x12,\n(DEPRECATED_STATUS_CODE_DEADLINE_EXCEEDED\x10\x04\x12$\n DEPRECATED_STATUS_CODE_NOT_FOUND\x10\x05\x12)\n%DEPRECATED_STATUS_CODE_ALREADY_EXISTS\x10\x06\x12,\n(DEPRECATED_STATUS_CODE_PERMISSION_DENIED\x10\x07\x12-\n)DEPRECATED_STATUS_CODE_RESOURCE_EXHAUSTED\x10\x08\x12.\n*DEPRECATED_STATUS_CODE_FAILED_PRECONDITION\x10\t\x12\"\n\x1e\x44\x45PRECATED_STATUS_CODE_ABORTED\x10\n\x12\'\n#DEPRECATED_STATUS_CODE_OUT_OF_RANGE\x10\x0b\x12(\n$DEPRECATED_STATUS_CODE_UNIMPLEMENTED\x10\x0c\x12)\n%DEPRECATED_STATUS_CODE_INTERNAL_ERROR\x10\r\x12&\n\"DEPRECATED_STATUS_CODE_UNAVAILABLE\x10\x0e\x12$\n DEPRECATED_STATUS_CODE_DATA_LOSS\x10\x0f\x12*\n&DEPRECATED_STATUS_CODE_UNAUTHENTICATED\x10\x10\"N\n\nStatusCode\x12\x15\n\x11STATUS_CODE_UNSET\x10\x00\x12\x12\n\x0eSTATUS_CODE_OK\x10\x01\x12\x15\n\x11STATUS_CODE_ERROR\x10\x02\x42n\n\x1fio.opentelemetry.proto.trace.v1B\nTraceProtoP\x01Z=github.com/open-telemetry/opentelemetry-proto/gen/go/trace/v1b\x06proto3' , dependencies=[opentelemetry_dot_proto_dot_common_dot_v1_dot_common__pb2.DESCRIPTOR,opentelemetry_dot_proto_dot_resource_dot_v1_dot_resource__pb2.DESCRIPTOR,]) @@ -59,8 +59,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=1360, - serialized_end=1513, + serialized_start=1400, + serialized_end=1553, ) _sym_db.RegisterEnumDescriptor(_SPAN_SPANKIND) @@ -141,8 +141,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=1695, - serialized_end=2425, + serialized_start=1735, + serialized_end=2465, ) _sym_db.RegisterEnumDescriptor(_STATUS_DEPRECATEDSTATUSCODE) @@ -167,8 +167,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=2427, - serialized_end=2505, + serialized_start=2467, + serialized_end=2545, ) _sym_db.RegisterEnumDescriptor(_STATUS_STATUSCODE) @@ -194,6 +194,13 @@ message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='schema_url', full_name='opentelemetry.proto.trace.v1.ResourceSpans.schema_url', index=2, + number=3, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -207,7 +214,7 @@ oneofs=[ ], serialized_start=167, - serialized_end=341, + serialized_end=361, ) @@ -232,6 +239,13 @@ message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='schema_url', full_name='opentelemetry.proto.trace.v1.InstrumentationLibrarySpans.schema_url', index=2, + number=3, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -244,8 +258,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=344, - serialized_end=512, + serialized_start=364, + serialized_end=552, ) @@ -296,8 +310,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1057, - serialized_end=1197, + serialized_start=1097, + serialized_end=1237, ) _SPAN_LINK = _descriptor.Descriptor( @@ -354,8 +368,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1200, - serialized_end=1357, + serialized_start=1240, + serialized_end=1397, ) _SPAN = _descriptor.Descriptor( @@ -483,8 +497,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=515, - serialized_end=1513, + serialized_start=555, + serialized_end=1553, ) @@ -530,8 +544,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1516, - serialized_end=2505, + serialized_start=1556, + serialized_end=2545, ) _RESOURCESPANS.fields_by_name['resource'].message_type = opentelemetry_dot_proto_dot_resource_dot_v1_dot_resource__pb2._RESOURCE diff --git a/opentelemetry-proto/src/opentelemetry/proto/trace/v1/trace_pb2.pyi b/opentelemetry-proto/src/opentelemetry/proto/trace/v1/trace_pb2.pyi index 71e323b99ef..46b37dc5d7b 100644 --- a/opentelemetry-proto/src/opentelemetry/proto/trace/v1/trace_pb2.pyi +++ b/opentelemetry-proto/src/opentelemetry/proto/trace/v1/trace_pb2.pyi @@ -18,6 +18,8 @@ class ResourceSpans(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... RESOURCE_FIELD_NUMBER: builtins.int INSTRUMENTATION_LIBRARY_SPANS_FIELD_NUMBER: builtins.int + SCHEMA_URL_FIELD_NUMBER: builtins.int + schema_url: typing.Text = ... @property def resource(self) -> opentelemetry.proto.resource.v1.resource_pb2.Resource: ... @@ -29,15 +31,18 @@ class ResourceSpans(google.protobuf.message.Message): *, resource : typing.Optional[opentelemetry.proto.resource.v1.resource_pb2.Resource] = ..., instrumentation_library_spans : typing.Optional[typing.Iterable[global___InstrumentationLibrarySpans]] = ..., + schema_url : typing.Text = ..., ) -> None: ... def HasField(self, field_name: typing_extensions.Literal[u"resource",b"resource"]) -> builtins.bool: ... - def ClearField(self, field_name: typing_extensions.Literal[u"instrumentation_library_spans",b"instrumentation_library_spans",u"resource",b"resource"]) -> None: ... + def ClearField(self, field_name: typing_extensions.Literal[u"instrumentation_library_spans",b"instrumentation_library_spans",u"resource",b"resource",u"schema_url",b"schema_url"]) -> None: ... global___ResourceSpans = ResourceSpans class InstrumentationLibrarySpans(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor = ... INSTRUMENTATION_LIBRARY_FIELD_NUMBER: builtins.int SPANS_FIELD_NUMBER: builtins.int + SCHEMA_URL_FIELD_NUMBER: builtins.int + schema_url: typing.Text = ... @property def instrumentation_library(self) -> opentelemetry.proto.common.v1.common_pb2.InstrumentationLibrary: ... @@ -49,9 +54,10 @@ class InstrumentationLibrarySpans(google.protobuf.message.Message): *, instrumentation_library : typing.Optional[opentelemetry.proto.common.v1.common_pb2.InstrumentationLibrary] = ..., spans : typing.Optional[typing.Iterable[global___Span]] = ..., + schema_url : typing.Text = ..., ) -> None: ... def HasField(self, field_name: typing_extensions.Literal[u"instrumentation_library",b"instrumentation_library"]) -> builtins.bool: ... - def ClearField(self, field_name: typing_extensions.Literal[u"instrumentation_library",b"instrumentation_library",u"spans",b"spans"]) -> None: ... + def ClearField(self, field_name: typing_extensions.Literal[u"instrumentation_library",b"instrumentation_library",u"schema_url",b"schema_url",u"spans",b"spans"]) -> None: ... global___InstrumentationLibrarySpans = InstrumentationLibrarySpans class Span(google.protobuf.message.Message): diff --git a/scripts/proto_codegen.sh b/scripts/proto_codegen.sh index d3082b05992..6833c85c4ec 100755 --- a/scripts/proto_codegen.sh +++ b/scripts/proto_codegen.sh @@ -12,7 +12,7 @@ # PROTO_REPO_DIR - the path to an existing checkout of the opentelemetry-proto repo # Pinned commit/branch/tag for the current version used in opentelemetry-proto python package. -PROTO_REPO_BRANCH_OR_COMMIT="v0.7.0" +PROTO_REPO_BRANCH_OR_COMMIT="v0.9.0" set -e From 21d789a3891efc16ba2b6a0d497f82b1c24a1ebd Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 25 May 2021 15:56:30 -0700 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5477ae7940d..2972f188e2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#1854](https://github.com/open-telemetry/opentelemetry-python/pull/1854)) - Changed AttributeValue sequences to warn mypy users on adding None values to array ([#1855](https://github.com/open-telemetry/opentelemetry-python/pull/1855)) +- Update protos to latest version release 0.9.0 + ([#1873](https://github.com/open-telemetry/opentelemetry-python/pull/1873)) ## [1.2.0, 0.21b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.2.0-0.21b0) - 2021-05-11