From df710aa3403a620525107687bbc6d9cdebfbeede Mon Sep 17 00:00:00 2001 From: Michael Schuett Date: Wed, 29 Jan 2025 11:53:20 -0700 Subject: [PATCH 1/9] Allow protobuf version above 4 and under 6 for opentelemetry_exporter_prometheus_remote_write --- .../pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml b/exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml index 23801d1c04..842803761d 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ "Programming Language :: Python :: 3.13", ] dependencies = [ - "protobuf ~= 4.21", + "protobuf >4,<6", "requests ~= 2.28", "opentelemetry-api ~= 1.12", "opentelemetry-sdk ~= 1.12", From ab311033a509cacc773f6cd7b6f80ee153028892 Mon Sep 17 00:00:00 2001 From: Michael Schuett Date: Mon, 3 Feb 2025 12:04:57 -0700 Subject: [PATCH 2/9] update version --- .../pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml b/exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml index 842803761d..9b61bed38e 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ "Programming Language :: Python :: 3.13", ] dependencies = [ - "protobuf >4,<6", + "protobuf ~= 5.26", "requests ~= 2.28", "opentelemetry-api ~= 1.12", "opentelemetry-sdk ~= 1.12", From c2fd3a3a6b82fc9e661ecca28a1c2318df1b53f7 Mon Sep 17 00:00:00 2001 From: Michael Schuett Date: Mon, 3 Feb 2025 12:34:27 -0700 Subject: [PATCH 3/9] fix tests --- .../test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt b/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt index 5587dcdbb5..61484b20a9 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt @@ -9,7 +9,7 @@ idna==3.7 iniconfig==2.0.0 packaging==24.0 pluggy==1.5.0 -protobuf==4.25.3 +protobuf==5.29.3 py-cpuinfo==9.0.0 pytest==7.4.4 python-snappy==0.7.1 From 414a68f469e53230128e89e7fa9afd75ed3423ff Mon Sep 17 00:00:00 2001 From: Michael Schuett Date: Tue, 4 Feb 2025 13:30:36 -0700 Subject: [PATCH 4/9] regenerate protobufs --- .../gen/gogoproto/gogo_pb2.py | 323 +++++------------- .../prometheus_remote_write/gen/remote_pb2.py | 64 ++-- .../prometheus_remote_write/gen/types_pb2.py | 112 +++--- .../test_prometheus_remote_write_exporter.py | 6 +- 4 files changed, 155 insertions(+), 350 deletions(-) diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo_pb2.py b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo_pb2.py index d5cce2a857..35e48b214a 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo_pb2.py +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo_pb2.py @@ -6,257 +6,96 @@ from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database - # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() -from google.protobuf import ( - descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2, -) +from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( - b'\nGopentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo.proto\x12\tgogoproto\x1a google/protobuf/descriptor.proto:;\n\x13goproto_enum_prefix\x12\x1c.google.protobuf.EnumOptions\x18\xb1\xe4\x03 \x01(\x08:=\n\x15goproto_enum_stringer\x12\x1c.google.protobuf.EnumOptions\x18\xc5\xe4\x03 \x01(\x08:5\n\renum_stringer\x12\x1c.google.protobuf.EnumOptions\x18\xc6\xe4\x03 \x01(\x08:7\n\x0f\x65num_customname\x12\x1c.google.protobuf.EnumOptions\x18\xc7\xe4\x03 \x01(\t:0\n\x08\x65numdecl\x12\x1c.google.protobuf.EnumOptions\x18\xc8\xe4\x03 \x01(\x08:A\n\x14\x65numvalue_customname\x12!.google.protobuf.EnumValueOptions\x18\xd1\x83\x04 \x01(\t:;\n\x13goproto_getters_all\x12\x1c.google.protobuf.FileOptions\x18\x99\xec\x03 \x01(\x08:?\n\x17goproto_enum_prefix_all\x12\x1c.google.protobuf.FileOptions\x18\x9a\xec\x03 \x01(\x08:<\n\x14goproto_stringer_all\x12\x1c.google.protobuf.FileOptions\x18\x9b\xec\x03 \x01(\x08:9\n\x11verbose_equal_all\x12\x1c.google.protobuf.FileOptions\x18\x9c\xec\x03 \x01(\x08:0\n\x08\x66\x61\x63\x65_all\x12\x1c.google.protobuf.FileOptions\x18\x9d\xec\x03 \x01(\x08:4\n\x0cgostring_all\x12\x1c.google.protobuf.FileOptions\x18\x9e\xec\x03 \x01(\x08:4\n\x0cpopulate_all\x12\x1c.google.protobuf.FileOptions\x18\x9f\xec\x03 \x01(\x08:4\n\x0cstringer_all\x12\x1c.google.protobuf.FileOptions\x18\xa0\xec\x03 \x01(\x08:3\n\x0bonlyone_all\x12\x1c.google.protobuf.FileOptions\x18\xa1\xec\x03 \x01(\x08:1\n\tequal_all\x12\x1c.google.protobuf.FileOptions\x18\xa5\xec\x03 \x01(\x08:7\n\x0f\x64\x65scription_all\x12\x1c.google.protobuf.FileOptions\x18\xa6\xec\x03 \x01(\x08:3\n\x0btestgen_all\x12\x1c.google.protobuf.FileOptions\x18\xa7\xec\x03 \x01(\x08:4\n\x0c\x62\x65nchgen_all\x12\x1c.google.protobuf.FileOptions\x18\xa8\xec\x03 \x01(\x08:5\n\rmarshaler_all\x12\x1c.google.protobuf.FileOptions\x18\xa9\xec\x03 \x01(\x08:7\n\x0funmarshaler_all\x12\x1c.google.protobuf.FileOptions\x18\xaa\xec\x03 \x01(\x08:<\n\x14stable_marshaler_all\x12\x1c.google.protobuf.FileOptions\x18\xab\xec\x03 \x01(\x08:1\n\tsizer_all\x12\x1c.google.protobuf.FileOptions\x18\xac\xec\x03 \x01(\x08:A\n\x19goproto_enum_stringer_all\x12\x1c.google.protobuf.FileOptions\x18\xad\xec\x03 \x01(\x08:9\n\x11\x65num_stringer_all\x12\x1c.google.protobuf.FileOptions\x18\xae\xec\x03 \x01(\x08:<\n\x14unsafe_marshaler_all\x12\x1c.google.protobuf.FileOptions\x18\xaf\xec\x03 \x01(\x08:>\n\x16unsafe_unmarshaler_all\x12\x1c.google.protobuf.FileOptions\x18\xb0\xec\x03 \x01(\x08:B\n\x1agoproto_extensions_map_all\x12\x1c.google.protobuf.FileOptions\x18\xb1\xec\x03 \x01(\x08:@\n\x18goproto_unrecognized_all\x12\x1c.google.protobuf.FileOptions\x18\xb2\xec\x03 \x01(\x08:8\n\x10gogoproto_import\x12\x1c.google.protobuf.FileOptions\x18\xb3\xec\x03 \x01(\x08:6\n\x0eprotosizer_all\x12\x1c.google.protobuf.FileOptions\x18\xb4\xec\x03 \x01(\x08:3\n\x0b\x63ompare_all\x12\x1c.google.protobuf.FileOptions\x18\xb5\xec\x03 \x01(\x08:4\n\x0ctypedecl_all\x12\x1c.google.protobuf.FileOptions\x18\xb6\xec\x03 \x01(\x08:4\n\x0c\x65numdecl_all\x12\x1c.google.protobuf.FileOptions\x18\xb7\xec\x03 \x01(\x08:<\n\x14goproto_registration\x12\x1c.google.protobuf.FileOptions\x18\xb8\xec\x03 \x01(\x08:7\n\x0fmessagename_all\x12\x1c.google.protobuf.FileOptions\x18\xb9\xec\x03 \x01(\x08:=\n\x15goproto_sizecache_all\x12\x1c.google.protobuf.FileOptions\x18\xba\xec\x03 \x01(\x08:;\n\x13goproto_unkeyed_all\x12\x1c.google.protobuf.FileOptions\x18\xbb\xec\x03 \x01(\x08::\n\x0fgoproto_getters\x12\x1f.google.protobuf.MessageOptions\x18\x81\xf4\x03 \x01(\x08:;\n\x10goproto_stringer\x12\x1f.google.protobuf.MessageOptions\x18\x83\xf4\x03 \x01(\x08:8\n\rverbose_equal\x12\x1f.google.protobuf.MessageOptions\x18\x84\xf4\x03 \x01(\x08:/\n\x04\x66\x61\x63\x65\x12\x1f.google.protobuf.MessageOptions\x18\x85\xf4\x03 \x01(\x08:3\n\x08gostring\x12\x1f.google.protobuf.MessageOptions\x18\x86\xf4\x03 \x01(\x08:3\n\x08populate\x12\x1f.google.protobuf.MessageOptions\x18\x87\xf4\x03 \x01(\x08:3\n\x08stringer\x12\x1f.google.protobuf.MessageOptions\x18\xc0\x8b\x04 \x01(\x08:2\n\x07onlyone\x12\x1f.google.protobuf.MessageOptions\x18\x89\xf4\x03 \x01(\x08:0\n\x05\x65qual\x12\x1f.google.protobuf.MessageOptions\x18\x8d\xf4\x03 \x01(\x08:6\n\x0b\x64\x65scription\x12\x1f.google.protobuf.MessageOptions\x18\x8e\xf4\x03 \x01(\x08:2\n\x07testgen\x12\x1f.google.protobuf.MessageOptions\x18\x8f\xf4\x03 \x01(\x08:3\n\x08\x62\x65nchgen\x12\x1f.google.protobuf.MessageOptions\x18\x90\xf4\x03 \x01(\x08:4\n\tmarshaler\x12\x1f.google.protobuf.MessageOptions\x18\x91\xf4\x03 \x01(\x08:6\n\x0bunmarshaler\x12\x1f.google.protobuf.MessageOptions\x18\x92\xf4\x03 \x01(\x08:;\n\x10stable_marshaler\x12\x1f.google.protobuf.MessageOptions\x18\x93\xf4\x03 \x01(\x08:0\n\x05sizer\x12\x1f.google.protobuf.MessageOptions\x18\x94\xf4\x03 \x01(\x08:;\n\x10unsafe_marshaler\x12\x1f.google.protobuf.MessageOptions\x18\x97\xf4\x03 \x01(\x08:=\n\x12unsafe_unmarshaler\x12\x1f.google.protobuf.MessageOptions\x18\x98\xf4\x03 \x01(\x08:A\n\x16goproto_extensions_map\x12\x1f.google.protobuf.MessageOptions\x18\x99\xf4\x03 \x01(\x08:?\n\x14goproto_unrecognized\x12\x1f.google.protobuf.MessageOptions\x18\x9a\xf4\x03 \x01(\x08:5\n\nprotosizer\x12\x1f.google.protobuf.MessageOptions\x18\x9c\xf4\x03 \x01(\x08:2\n\x07\x63ompare\x12\x1f.google.protobuf.MessageOptions\x18\x9d\xf4\x03 \x01(\x08:3\n\x08typedecl\x12\x1f.google.protobuf.MessageOptions\x18\x9e\xf4\x03 \x01(\x08:6\n\x0bmessagename\x12\x1f.google.protobuf.MessageOptions\x18\xa1\xf4\x03 \x01(\x08:<\n\x11goproto_sizecache\x12\x1f.google.protobuf.MessageOptions\x18\xa2\xf4\x03 \x01(\x08::\n\x0fgoproto_unkeyed\x12\x1f.google.protobuf.MessageOptions\x18\xa3\xf4\x03 \x01(\x08:1\n\x08nullable\x12\x1d.google.protobuf.FieldOptions\x18\xe9\xfb\x03 \x01(\x08:.\n\x05\x65mbed\x12\x1d.google.protobuf.FieldOptions\x18\xea\xfb\x03 \x01(\x08:3\n\ncustomtype\x12\x1d.google.protobuf.FieldOptions\x18\xeb\xfb\x03 \x01(\t:3\n\ncustomname\x12\x1d.google.protobuf.FieldOptions\x18\xec\xfb\x03 \x01(\t:0\n\x07jsontag\x12\x1d.google.protobuf.FieldOptions\x18\xed\xfb\x03 \x01(\t:1\n\x08moretags\x12\x1d.google.protobuf.FieldOptions\x18\xee\xfb\x03 \x01(\t:1\n\x08\x63\x61sttype\x12\x1d.google.protobuf.FieldOptions\x18\xef\xfb\x03 \x01(\t:0\n\x07\x63\x61stkey\x12\x1d.google.protobuf.FieldOptions\x18\xf0\xfb\x03 \x01(\t:2\n\tcastvalue\x12\x1d.google.protobuf.FieldOptions\x18\xf1\xfb\x03 \x01(\t:0\n\x07stdtime\x12\x1d.google.protobuf.FieldOptions\x18\xf2\xfb\x03 \x01(\x08:4\n\x0bstdduration\x12\x1d.google.protobuf.FieldOptions\x18\xf3\xfb\x03 \x01(\x08:3\n\nwktpointer\x12\x1d.google.protobuf.FieldOptions\x18\xf4\xfb\x03 \x01(\x08\x42\x45\n\x13\x63om.google.protobufB\nGoGoProtosZ"github.com/gogo/protobuf/gogoproto' -) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\nGopentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo.proto\x12\tgogoproto\x1a google/protobuf/descriptor.proto:;\n\x13goproto_enum_prefix\x12\x1c.google.protobuf.EnumOptions\x18\xb1\xe4\x03 \x01(\x08:=\n\x15goproto_enum_stringer\x12\x1c.google.protobuf.EnumOptions\x18\xc5\xe4\x03 \x01(\x08:5\n\renum_stringer\x12\x1c.google.protobuf.EnumOptions\x18\xc6\xe4\x03 \x01(\x08:7\n\x0f\x65num_customname\x12\x1c.google.protobuf.EnumOptions\x18\xc7\xe4\x03 \x01(\t:0\n\x08\x65numdecl\x12\x1c.google.protobuf.EnumOptions\x18\xc8\xe4\x03 \x01(\x08:A\n\x14\x65numvalue_customname\x12!.google.protobuf.EnumValueOptions\x18\xd1\x83\x04 \x01(\t:;\n\x13goproto_getters_all\x12\x1c.google.protobuf.FileOptions\x18\x99\xec\x03 \x01(\x08:?\n\x17goproto_enum_prefix_all\x12\x1c.google.protobuf.FileOptions\x18\x9a\xec\x03 \x01(\x08:<\n\x14goproto_stringer_all\x12\x1c.google.protobuf.FileOptions\x18\x9b\xec\x03 \x01(\x08:9\n\x11verbose_equal_all\x12\x1c.google.protobuf.FileOptions\x18\x9c\xec\x03 \x01(\x08:0\n\x08\x66\x61\x63\x65_all\x12\x1c.google.protobuf.FileOptions\x18\x9d\xec\x03 \x01(\x08:4\n\x0cgostring_all\x12\x1c.google.protobuf.FileOptions\x18\x9e\xec\x03 \x01(\x08:4\n\x0cpopulate_all\x12\x1c.google.protobuf.FileOptions\x18\x9f\xec\x03 \x01(\x08:4\n\x0cstringer_all\x12\x1c.google.protobuf.FileOptions\x18\xa0\xec\x03 \x01(\x08:3\n\x0bonlyone_all\x12\x1c.google.protobuf.FileOptions\x18\xa1\xec\x03 \x01(\x08:1\n\tequal_all\x12\x1c.google.protobuf.FileOptions\x18\xa5\xec\x03 \x01(\x08:7\n\x0f\x64\x65scription_all\x12\x1c.google.protobuf.FileOptions\x18\xa6\xec\x03 \x01(\x08:3\n\x0btestgen_all\x12\x1c.google.protobuf.FileOptions\x18\xa7\xec\x03 \x01(\x08:4\n\x0c\x62\x65nchgen_all\x12\x1c.google.protobuf.FileOptions\x18\xa8\xec\x03 \x01(\x08:5\n\rmarshaler_all\x12\x1c.google.protobuf.FileOptions\x18\xa9\xec\x03 \x01(\x08:7\n\x0funmarshaler_all\x12\x1c.google.protobuf.FileOptions\x18\xaa\xec\x03 \x01(\x08:<\n\x14stable_marshaler_all\x12\x1c.google.protobuf.FileOptions\x18\xab\xec\x03 \x01(\x08:1\n\tsizer_all\x12\x1c.google.protobuf.FileOptions\x18\xac\xec\x03 \x01(\x08:A\n\x19goproto_enum_stringer_all\x12\x1c.google.protobuf.FileOptions\x18\xad\xec\x03 \x01(\x08:9\n\x11\x65num_stringer_all\x12\x1c.google.protobuf.FileOptions\x18\xae\xec\x03 \x01(\x08:<\n\x14unsafe_marshaler_all\x12\x1c.google.protobuf.FileOptions\x18\xaf\xec\x03 \x01(\x08:>\n\x16unsafe_unmarshaler_all\x12\x1c.google.protobuf.FileOptions\x18\xb0\xec\x03 \x01(\x08:B\n\x1agoproto_extensions_map_all\x12\x1c.google.protobuf.FileOptions\x18\xb1\xec\x03 \x01(\x08:@\n\x18goproto_unrecognized_all\x12\x1c.google.protobuf.FileOptions\x18\xb2\xec\x03 \x01(\x08:8\n\x10gogoproto_import\x12\x1c.google.protobuf.FileOptions\x18\xb3\xec\x03 \x01(\x08:6\n\x0eprotosizer_all\x12\x1c.google.protobuf.FileOptions\x18\xb4\xec\x03 \x01(\x08:3\n\x0b\x63ompare_all\x12\x1c.google.protobuf.FileOptions\x18\xb5\xec\x03 \x01(\x08:4\n\x0ctypedecl_all\x12\x1c.google.protobuf.FileOptions\x18\xb6\xec\x03 \x01(\x08:4\n\x0c\x65numdecl_all\x12\x1c.google.protobuf.FileOptions\x18\xb7\xec\x03 \x01(\x08:<\n\x14goproto_registration\x12\x1c.google.protobuf.FileOptions\x18\xb8\xec\x03 \x01(\x08:7\n\x0fmessagename_all\x12\x1c.google.protobuf.FileOptions\x18\xb9\xec\x03 \x01(\x08:=\n\x15goproto_sizecache_all\x12\x1c.google.protobuf.FileOptions\x18\xba\xec\x03 \x01(\x08:;\n\x13goproto_unkeyed_all\x12\x1c.google.protobuf.FileOptions\x18\xbb\xec\x03 \x01(\x08::\n\x0fgoproto_getters\x12\x1f.google.protobuf.MessageOptions\x18\x81\xf4\x03 \x01(\x08:;\n\x10goproto_stringer\x12\x1f.google.protobuf.MessageOptions\x18\x83\xf4\x03 \x01(\x08:8\n\rverbose_equal\x12\x1f.google.protobuf.MessageOptions\x18\x84\xf4\x03 \x01(\x08:/\n\x04\x66\x61\x63\x65\x12\x1f.google.protobuf.MessageOptions\x18\x85\xf4\x03 \x01(\x08:3\n\x08gostring\x12\x1f.google.protobuf.MessageOptions\x18\x86\xf4\x03 \x01(\x08:3\n\x08populate\x12\x1f.google.protobuf.MessageOptions\x18\x87\xf4\x03 \x01(\x08:3\n\x08stringer\x12\x1f.google.protobuf.MessageOptions\x18\xc0\x8b\x04 \x01(\x08:2\n\x07onlyone\x12\x1f.google.protobuf.MessageOptions\x18\x89\xf4\x03 \x01(\x08:0\n\x05\x65qual\x12\x1f.google.protobuf.MessageOptions\x18\x8d\xf4\x03 \x01(\x08:6\n\x0b\x64\x65scription\x12\x1f.google.protobuf.MessageOptions\x18\x8e\xf4\x03 \x01(\x08:2\n\x07testgen\x12\x1f.google.protobuf.MessageOptions\x18\x8f\xf4\x03 \x01(\x08:3\n\x08\x62\x65nchgen\x12\x1f.google.protobuf.MessageOptions\x18\x90\xf4\x03 \x01(\x08:4\n\tmarshaler\x12\x1f.google.protobuf.MessageOptions\x18\x91\xf4\x03 \x01(\x08:6\n\x0bunmarshaler\x12\x1f.google.protobuf.MessageOptions\x18\x92\xf4\x03 \x01(\x08:;\n\x10stable_marshaler\x12\x1f.google.protobuf.MessageOptions\x18\x93\xf4\x03 \x01(\x08:0\n\x05sizer\x12\x1f.google.protobuf.MessageOptions\x18\x94\xf4\x03 \x01(\x08:;\n\x10unsafe_marshaler\x12\x1f.google.protobuf.MessageOptions\x18\x97\xf4\x03 \x01(\x08:=\n\x12unsafe_unmarshaler\x12\x1f.google.protobuf.MessageOptions\x18\x98\xf4\x03 \x01(\x08:A\n\x16goproto_extensions_map\x12\x1f.google.protobuf.MessageOptions\x18\x99\xf4\x03 \x01(\x08:?\n\x14goproto_unrecognized\x12\x1f.google.protobuf.MessageOptions\x18\x9a\xf4\x03 \x01(\x08:5\n\nprotosizer\x12\x1f.google.protobuf.MessageOptions\x18\x9c\xf4\x03 \x01(\x08:2\n\x07\x63ompare\x12\x1f.google.protobuf.MessageOptions\x18\x9d\xf4\x03 \x01(\x08:3\n\x08typedecl\x12\x1f.google.protobuf.MessageOptions\x18\x9e\xf4\x03 \x01(\x08:6\n\x0bmessagename\x12\x1f.google.protobuf.MessageOptions\x18\xa1\xf4\x03 \x01(\x08:<\n\x11goproto_sizecache\x12\x1f.google.protobuf.MessageOptions\x18\xa2\xf4\x03 \x01(\x08::\n\x0fgoproto_unkeyed\x12\x1f.google.protobuf.MessageOptions\x18\xa3\xf4\x03 \x01(\x08:1\n\x08nullable\x12\x1d.google.protobuf.FieldOptions\x18\xe9\xfb\x03 \x01(\x08:.\n\x05\x65mbed\x12\x1d.google.protobuf.FieldOptions\x18\xea\xfb\x03 \x01(\x08:3\n\ncustomtype\x12\x1d.google.protobuf.FieldOptions\x18\xeb\xfb\x03 \x01(\t:3\n\ncustomname\x12\x1d.google.protobuf.FieldOptions\x18\xec\xfb\x03 \x01(\t:0\n\x07jsontag\x12\x1d.google.protobuf.FieldOptions\x18\xed\xfb\x03 \x01(\t:1\n\x08moretags\x12\x1d.google.protobuf.FieldOptions\x18\xee\xfb\x03 \x01(\t:1\n\x08\x63\x61sttype\x12\x1d.google.protobuf.FieldOptions\x18\xef\xfb\x03 \x01(\t:0\n\x07\x63\x61stkey\x12\x1d.google.protobuf.FieldOptions\x18\xf0\xfb\x03 \x01(\t:2\n\tcastvalue\x12\x1d.google.protobuf.FieldOptions\x18\xf1\xfb\x03 \x01(\t:0\n\x07stdtime\x12\x1d.google.protobuf.FieldOptions\x18\xf2\xfb\x03 \x01(\x08:4\n\x0bstdduration\x12\x1d.google.protobuf.FieldOptions\x18\xf3\xfb\x03 \x01(\x08:3\n\nwktpointer\x12\x1d.google.protobuf.FieldOptions\x18\xf4\xfb\x03 \x01(\x08\x42\x45\n\x13\x63om.google.protobufB\nGoGoProtosZ\"github.com/gogo/protobuf/gogoproto') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages( - DESCRIPTOR, - "opentelemetry.exporter.prometheus_remote_write.gen.gogoproto.gogo_pb2", - globals(), -) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'opentelemetry.exporter.prometheus_remote_write.gen.gogoproto.gogo_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: - google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension( - goproto_enum_prefix - ) - google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension( - goproto_enum_stringer - ) - google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension( - enum_stringer - ) - google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension( - enum_customname - ) - google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension( - enumdecl - ) - google_dot_protobuf_dot_descriptor__pb2.EnumValueOptions.RegisterExtension( - enumvalue_customname - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - goproto_getters_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - goproto_enum_prefix_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - goproto_stringer_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - verbose_equal_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - face_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - gostring_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - populate_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - stringer_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - onlyone_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - equal_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - description_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - testgen_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - benchgen_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - marshaler_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - unmarshaler_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - stable_marshaler_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - sizer_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - goproto_enum_stringer_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - enum_stringer_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - unsafe_marshaler_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - unsafe_unmarshaler_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - goproto_extensions_map_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - goproto_unrecognized_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - gogoproto_import - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - protosizer_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - compare_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - typedecl_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - enumdecl_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - goproto_registration - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - messagename_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - goproto_sizecache_all - ) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension( - goproto_unkeyed_all - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - goproto_getters - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - goproto_stringer - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - verbose_equal - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - face - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - gostring - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - populate - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - stringer - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - onlyone - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - equal - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - description - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - testgen - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - benchgen - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - marshaler - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - unmarshaler - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - stable_marshaler - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - sizer - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - unsafe_marshaler - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - unsafe_unmarshaler - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - goproto_extensions_map - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - goproto_unrecognized - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - protosizer - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - compare - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - typedecl - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - messagename - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - goproto_sizecache - ) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension( - goproto_unkeyed - ) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension( - nullable - ) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension( - embed - ) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension( - customtype - ) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension( - customname - ) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension( - jsontag - ) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension( - moretags - ) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension( - casttype - ) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension( - castkey - ) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension( - castvalue - ) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension( - stdtime - ) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension( - stdduration - ) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension( - wktpointer - ) + google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension(goproto_enum_prefix) + google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension(goproto_enum_stringer) + google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension(enum_stringer) + google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension(enum_customname) + google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension(enumdecl) + google_dot_protobuf_dot_descriptor__pb2.EnumValueOptions.RegisterExtension(enumvalue_customname) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_getters_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_enum_prefix_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_stringer_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(verbose_equal_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(face_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(gostring_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(populate_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(stringer_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(onlyone_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(equal_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(description_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(testgen_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(benchgen_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(marshaler_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(unmarshaler_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(stable_marshaler_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(sizer_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_enum_stringer_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(enum_stringer_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(unsafe_marshaler_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(unsafe_unmarshaler_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_extensions_map_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_unrecognized_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(gogoproto_import) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(protosizer_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(compare_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(typedecl_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(enumdecl_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_registration) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(messagename_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_sizecache_all) + google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_unkeyed_all) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(goproto_getters) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(goproto_stringer) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(verbose_equal) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(face) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(gostring) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(populate) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(stringer) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(onlyone) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(equal) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(description) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(testgen) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(benchgen) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(marshaler) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(unmarshaler) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(stable_marshaler) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(sizer) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(unsafe_marshaler) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(unsafe_unmarshaler) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(goproto_extensions_map) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(goproto_unrecognized) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(protosizer) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(compare) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(typedecl) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(messagename) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(goproto_sizecache) + google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(goproto_unkeyed) + google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(nullable) + google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(embed) + google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(customtype) + google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(customname) + google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(jsontag) + google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(moretags) + google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(casttype) + google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(castkey) + google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(castvalue) + google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(stdtime) + google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(stdduration) + google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(wktpointer) - DESCRIPTOR._options = None - DESCRIPTOR._serialized_options = b'\n\023com.google.protobufB\nGoGoProtosZ"github.com/gogo/protobuf/gogoproto' + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\023com.google.protobufB\nGoGoProtosZ\"github.com/gogo/protobuf/gogoproto' # @@protoc_insertion_point(module_scope) diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/remote_pb2.py b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/remote_pb2.py index f8724074f6..a274dbf204 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/remote_pb2.py +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/remote_pb2.py @@ -6,53 +6,39 @@ from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database - # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() -from opentelemetry.exporter.prometheus_remote_write.gen import ( - types_pb2 as opentelemetry_dot_exporter_dot_prometheus__remote__write_dot_gen_dot_types__pb2, -) -from opentelemetry.exporter.prometheus_remote_write.gen.gogoproto import ( - gogo_pb2 as opentelemetry_dot_exporter_dot_prometheus__remote__write_dot_gen_dot_gogoproto_dot_gogo__pb2, -) +from opentelemetry.exporter.prometheus_remote_write.gen import types_pb2 as opentelemetry_dot_exporter_dot_prometheus__remote__write_dot_gen_dot_types__pb2 +from opentelemetry.exporter.prometheus_remote_write.gen.gogoproto import gogo_pb2 as opentelemetry_dot_exporter_dot_prometheus__remote__write_dot_gen_dot_gogoproto_dot_gogo__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( - b'\n?opentelemetry/exporter/prometheus_remote_write/gen/remote.proto\x12\nprometheus\x1a>opentelemetry/exporter/prometheus_remote_write/gen/types.proto\x1aGopentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo.proto"z\n\x0cWriteRequest\x12\x30\n\ntimeseries\x18\x01 \x03(\x0b\x32\x16.prometheus.TimeSeriesB\x04\xc8\xde\x1f\x00\x12\x32\n\x08metadata\x18\x03 \x03(\x0b\x32\x1a.prometheus.MetricMetadataB\x04\xc8\xde\x1f\x00J\x04\x08\x02\x10\x03"\xae\x01\n\x0bReadRequest\x12"\n\x07queries\x18\x01 \x03(\x0b\x32\x11.prometheus.Query\x12\x45\n\x17\x61\x63\x63\x65pted_response_types\x18\x02 \x03(\x0e\x32$.prometheus.ReadRequest.ResponseType"4\n\x0cResponseType\x12\x0b\n\x07SAMPLES\x10\x00\x12\x17\n\x13STREAMED_XOR_CHUNKS\x10\x01"8\n\x0cReadResponse\x12(\n\x07results\x18\x01 \x03(\x0b\x32\x17.prometheus.QueryResult"\x8f\x01\n\x05Query\x12\x1a\n\x12start_timestamp_ms\x18\x01 \x01(\x03\x12\x18\n\x10\x65nd_timestamp_ms\x18\x02 \x01(\x03\x12*\n\x08matchers\x18\x03 \x03(\x0b\x32\x18.prometheus.LabelMatcher\x12$\n\x05hints\x18\x04 \x01(\x0b\x32\x15.prometheus.ReadHints"9\n\x0bQueryResult\x12*\n\ntimeseries\x18\x01 \x03(\x0b\x32\x16.prometheus.TimeSeries"]\n\x13\x43hunkedReadResponse\x12\x31\n\x0e\x63hunked_series\x18\x01 \x03(\x0b\x32\x19.prometheus.ChunkedSeries\x12\x13\n\x0bquery_index\x18\x02 \x01(\x03\x42\x08Z\x06prompbb\x06proto3' -) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n?opentelemetry/exporter/prometheus_remote_write/gen/remote.proto\x12\nprometheus\x1a>opentelemetry/exporter/prometheus_remote_write/gen/types.proto\x1aGopentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo.proto\"z\n\x0cWriteRequest\x12\x30\n\ntimeseries\x18\x01 \x03(\x0b\x32\x16.prometheus.TimeSeriesB\x04\xc8\xde\x1f\x00\x12\x32\n\x08metadata\x18\x03 \x03(\x0b\x32\x1a.prometheus.MetricMetadataB\x04\xc8\xde\x1f\x00J\x04\x08\x02\x10\x03\"\xae\x01\n\x0bReadRequest\x12\"\n\x07queries\x18\x01 \x03(\x0b\x32\x11.prometheus.Query\x12\x45\n\x17\x61\x63\x63\x65pted_response_types\x18\x02 \x03(\x0e\x32$.prometheus.ReadRequest.ResponseType\"4\n\x0cResponseType\x12\x0b\n\x07SAMPLES\x10\x00\x12\x17\n\x13STREAMED_XOR_CHUNKS\x10\x01\"8\n\x0cReadResponse\x12(\n\x07results\x18\x01 \x03(\x0b\x32\x17.prometheus.QueryResult\"\x8f\x01\n\x05Query\x12\x1a\n\x12start_timestamp_ms\x18\x01 \x01(\x03\x12\x18\n\x10\x65nd_timestamp_ms\x18\x02 \x01(\x03\x12*\n\x08matchers\x18\x03 \x03(\x0b\x32\x18.prometheus.LabelMatcher\x12$\n\x05hints\x18\x04 \x01(\x0b\x32\x15.prometheus.ReadHints\"9\n\x0bQueryResult\x12*\n\ntimeseries\x18\x01 \x03(\x0b\x32\x16.prometheus.TimeSeries\"]\n\x13\x43hunkedReadResponse\x12\x31\n\x0e\x63hunked_series\x18\x01 \x03(\x0b\x32\x19.prometheus.ChunkedSeries\x12\x13\n\x0bquery_index\x18\x02 \x01(\x03\x42\x08Z\x06prompbb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages( - DESCRIPTOR, - "opentelemetry.exporter.prometheus_remote_write.gen.remote_pb2", - globals(), -) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'opentelemetry.exporter.prometheus_remote_write.gen.remote_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None - DESCRIPTOR._serialized_options = b"Z\006prompb" - _WRITEREQUEST.fields_by_name["timeseries"]._options = None - _WRITEREQUEST.fields_by_name["timeseries"]._serialized_options = ( - b"\310\336\037\000" - ) - _WRITEREQUEST.fields_by_name["metadata"]._options = None - _WRITEREQUEST.fields_by_name["metadata"]._serialized_options = ( - b"\310\336\037\000" - ) - _WRITEREQUEST._serialized_start = 216 - _WRITEREQUEST._serialized_end = 338 - _READREQUEST._serialized_start = 341 - _READREQUEST._serialized_end = 515 - _READREQUEST_RESPONSETYPE._serialized_start = 463 - _READREQUEST_RESPONSETYPE._serialized_end = 515 - _READRESPONSE._serialized_start = 517 - _READRESPONSE._serialized_end = 573 - _QUERY._serialized_start = 576 - _QUERY._serialized_end = 719 - _QUERYRESULT._serialized_start = 721 - _QUERYRESULT._serialized_end = 778 - _CHUNKEDREADRESPONSE._serialized_start = 780 - _CHUNKEDREADRESPONSE._serialized_end = 873 + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'Z\006prompb' + _WRITEREQUEST.fields_by_name['timeseries']._options = None + _WRITEREQUEST.fields_by_name['timeseries']._serialized_options = b'\310\336\037\000' + _WRITEREQUEST.fields_by_name['metadata']._options = None + _WRITEREQUEST.fields_by_name['metadata']._serialized_options = b'\310\336\037\000' + _WRITEREQUEST._serialized_start=216 + _WRITEREQUEST._serialized_end=338 + _READREQUEST._serialized_start=341 + _READREQUEST._serialized_end=515 + _READREQUEST_RESPONSETYPE._serialized_start=463 + _READREQUEST_RESPONSETYPE._serialized_end=515 + _READRESPONSE._serialized_start=517 + _READRESPONSE._serialized_end=573 + _QUERY._serialized_start=576 + _QUERY._serialized_end=719 + _QUERYRESULT._serialized_start=721 + _QUERYRESULT._serialized_end=778 + _CHUNKEDREADRESPONSE._serialized_start=780 + _CHUNKEDREADRESPONSE._serialized_end=873 # @@protoc_insertion_point(module_scope) diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/types_pb2.py b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/types_pb2.py index 30cf2e38cc..d519e03423 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/types_pb2.py +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/types_pb2.py @@ -6,80 +6,60 @@ from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database - # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() -from opentelemetry.exporter.prometheus_remote_write.gen.gogoproto import ( - gogo_pb2 as opentelemetry_dot_exporter_dot_prometheus__remote__write_dot_gen_dot_gogoproto_dot_gogo__pb2, -) +from opentelemetry.exporter.prometheus_remote_write.gen.gogoproto import gogo_pb2 as opentelemetry_dot_exporter_dot_prometheus__remote__write_dot_gen_dot_gogoproto_dot_gogo__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( - b'\n>opentelemetry/exporter/prometheus_remote_write/gen/types.proto\x12\nprometheus\x1aGopentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo.proto"\xf8\x01\n\x0eMetricMetadata\x12\x33\n\x04type\x18\x01 \x01(\x0e\x32%.prometheus.MetricMetadata.MetricType\x12\x1a\n\x12metric_family_name\x18\x02 \x01(\t\x12\x0c\n\x04help\x18\x04 \x01(\t\x12\x0c\n\x04unit\x18\x05 \x01(\t"y\n\nMetricType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07\x43OUNTER\x10\x01\x12\t\n\x05GAUGE\x10\x02\x12\r\n\tHISTOGRAM\x10\x03\x12\x12\n\x0eGAUGEHISTOGRAM\x10\x04\x12\x0b\n\x07SUMMARY\x10\x05\x12\x08\n\x04INFO\x10\x06\x12\x0c\n\x08STATESET\x10\x07"*\n\x06Sample\x12\r\n\x05value\x18\x01 \x01(\x01\x12\x11\n\ttimestamp\x18\x02 \x01(\x03"U\n\x08\x45xemplar\x12\'\n\x06labels\x18\x01 \x03(\x0b\x32\x11.prometheus.LabelB\x04\xc8\xde\x1f\x00\x12\r\n\x05value\x18\x02 \x01(\x01\x12\x11\n\ttimestamp\x18\x03 \x01(\x03"\x8f\x01\n\nTimeSeries\x12\'\n\x06labels\x18\x01 \x03(\x0b\x32\x11.prometheus.LabelB\x04\xc8\xde\x1f\x00\x12)\n\x07samples\x18\x02 \x03(\x0b\x32\x12.prometheus.SampleB\x04\xc8\xde\x1f\x00\x12-\n\texemplars\x18\x03 \x03(\x0b\x32\x14.prometheus.ExemplarB\x04\xc8\xde\x1f\x00"$\n\x05Label\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t"1\n\x06Labels\x12\'\n\x06labels\x18\x01 \x03(\x0b\x32\x11.prometheus.LabelB\x04\xc8\xde\x1f\x00"\x82\x01\n\x0cLabelMatcher\x12+\n\x04type\x18\x01 \x01(\x0e\x32\x1d.prometheus.LabelMatcher.Type\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\r\n\x05value\x18\x03 \x01(\t"(\n\x04Type\x12\x06\n\x02\x45Q\x10\x00\x12\x07\n\x03NEQ\x10\x01\x12\x06\n\x02RE\x10\x02\x12\x07\n\x03NRE\x10\x03"|\n\tReadHints\x12\x0f\n\x07step_ms\x18\x01 \x01(\x03\x12\x0c\n\x04\x66unc\x18\x02 \x01(\t\x12\x10\n\x08start_ms\x18\x03 \x01(\x03\x12\x0e\n\x06\x65nd_ms\x18\x04 \x01(\x03\x12\x10\n\x08grouping\x18\x05 \x03(\t\x12\n\n\x02\x62y\x18\x06 \x01(\x08\x12\x10\n\x08range_ms\x18\x07 \x01(\x03"\x8b\x01\n\x05\x43hunk\x12\x13\n\x0bmin_time_ms\x18\x01 \x01(\x03\x12\x13\n\x0bmax_time_ms\x18\x02 \x01(\x03\x12(\n\x04type\x18\x03 \x01(\x0e\x32\x1a.prometheus.Chunk.Encoding\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\x0c" \n\x08\x45ncoding\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x07\n\x03XOR\x10\x01"a\n\rChunkedSeries\x12\'\n\x06labels\x18\x01 \x03(\x0b\x32\x11.prometheus.LabelB\x04\xc8\xde\x1f\x00\x12\'\n\x06\x63hunks\x18\x02 \x03(\x0b\x32\x11.prometheus.ChunkB\x04\xc8\xde\x1f\x00\x42\x08Z\x06prompbb\x06proto3' -) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n>opentelemetry/exporter/prometheus_remote_write/gen/types.proto\x12\nprometheus\x1aGopentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo.proto\"\xf8\x01\n\x0eMetricMetadata\x12\x33\n\x04type\x18\x01 \x01(\x0e\x32%.prometheus.MetricMetadata.MetricType\x12\x1a\n\x12metric_family_name\x18\x02 \x01(\t\x12\x0c\n\x04help\x18\x04 \x01(\t\x12\x0c\n\x04unit\x18\x05 \x01(\t\"y\n\nMetricType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07\x43OUNTER\x10\x01\x12\t\n\x05GAUGE\x10\x02\x12\r\n\tHISTOGRAM\x10\x03\x12\x12\n\x0eGAUGEHISTOGRAM\x10\x04\x12\x0b\n\x07SUMMARY\x10\x05\x12\x08\n\x04INFO\x10\x06\x12\x0c\n\x08STATESET\x10\x07\"*\n\x06Sample\x12\r\n\x05value\x18\x01 \x01(\x01\x12\x11\n\ttimestamp\x18\x02 \x01(\x03\"U\n\x08\x45xemplar\x12\'\n\x06labels\x18\x01 \x03(\x0b\x32\x11.prometheus.LabelB\x04\xc8\xde\x1f\x00\x12\r\n\x05value\x18\x02 \x01(\x01\x12\x11\n\ttimestamp\x18\x03 \x01(\x03\"\x8f\x01\n\nTimeSeries\x12\'\n\x06labels\x18\x01 \x03(\x0b\x32\x11.prometheus.LabelB\x04\xc8\xde\x1f\x00\x12)\n\x07samples\x18\x02 \x03(\x0b\x32\x12.prometheus.SampleB\x04\xc8\xde\x1f\x00\x12-\n\texemplars\x18\x03 \x03(\x0b\x32\x14.prometheus.ExemplarB\x04\xc8\xde\x1f\x00\"$\n\x05Label\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"1\n\x06Labels\x12\'\n\x06labels\x18\x01 \x03(\x0b\x32\x11.prometheus.LabelB\x04\xc8\xde\x1f\x00\"\x82\x01\n\x0cLabelMatcher\x12+\n\x04type\x18\x01 \x01(\x0e\x32\x1d.prometheus.LabelMatcher.Type\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\r\n\x05value\x18\x03 \x01(\t\"(\n\x04Type\x12\x06\n\x02\x45Q\x10\x00\x12\x07\n\x03NEQ\x10\x01\x12\x06\n\x02RE\x10\x02\x12\x07\n\x03NRE\x10\x03\"|\n\tReadHints\x12\x0f\n\x07step_ms\x18\x01 \x01(\x03\x12\x0c\n\x04\x66unc\x18\x02 \x01(\t\x12\x10\n\x08start_ms\x18\x03 \x01(\x03\x12\x0e\n\x06\x65nd_ms\x18\x04 \x01(\x03\x12\x10\n\x08grouping\x18\x05 \x03(\t\x12\n\n\x02\x62y\x18\x06 \x01(\x08\x12\x10\n\x08range_ms\x18\x07 \x01(\x03\"\x8b\x01\n\x05\x43hunk\x12\x13\n\x0bmin_time_ms\x18\x01 \x01(\x03\x12\x13\n\x0bmax_time_ms\x18\x02 \x01(\x03\x12(\n\x04type\x18\x03 \x01(\x0e\x32\x1a.prometheus.Chunk.Encoding\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\x0c\" \n\x08\x45ncoding\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x07\n\x03XOR\x10\x01\"a\n\rChunkedSeries\x12\'\n\x06labels\x18\x01 \x03(\x0b\x32\x11.prometheus.LabelB\x04\xc8\xde\x1f\x00\x12\'\n\x06\x63hunks\x18\x02 \x03(\x0b\x32\x11.prometheus.ChunkB\x04\xc8\xde\x1f\x00\x42\x08Z\x06prompbb\x06proto3') _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages( - DESCRIPTOR, - "opentelemetry.exporter.prometheus_remote_write.gen.types_pb2", - globals(), -) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'opentelemetry.exporter.prometheus_remote_write.gen.types_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None - DESCRIPTOR._serialized_options = b"Z\006prompb" - _EXEMPLAR.fields_by_name["labels"]._options = None - _EXEMPLAR.fields_by_name["labels"]._serialized_options = ( - b"\310\336\037\000" - ) - _TIMESERIES.fields_by_name["labels"]._options = None - _TIMESERIES.fields_by_name["labels"]._serialized_options = ( - b"\310\336\037\000" - ) - _TIMESERIES.fields_by_name["samples"]._options = None - _TIMESERIES.fields_by_name["samples"]._serialized_options = ( - b"\310\336\037\000" - ) - _TIMESERIES.fields_by_name["exemplars"]._options = None - _TIMESERIES.fields_by_name["exemplars"]._serialized_options = ( - b"\310\336\037\000" - ) - _LABELS.fields_by_name["labels"]._options = None - _LABELS.fields_by_name["labels"]._serialized_options = b"\310\336\037\000" - _CHUNKEDSERIES.fields_by_name["labels"]._options = None - _CHUNKEDSERIES.fields_by_name["labels"]._serialized_options = ( - b"\310\336\037\000" - ) - _CHUNKEDSERIES.fields_by_name["chunks"]._options = None - _CHUNKEDSERIES.fields_by_name["chunks"]._serialized_options = ( - b"\310\336\037\000" - ) - _METRICMETADATA._serialized_start = 152 - _METRICMETADATA._serialized_end = 400 - _METRICMETADATA_METRICTYPE._serialized_start = 279 - _METRICMETADATA_METRICTYPE._serialized_end = 400 - _SAMPLE._serialized_start = 402 - _SAMPLE._serialized_end = 444 - _EXEMPLAR._serialized_start = 446 - _EXEMPLAR._serialized_end = 531 - _TIMESERIES._serialized_start = 534 - _TIMESERIES._serialized_end = 677 - _LABEL._serialized_start = 679 - _LABEL._serialized_end = 715 - _LABELS._serialized_start = 717 - _LABELS._serialized_end = 766 - _LABELMATCHER._serialized_start = 769 - _LABELMATCHER._serialized_end = 899 - _LABELMATCHER_TYPE._serialized_start = 859 - _LABELMATCHER_TYPE._serialized_end = 899 - _READHINTS._serialized_start = 901 - _READHINTS._serialized_end = 1025 - _CHUNK._serialized_start = 1028 - _CHUNK._serialized_end = 1167 - _CHUNK_ENCODING._serialized_start = 1135 - _CHUNK_ENCODING._serialized_end = 1167 - _CHUNKEDSERIES._serialized_start = 1169 - _CHUNKEDSERIES._serialized_end = 1266 + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'Z\006prompb' + _EXEMPLAR.fields_by_name['labels']._options = None + _EXEMPLAR.fields_by_name['labels']._serialized_options = b'\310\336\037\000' + _TIMESERIES.fields_by_name['labels']._options = None + _TIMESERIES.fields_by_name['labels']._serialized_options = b'\310\336\037\000' + _TIMESERIES.fields_by_name['samples']._options = None + _TIMESERIES.fields_by_name['samples']._serialized_options = b'\310\336\037\000' + _TIMESERIES.fields_by_name['exemplars']._options = None + _TIMESERIES.fields_by_name['exemplars']._serialized_options = b'\310\336\037\000' + _LABELS.fields_by_name['labels']._options = None + _LABELS.fields_by_name['labels']._serialized_options = b'\310\336\037\000' + _CHUNKEDSERIES.fields_by_name['labels']._options = None + _CHUNKEDSERIES.fields_by_name['labels']._serialized_options = b'\310\336\037\000' + _CHUNKEDSERIES.fields_by_name['chunks']._options = None + _CHUNKEDSERIES.fields_by_name['chunks']._serialized_options = b'\310\336\037\000' + _METRICMETADATA._serialized_start=152 + _METRICMETADATA._serialized_end=400 + _METRICMETADATA_METRICTYPE._serialized_start=279 + _METRICMETADATA_METRICTYPE._serialized_end=400 + _SAMPLE._serialized_start=402 + _SAMPLE._serialized_end=444 + _EXEMPLAR._serialized_start=446 + _EXEMPLAR._serialized_end=531 + _TIMESERIES._serialized_start=534 + _TIMESERIES._serialized_end=677 + _LABEL._serialized_start=679 + _LABEL._serialized_end=715 + _LABELS._serialized_start=717 + _LABELS._serialized_end=766 + _LABELMATCHER._serialized_start=769 + _LABELMATCHER._serialized_end=899 + _LABELMATCHER_TYPE._serialized_start=859 + _LABELMATCHER_TYPE._serialized_end=899 + _READHINTS._serialized_start=901 + _READHINTS._serialized_end=1025 + _CHUNK._serialized_start=1028 + _CHUNK._serialized_end=1167 + _CHUNK_ENCODING._serialized_start=1135 + _CHUNK_ENCODING._serialized_end=1167 + _CHUNKEDSERIES._serialized_start=1169 + _CHUNKEDSERIES._serialized_end=1266 # @@protoc_insertion_point(module_scope) diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/tests/test_prometheus_remote_write_exporter.py b/exporter/opentelemetry-exporter-prometheus-remote-write/tests/test_prometheus_remote_write_exporter.py index 1c50344353..814de75be4 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/tests/test_prometheus_remote_write_exporter.py +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/tests/test_prometheus_remote_write_exporter.py @@ -122,9 +122,9 @@ def test_parse_metric(metric, prom_rw): "bool_value": True, } - assert ( - len(metric.data.data_points) == 1 - ), "We can only support a single datapoint in tests" + assert len(metric.data.data_points) == 1, ( + "We can only support a single datapoint in tests" + ) series = prom_rw._parse_metric(metric, tuple(attributes.items())) timestamp = metric.data.data_points[0].time_unix_nano // 1_000_000 for single_series in series: From 720e018b1245590da207bd6adbb24822c3eeb6ed Mon Sep 17 00:00:00 2001 From: Michael Schuett Date: Tue, 4 Feb 2025 13:38:59 -0700 Subject: [PATCH 5/9] with newer protoc --- .../proto/README.md | 2 +- .../proto/generate-proto-py.sh | 2 +- .../gen/gogoproto/gogo_pb2.py | 101 +++-------------- .../prometheus_remote_write/gen/remote_pb2.py | 61 +++++----- .../prometheus_remote_write/gen/types_pb2.py | 105 ++++++++++-------- 5 files changed, 114 insertions(+), 157 deletions(-) diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/proto/README.md b/exporter/opentelemetry-exporter-prometheus-remote-write/proto/README.md index 23fdaa392d..7f883d571c 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/proto/README.md +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/proto/README.md @@ -1,3 +1,3 @@ ## Instructions -1. Install protobuf tools. Can use your package manager or download from [GitHub](https://github.com/protocolbuffers/protobuf/releases/tag/v21.7) +1. Install protobuf tools. Can use your package manager or download from [GitHub](https://github.com/protocolbuffers/protobuf/releases/tag/v29.3) 2. Run `generate-proto-py.sh` from inside the `proto/` directory diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/proto/generate-proto-py.sh b/exporter/opentelemetry-exporter-prometheus-remote-write/proto/generate-proto-py.sh index a07181add3..b335a30b21 100755 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/proto/generate-proto-py.sh +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/proto/generate-proto-py.sh @@ -49,7 +49,7 @@ sed -i 's/import "gogoproto\/gogo.proto";/import "opentelemetry\/exporter\/prome echo "Removing clones..." rm -rf protobuf prometheus -# Used libprotoc 3.21.1 & protoc 21.7 +# Used libprotoc 29.3 echo "Compiling proto files to Python" protoc -I . --python_out=../src ${SRC_DIR}/gogoproto/gogo.proto ${SRC_DIR}/remote.proto ${SRC_DIR}/types.proto diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo_pb2.py b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo_pb2.py index 35e48b214a..a676145147 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo_pb2.py +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo_pb2.py @@ -1,11 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo.proto +# Protobuf Python Version: 5.29.3 """Generated protocol buffer code.""" -from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database +from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 3, + '', + 'opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -16,86 +27,10 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\nGopentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo.proto\x12\tgogoproto\x1a google/protobuf/descriptor.proto:;\n\x13goproto_enum_prefix\x12\x1c.google.protobuf.EnumOptions\x18\xb1\xe4\x03 \x01(\x08:=\n\x15goproto_enum_stringer\x12\x1c.google.protobuf.EnumOptions\x18\xc5\xe4\x03 \x01(\x08:5\n\renum_stringer\x12\x1c.google.protobuf.EnumOptions\x18\xc6\xe4\x03 \x01(\x08:7\n\x0f\x65num_customname\x12\x1c.google.protobuf.EnumOptions\x18\xc7\xe4\x03 \x01(\t:0\n\x08\x65numdecl\x12\x1c.google.protobuf.EnumOptions\x18\xc8\xe4\x03 \x01(\x08:A\n\x14\x65numvalue_customname\x12!.google.protobuf.EnumValueOptions\x18\xd1\x83\x04 \x01(\t:;\n\x13goproto_getters_all\x12\x1c.google.protobuf.FileOptions\x18\x99\xec\x03 \x01(\x08:?\n\x17goproto_enum_prefix_all\x12\x1c.google.protobuf.FileOptions\x18\x9a\xec\x03 \x01(\x08:<\n\x14goproto_stringer_all\x12\x1c.google.protobuf.FileOptions\x18\x9b\xec\x03 \x01(\x08:9\n\x11verbose_equal_all\x12\x1c.google.protobuf.FileOptions\x18\x9c\xec\x03 \x01(\x08:0\n\x08\x66\x61\x63\x65_all\x12\x1c.google.protobuf.FileOptions\x18\x9d\xec\x03 \x01(\x08:4\n\x0cgostring_all\x12\x1c.google.protobuf.FileOptions\x18\x9e\xec\x03 \x01(\x08:4\n\x0cpopulate_all\x12\x1c.google.protobuf.FileOptions\x18\x9f\xec\x03 \x01(\x08:4\n\x0cstringer_all\x12\x1c.google.protobuf.FileOptions\x18\xa0\xec\x03 \x01(\x08:3\n\x0bonlyone_all\x12\x1c.google.protobuf.FileOptions\x18\xa1\xec\x03 \x01(\x08:1\n\tequal_all\x12\x1c.google.protobuf.FileOptions\x18\xa5\xec\x03 \x01(\x08:7\n\x0f\x64\x65scription_all\x12\x1c.google.protobuf.FileOptions\x18\xa6\xec\x03 \x01(\x08:3\n\x0btestgen_all\x12\x1c.google.protobuf.FileOptions\x18\xa7\xec\x03 \x01(\x08:4\n\x0c\x62\x65nchgen_all\x12\x1c.google.protobuf.FileOptions\x18\xa8\xec\x03 \x01(\x08:5\n\rmarshaler_all\x12\x1c.google.protobuf.FileOptions\x18\xa9\xec\x03 \x01(\x08:7\n\x0funmarshaler_all\x12\x1c.google.protobuf.FileOptions\x18\xaa\xec\x03 \x01(\x08:<\n\x14stable_marshaler_all\x12\x1c.google.protobuf.FileOptions\x18\xab\xec\x03 \x01(\x08:1\n\tsizer_all\x12\x1c.google.protobuf.FileOptions\x18\xac\xec\x03 \x01(\x08:A\n\x19goproto_enum_stringer_all\x12\x1c.google.protobuf.FileOptions\x18\xad\xec\x03 \x01(\x08:9\n\x11\x65num_stringer_all\x12\x1c.google.protobuf.FileOptions\x18\xae\xec\x03 \x01(\x08:<\n\x14unsafe_marshaler_all\x12\x1c.google.protobuf.FileOptions\x18\xaf\xec\x03 \x01(\x08:>\n\x16unsafe_unmarshaler_all\x12\x1c.google.protobuf.FileOptions\x18\xb0\xec\x03 \x01(\x08:B\n\x1agoproto_extensions_map_all\x12\x1c.google.protobuf.FileOptions\x18\xb1\xec\x03 \x01(\x08:@\n\x18goproto_unrecognized_all\x12\x1c.google.protobuf.FileOptions\x18\xb2\xec\x03 \x01(\x08:8\n\x10gogoproto_import\x12\x1c.google.protobuf.FileOptions\x18\xb3\xec\x03 \x01(\x08:6\n\x0eprotosizer_all\x12\x1c.google.protobuf.FileOptions\x18\xb4\xec\x03 \x01(\x08:3\n\x0b\x63ompare_all\x12\x1c.google.protobuf.FileOptions\x18\xb5\xec\x03 \x01(\x08:4\n\x0ctypedecl_all\x12\x1c.google.protobuf.FileOptions\x18\xb6\xec\x03 \x01(\x08:4\n\x0c\x65numdecl_all\x12\x1c.google.protobuf.FileOptions\x18\xb7\xec\x03 \x01(\x08:<\n\x14goproto_registration\x12\x1c.google.protobuf.FileOptions\x18\xb8\xec\x03 \x01(\x08:7\n\x0fmessagename_all\x12\x1c.google.protobuf.FileOptions\x18\xb9\xec\x03 \x01(\x08:=\n\x15goproto_sizecache_all\x12\x1c.google.protobuf.FileOptions\x18\xba\xec\x03 \x01(\x08:;\n\x13goproto_unkeyed_all\x12\x1c.google.protobuf.FileOptions\x18\xbb\xec\x03 \x01(\x08::\n\x0fgoproto_getters\x12\x1f.google.protobuf.MessageOptions\x18\x81\xf4\x03 \x01(\x08:;\n\x10goproto_stringer\x12\x1f.google.protobuf.MessageOptions\x18\x83\xf4\x03 \x01(\x08:8\n\rverbose_equal\x12\x1f.google.protobuf.MessageOptions\x18\x84\xf4\x03 \x01(\x08:/\n\x04\x66\x61\x63\x65\x12\x1f.google.protobuf.MessageOptions\x18\x85\xf4\x03 \x01(\x08:3\n\x08gostring\x12\x1f.google.protobuf.MessageOptions\x18\x86\xf4\x03 \x01(\x08:3\n\x08populate\x12\x1f.google.protobuf.MessageOptions\x18\x87\xf4\x03 \x01(\x08:3\n\x08stringer\x12\x1f.google.protobuf.MessageOptions\x18\xc0\x8b\x04 \x01(\x08:2\n\x07onlyone\x12\x1f.google.protobuf.MessageOptions\x18\x89\xf4\x03 \x01(\x08:0\n\x05\x65qual\x12\x1f.google.protobuf.MessageOptions\x18\x8d\xf4\x03 \x01(\x08:6\n\x0b\x64\x65scription\x12\x1f.google.protobuf.MessageOptions\x18\x8e\xf4\x03 \x01(\x08:2\n\x07testgen\x12\x1f.google.protobuf.MessageOptions\x18\x8f\xf4\x03 \x01(\x08:3\n\x08\x62\x65nchgen\x12\x1f.google.protobuf.MessageOptions\x18\x90\xf4\x03 \x01(\x08:4\n\tmarshaler\x12\x1f.google.protobuf.MessageOptions\x18\x91\xf4\x03 \x01(\x08:6\n\x0bunmarshaler\x12\x1f.google.protobuf.MessageOptions\x18\x92\xf4\x03 \x01(\x08:;\n\x10stable_marshaler\x12\x1f.google.protobuf.MessageOptions\x18\x93\xf4\x03 \x01(\x08:0\n\x05sizer\x12\x1f.google.protobuf.MessageOptions\x18\x94\xf4\x03 \x01(\x08:;\n\x10unsafe_marshaler\x12\x1f.google.protobuf.MessageOptions\x18\x97\xf4\x03 \x01(\x08:=\n\x12unsafe_unmarshaler\x12\x1f.google.protobuf.MessageOptions\x18\x98\xf4\x03 \x01(\x08:A\n\x16goproto_extensions_map\x12\x1f.google.protobuf.MessageOptions\x18\x99\xf4\x03 \x01(\x08:?\n\x14goproto_unrecognized\x12\x1f.google.protobuf.MessageOptions\x18\x9a\xf4\x03 \x01(\x08:5\n\nprotosizer\x12\x1f.google.protobuf.MessageOptions\x18\x9c\xf4\x03 \x01(\x08:2\n\x07\x63ompare\x12\x1f.google.protobuf.MessageOptions\x18\x9d\xf4\x03 \x01(\x08:3\n\x08typedecl\x12\x1f.google.protobuf.MessageOptions\x18\x9e\xf4\x03 \x01(\x08:6\n\x0bmessagename\x12\x1f.google.protobuf.MessageOptions\x18\xa1\xf4\x03 \x01(\x08:<\n\x11goproto_sizecache\x12\x1f.google.protobuf.MessageOptions\x18\xa2\xf4\x03 \x01(\x08::\n\x0fgoproto_unkeyed\x12\x1f.google.protobuf.MessageOptions\x18\xa3\xf4\x03 \x01(\x08:1\n\x08nullable\x12\x1d.google.protobuf.FieldOptions\x18\xe9\xfb\x03 \x01(\x08:.\n\x05\x65mbed\x12\x1d.google.protobuf.FieldOptions\x18\xea\xfb\x03 \x01(\x08:3\n\ncustomtype\x12\x1d.google.protobuf.FieldOptions\x18\xeb\xfb\x03 \x01(\t:3\n\ncustomname\x12\x1d.google.protobuf.FieldOptions\x18\xec\xfb\x03 \x01(\t:0\n\x07jsontag\x12\x1d.google.protobuf.FieldOptions\x18\xed\xfb\x03 \x01(\t:1\n\x08moretags\x12\x1d.google.protobuf.FieldOptions\x18\xee\xfb\x03 \x01(\t:1\n\x08\x63\x61sttype\x12\x1d.google.protobuf.FieldOptions\x18\xef\xfb\x03 \x01(\t:0\n\x07\x63\x61stkey\x12\x1d.google.protobuf.FieldOptions\x18\xf0\xfb\x03 \x01(\t:2\n\tcastvalue\x12\x1d.google.protobuf.FieldOptions\x18\xf1\xfb\x03 \x01(\t:0\n\x07stdtime\x12\x1d.google.protobuf.FieldOptions\x18\xf2\xfb\x03 \x01(\x08:4\n\x0bstdduration\x12\x1d.google.protobuf.FieldOptions\x18\xf3\xfb\x03 \x01(\x08:3\n\nwktpointer\x12\x1d.google.protobuf.FieldOptions\x18\xf4\xfb\x03 \x01(\x08\x42\x45\n\x13\x63om.google.protobufB\nGoGoProtosZ\"github.com/gogo/protobuf/gogoproto') -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'opentelemetry.exporter.prometheus_remote_write.gen.gogoproto.gogo_pb2', globals()) -if _descriptor._USE_C_DESCRIPTORS == False: - google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension(goproto_enum_prefix) - google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension(goproto_enum_stringer) - google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension(enum_stringer) - google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension(enum_customname) - google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension(enumdecl) - google_dot_protobuf_dot_descriptor__pb2.EnumValueOptions.RegisterExtension(enumvalue_customname) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_getters_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_enum_prefix_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_stringer_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(verbose_equal_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(face_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(gostring_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(populate_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(stringer_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(onlyone_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(equal_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(description_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(testgen_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(benchgen_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(marshaler_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(unmarshaler_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(stable_marshaler_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(sizer_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_enum_stringer_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(enum_stringer_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(unsafe_marshaler_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(unsafe_unmarshaler_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_extensions_map_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_unrecognized_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(gogoproto_import) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(protosizer_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(compare_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(typedecl_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(enumdecl_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_registration) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(messagename_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_sizecache_all) - google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(goproto_unkeyed_all) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(goproto_getters) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(goproto_stringer) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(verbose_equal) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(face) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(gostring) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(populate) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(stringer) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(onlyone) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(equal) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(description) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(testgen) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(benchgen) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(marshaler) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(unmarshaler) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(stable_marshaler) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(sizer) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(unsafe_marshaler) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(unsafe_unmarshaler) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(goproto_extensions_map) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(goproto_unrecognized) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(protosizer) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(compare) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(typedecl) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(messagename) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(goproto_sizecache) - google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(goproto_unkeyed) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(nullable) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(embed) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(customtype) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(customname) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(jsontag) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(moretags) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(casttype) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(castkey) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(castvalue) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(stdtime) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(stdduration) - google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(wktpointer) - - DESCRIPTOR._options = None - DESCRIPTOR._serialized_options = b'\n\023com.google.protobufB\nGoGoProtosZ\"github.com/gogo/protobuf/gogoproto' +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'opentelemetry.exporter.prometheus_remote_write.gen.gogoproto.gogo_pb2', _globals) +if not _descriptor._USE_C_DESCRIPTORS: + _globals['DESCRIPTOR']._loaded_options = None + _globals['DESCRIPTOR']._serialized_options = b'\n\023com.google.protobufB\nGoGoProtosZ\"github.com/gogo/protobuf/gogoproto' # @@protoc_insertion_point(module_scope) diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/remote_pb2.py b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/remote_pb2.py index a274dbf204..6dd4d66cab 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/remote_pb2.py +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/remote_pb2.py @@ -1,11 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: opentelemetry/exporter/prometheus_remote_write/gen/remote.proto +# Protobuf Python Version: 5.29.3 """Generated protocol buffer code.""" -from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database +from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 3, + '', + 'opentelemetry/exporter/prometheus_remote_write/gen/remote.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -17,28 +28,28 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n?opentelemetry/exporter/prometheus_remote_write/gen/remote.proto\x12\nprometheus\x1a>opentelemetry/exporter/prometheus_remote_write/gen/types.proto\x1aGopentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo.proto\"z\n\x0cWriteRequest\x12\x30\n\ntimeseries\x18\x01 \x03(\x0b\x32\x16.prometheus.TimeSeriesB\x04\xc8\xde\x1f\x00\x12\x32\n\x08metadata\x18\x03 \x03(\x0b\x32\x1a.prometheus.MetricMetadataB\x04\xc8\xde\x1f\x00J\x04\x08\x02\x10\x03\"\xae\x01\n\x0bReadRequest\x12\"\n\x07queries\x18\x01 \x03(\x0b\x32\x11.prometheus.Query\x12\x45\n\x17\x61\x63\x63\x65pted_response_types\x18\x02 \x03(\x0e\x32$.prometheus.ReadRequest.ResponseType\"4\n\x0cResponseType\x12\x0b\n\x07SAMPLES\x10\x00\x12\x17\n\x13STREAMED_XOR_CHUNKS\x10\x01\"8\n\x0cReadResponse\x12(\n\x07results\x18\x01 \x03(\x0b\x32\x17.prometheus.QueryResult\"\x8f\x01\n\x05Query\x12\x1a\n\x12start_timestamp_ms\x18\x01 \x01(\x03\x12\x18\n\x10\x65nd_timestamp_ms\x18\x02 \x01(\x03\x12*\n\x08matchers\x18\x03 \x03(\x0b\x32\x18.prometheus.LabelMatcher\x12$\n\x05hints\x18\x04 \x01(\x0b\x32\x15.prometheus.ReadHints\"9\n\x0bQueryResult\x12*\n\ntimeseries\x18\x01 \x03(\x0b\x32\x16.prometheus.TimeSeries\"]\n\x13\x43hunkedReadResponse\x12\x31\n\x0e\x63hunked_series\x18\x01 \x03(\x0b\x32\x19.prometheus.ChunkedSeries\x12\x13\n\x0bquery_index\x18\x02 \x01(\x03\x42\x08Z\x06prompbb\x06proto3') -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'opentelemetry.exporter.prometheus_remote_write.gen.remote_pb2', globals()) -if _descriptor._USE_C_DESCRIPTORS == False: - - DESCRIPTOR._options = None - DESCRIPTOR._serialized_options = b'Z\006prompb' - _WRITEREQUEST.fields_by_name['timeseries']._options = None - _WRITEREQUEST.fields_by_name['timeseries']._serialized_options = b'\310\336\037\000' - _WRITEREQUEST.fields_by_name['metadata']._options = None - _WRITEREQUEST.fields_by_name['metadata']._serialized_options = b'\310\336\037\000' - _WRITEREQUEST._serialized_start=216 - _WRITEREQUEST._serialized_end=338 - _READREQUEST._serialized_start=341 - _READREQUEST._serialized_end=515 - _READREQUEST_RESPONSETYPE._serialized_start=463 - _READREQUEST_RESPONSETYPE._serialized_end=515 - _READRESPONSE._serialized_start=517 - _READRESPONSE._serialized_end=573 - _QUERY._serialized_start=576 - _QUERY._serialized_end=719 - _QUERYRESULT._serialized_start=721 - _QUERYRESULT._serialized_end=778 - _CHUNKEDREADRESPONSE._serialized_start=780 - _CHUNKEDREADRESPONSE._serialized_end=873 +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'opentelemetry.exporter.prometheus_remote_write.gen.remote_pb2', _globals) +if not _descriptor._USE_C_DESCRIPTORS: + _globals['DESCRIPTOR']._loaded_options = None + _globals['DESCRIPTOR']._serialized_options = b'Z\006prompb' + _globals['_WRITEREQUEST'].fields_by_name['timeseries']._loaded_options = None + _globals['_WRITEREQUEST'].fields_by_name['timeseries']._serialized_options = b'\310\336\037\000' + _globals['_WRITEREQUEST'].fields_by_name['metadata']._loaded_options = None + _globals['_WRITEREQUEST'].fields_by_name['metadata']._serialized_options = b'\310\336\037\000' + _globals['_WRITEREQUEST']._serialized_start=216 + _globals['_WRITEREQUEST']._serialized_end=338 + _globals['_READREQUEST']._serialized_start=341 + _globals['_READREQUEST']._serialized_end=515 + _globals['_READREQUEST_RESPONSETYPE']._serialized_start=463 + _globals['_READREQUEST_RESPONSETYPE']._serialized_end=515 + _globals['_READRESPONSE']._serialized_start=517 + _globals['_READRESPONSE']._serialized_end=573 + _globals['_QUERY']._serialized_start=576 + _globals['_QUERY']._serialized_end=719 + _globals['_QUERYRESULT']._serialized_start=721 + _globals['_QUERYRESULT']._serialized_end=778 + _globals['_CHUNKEDREADRESPONSE']._serialized_start=780 + _globals['_CHUNKEDREADRESPONSE']._serialized_end=873 # @@protoc_insertion_point(module_scope) diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/types_pb2.py b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/types_pb2.py index d519e03423..8453134aed 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/types_pb2.py +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/types_pb2.py @@ -1,11 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: opentelemetry/exporter/prometheus_remote_write/gen/types.proto +# Protobuf Python Version: 5.29.3 """Generated protocol buffer code.""" -from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database +from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 3, + '', + 'opentelemetry/exporter/prometheus_remote_write/gen/types.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -16,50 +27,50 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n>opentelemetry/exporter/prometheus_remote_write/gen/types.proto\x12\nprometheus\x1aGopentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo.proto\"\xf8\x01\n\x0eMetricMetadata\x12\x33\n\x04type\x18\x01 \x01(\x0e\x32%.prometheus.MetricMetadata.MetricType\x12\x1a\n\x12metric_family_name\x18\x02 \x01(\t\x12\x0c\n\x04help\x18\x04 \x01(\t\x12\x0c\n\x04unit\x18\x05 \x01(\t\"y\n\nMetricType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07\x43OUNTER\x10\x01\x12\t\n\x05GAUGE\x10\x02\x12\r\n\tHISTOGRAM\x10\x03\x12\x12\n\x0eGAUGEHISTOGRAM\x10\x04\x12\x0b\n\x07SUMMARY\x10\x05\x12\x08\n\x04INFO\x10\x06\x12\x0c\n\x08STATESET\x10\x07\"*\n\x06Sample\x12\r\n\x05value\x18\x01 \x01(\x01\x12\x11\n\ttimestamp\x18\x02 \x01(\x03\"U\n\x08\x45xemplar\x12\'\n\x06labels\x18\x01 \x03(\x0b\x32\x11.prometheus.LabelB\x04\xc8\xde\x1f\x00\x12\r\n\x05value\x18\x02 \x01(\x01\x12\x11\n\ttimestamp\x18\x03 \x01(\x03\"\x8f\x01\n\nTimeSeries\x12\'\n\x06labels\x18\x01 \x03(\x0b\x32\x11.prometheus.LabelB\x04\xc8\xde\x1f\x00\x12)\n\x07samples\x18\x02 \x03(\x0b\x32\x12.prometheus.SampleB\x04\xc8\xde\x1f\x00\x12-\n\texemplars\x18\x03 \x03(\x0b\x32\x14.prometheus.ExemplarB\x04\xc8\xde\x1f\x00\"$\n\x05Label\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"1\n\x06Labels\x12\'\n\x06labels\x18\x01 \x03(\x0b\x32\x11.prometheus.LabelB\x04\xc8\xde\x1f\x00\"\x82\x01\n\x0cLabelMatcher\x12+\n\x04type\x18\x01 \x01(\x0e\x32\x1d.prometheus.LabelMatcher.Type\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\r\n\x05value\x18\x03 \x01(\t\"(\n\x04Type\x12\x06\n\x02\x45Q\x10\x00\x12\x07\n\x03NEQ\x10\x01\x12\x06\n\x02RE\x10\x02\x12\x07\n\x03NRE\x10\x03\"|\n\tReadHints\x12\x0f\n\x07step_ms\x18\x01 \x01(\x03\x12\x0c\n\x04\x66unc\x18\x02 \x01(\t\x12\x10\n\x08start_ms\x18\x03 \x01(\x03\x12\x0e\n\x06\x65nd_ms\x18\x04 \x01(\x03\x12\x10\n\x08grouping\x18\x05 \x03(\t\x12\n\n\x02\x62y\x18\x06 \x01(\x08\x12\x10\n\x08range_ms\x18\x07 \x01(\x03\"\x8b\x01\n\x05\x43hunk\x12\x13\n\x0bmin_time_ms\x18\x01 \x01(\x03\x12\x13\n\x0bmax_time_ms\x18\x02 \x01(\x03\x12(\n\x04type\x18\x03 \x01(\x0e\x32\x1a.prometheus.Chunk.Encoding\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\x0c\" \n\x08\x45ncoding\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x07\n\x03XOR\x10\x01\"a\n\rChunkedSeries\x12\'\n\x06labels\x18\x01 \x03(\x0b\x32\x11.prometheus.LabelB\x04\xc8\xde\x1f\x00\x12\'\n\x06\x63hunks\x18\x02 \x03(\x0b\x32\x11.prometheus.ChunkB\x04\xc8\xde\x1f\x00\x42\x08Z\x06prompbb\x06proto3') -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'opentelemetry.exporter.prometheus_remote_write.gen.types_pb2', globals()) -if _descriptor._USE_C_DESCRIPTORS == False: - - DESCRIPTOR._options = None - DESCRIPTOR._serialized_options = b'Z\006prompb' - _EXEMPLAR.fields_by_name['labels']._options = None - _EXEMPLAR.fields_by_name['labels']._serialized_options = b'\310\336\037\000' - _TIMESERIES.fields_by_name['labels']._options = None - _TIMESERIES.fields_by_name['labels']._serialized_options = b'\310\336\037\000' - _TIMESERIES.fields_by_name['samples']._options = None - _TIMESERIES.fields_by_name['samples']._serialized_options = b'\310\336\037\000' - _TIMESERIES.fields_by_name['exemplars']._options = None - _TIMESERIES.fields_by_name['exemplars']._serialized_options = b'\310\336\037\000' - _LABELS.fields_by_name['labels']._options = None - _LABELS.fields_by_name['labels']._serialized_options = b'\310\336\037\000' - _CHUNKEDSERIES.fields_by_name['labels']._options = None - _CHUNKEDSERIES.fields_by_name['labels']._serialized_options = b'\310\336\037\000' - _CHUNKEDSERIES.fields_by_name['chunks']._options = None - _CHUNKEDSERIES.fields_by_name['chunks']._serialized_options = b'\310\336\037\000' - _METRICMETADATA._serialized_start=152 - _METRICMETADATA._serialized_end=400 - _METRICMETADATA_METRICTYPE._serialized_start=279 - _METRICMETADATA_METRICTYPE._serialized_end=400 - _SAMPLE._serialized_start=402 - _SAMPLE._serialized_end=444 - _EXEMPLAR._serialized_start=446 - _EXEMPLAR._serialized_end=531 - _TIMESERIES._serialized_start=534 - _TIMESERIES._serialized_end=677 - _LABEL._serialized_start=679 - _LABEL._serialized_end=715 - _LABELS._serialized_start=717 - _LABELS._serialized_end=766 - _LABELMATCHER._serialized_start=769 - _LABELMATCHER._serialized_end=899 - _LABELMATCHER_TYPE._serialized_start=859 - _LABELMATCHER_TYPE._serialized_end=899 - _READHINTS._serialized_start=901 - _READHINTS._serialized_end=1025 - _CHUNK._serialized_start=1028 - _CHUNK._serialized_end=1167 - _CHUNK_ENCODING._serialized_start=1135 - _CHUNK_ENCODING._serialized_end=1167 - _CHUNKEDSERIES._serialized_start=1169 - _CHUNKEDSERIES._serialized_end=1266 +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'opentelemetry.exporter.prometheus_remote_write.gen.types_pb2', _globals) +if not _descriptor._USE_C_DESCRIPTORS: + _globals['DESCRIPTOR']._loaded_options = None + _globals['DESCRIPTOR']._serialized_options = b'Z\006prompb' + _globals['_EXEMPLAR'].fields_by_name['labels']._loaded_options = None + _globals['_EXEMPLAR'].fields_by_name['labels']._serialized_options = b'\310\336\037\000' + _globals['_TIMESERIES'].fields_by_name['labels']._loaded_options = None + _globals['_TIMESERIES'].fields_by_name['labels']._serialized_options = b'\310\336\037\000' + _globals['_TIMESERIES'].fields_by_name['samples']._loaded_options = None + _globals['_TIMESERIES'].fields_by_name['samples']._serialized_options = b'\310\336\037\000' + _globals['_TIMESERIES'].fields_by_name['exemplars']._loaded_options = None + _globals['_TIMESERIES'].fields_by_name['exemplars']._serialized_options = b'\310\336\037\000' + _globals['_LABELS'].fields_by_name['labels']._loaded_options = None + _globals['_LABELS'].fields_by_name['labels']._serialized_options = b'\310\336\037\000' + _globals['_CHUNKEDSERIES'].fields_by_name['labels']._loaded_options = None + _globals['_CHUNKEDSERIES'].fields_by_name['labels']._serialized_options = b'\310\336\037\000' + _globals['_CHUNKEDSERIES'].fields_by_name['chunks']._loaded_options = None + _globals['_CHUNKEDSERIES'].fields_by_name['chunks']._serialized_options = b'\310\336\037\000' + _globals['_METRICMETADATA']._serialized_start=152 + _globals['_METRICMETADATA']._serialized_end=400 + _globals['_METRICMETADATA_METRICTYPE']._serialized_start=279 + _globals['_METRICMETADATA_METRICTYPE']._serialized_end=400 + _globals['_SAMPLE']._serialized_start=402 + _globals['_SAMPLE']._serialized_end=444 + _globals['_EXEMPLAR']._serialized_start=446 + _globals['_EXEMPLAR']._serialized_end=531 + _globals['_TIMESERIES']._serialized_start=534 + _globals['_TIMESERIES']._serialized_end=677 + _globals['_LABEL']._serialized_start=679 + _globals['_LABEL']._serialized_end=715 + _globals['_LABELS']._serialized_start=717 + _globals['_LABELS']._serialized_end=766 + _globals['_LABELMATCHER']._serialized_start=769 + _globals['_LABELMATCHER']._serialized_end=899 + _globals['_LABELMATCHER_TYPE']._serialized_start=859 + _globals['_LABELMATCHER_TYPE']._serialized_end=899 + _globals['_READHINTS']._serialized_start=901 + _globals['_READHINTS']._serialized_end=1025 + _globals['_CHUNK']._serialized_start=1028 + _globals['_CHUNK']._serialized_end=1167 + _globals['_CHUNK_ENCODING']._serialized_start=1135 + _globals['_CHUNK_ENCODING']._serialized_end=1167 + _globals['_CHUNKEDSERIES']._serialized_start=1169 + _globals['_CHUNKEDSERIES']._serialized_end=1266 # @@protoc_insertion_point(module_scope) From e5e2826edba999962fc8be7191b75f9ea8f1ff44 Mon Sep 17 00:00:00 2001 From: Michael Schuett Date: Tue, 4 Feb 2025 13:54:18 -0700 Subject: [PATCH 6/9] format --- .../tests/test_prometheus_remote_write_exporter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/tests/test_prometheus_remote_write_exporter.py b/exporter/opentelemetry-exporter-prometheus-remote-write/tests/test_prometheus_remote_write_exporter.py index 814de75be4..1c50344353 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/tests/test_prometheus_remote_write_exporter.py +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/tests/test_prometheus_remote_write_exporter.py @@ -122,9 +122,9 @@ def test_parse_metric(metric, prom_rw): "bool_value": True, } - assert len(metric.data.data_points) == 1, ( - "We can only support a single datapoint in tests" - ) + assert ( + len(metric.data.data_points) == 1 + ), "We can only support a single datapoint in tests" series = prom_rw._parse_metric(metric, tuple(attributes.items())) timestamp = metric.data.data_points[0].time_unix_nano // 1_000_000 for single_series in series: From 7f8b83ced834ff63c3ce41675bc864b27f1550b2 Mon Sep 17 00:00:00 2001 From: Michael Schuett Date: Tue, 4 Feb 2025 14:33:38 -0700 Subject: [PATCH 7/9] actually support 5.26 protobuf --- .../proto/README.md | 4 ++-- .../proto/generate-proto-py.sh | 2 +- .../gen/gogoproto/gogo_pb2.py | 12 +----------- .../prometheus_remote_write/gen/remote_pb2.py | 12 +----------- .../prometheus_remote_write/gen/types_pb2.py | 12 +----------- .../test-requirements.txt | 2 +- 6 files changed, 7 insertions(+), 37 deletions(-) diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/proto/README.md b/exporter/opentelemetry-exporter-prometheus-remote-write/proto/README.md index 7f883d571c..1a86d072d6 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/proto/README.md +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/proto/README.md @@ -1,3 +1,3 @@ ## Instructions -1. Install protobuf tools. Can use your package manager or download from [GitHub](https://github.com/protocolbuffers/protobuf/releases/tag/v29.3) -2. Run `generate-proto-py.sh` from inside the `proto/` directory +1. Install protobuf tools. Can use your package manager or download from [GitHub](https://github.com/protocolbuffers/protobuf/releases/tag/v26.0) +2. Run `generate-proto-py.sh` from inside the `proto/` directory \ No newline at end of file diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/proto/generate-proto-py.sh b/exporter/opentelemetry-exporter-prometheus-remote-write/proto/generate-proto-py.sh index b335a30b21..ed94afee6d 100755 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/proto/generate-proto-py.sh +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/proto/generate-proto-py.sh @@ -49,7 +49,7 @@ sed -i 's/import "gogoproto\/gogo.proto";/import "opentelemetry\/exporter\/prome echo "Removing clones..." rm -rf protobuf prometheus -# Used libprotoc 29.3 +# Used libprotoc 26 echo "Compiling proto files to Python" protoc -I . --python_out=../src ${SRC_DIR}/gogoproto/gogo.proto ${SRC_DIR}/remote.proto ${SRC_DIR}/types.proto diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo_pb2.py b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo_pb2.py index a676145147..71fea245bf 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo_pb2.py +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo.proto -# Protobuf Python Version: 5.29.3 +# Protobuf Python Version: 5.26.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 3, - '', - 'opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/remote_pb2.py b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/remote_pb2.py index 6dd4d66cab..a040e5a7f5 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/remote_pb2.py +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/remote_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: opentelemetry/exporter/prometheus_remote_write/gen/remote.proto -# Protobuf Python Version: 5.29.3 +# Protobuf Python Version: 5.26.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 3, - '', - 'opentelemetry/exporter/prometheus_remote_write/gen/remote.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/types_pb2.py b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/types_pb2.py index 8453134aed..228b1f02c0 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/types_pb2.py +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/types_pb2.py @@ -1,22 +1,12 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# NO CHECKED-IN PROTOBUF GENCODE # source: opentelemetry/exporter/prometheus_remote_write/gen/types.proto -# Protobuf Python Version: 5.29.3 +# Protobuf Python Version: 5.26.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion( - _runtime_version.Domain.PUBLIC, - 5, - 29, - 3, - '', - 'opentelemetry/exporter/prometheus_remote_write/gen/types.proto' -) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt b/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt index 61484b20a9..f0d538f563 100644 --- a/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt +++ b/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt @@ -9,7 +9,7 @@ idna==3.7 iniconfig==2.0.0 packaging==24.0 pluggy==1.5.0 -protobuf==5.29.3 +protobuf==5.26 py-cpuinfo==9.0.0 pytest==7.4.4 python-snappy==0.7.1 From 2c53a1b30bef2066a6e0f056e00c9eae86ef0357 Mon Sep 17 00:00:00 2001 From: Michael Schuett Date: Tue, 4 Feb 2025 15:43:23 -0700 Subject: [PATCH 8/9] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2561ebcf2f..dc6f813137 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,6 +67,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Breaking changes +- `opentelemetry-exporter-prometheus-remote-write` updated protobuf required version from 4.21 to 5.26 and regenerated protobufs ([#3219](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3219)) - `opentelemetry-instrumentation-sqlalchemy` including sqlcomment in `db.statement` span attribute value is now opt-in ([#3112](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3112)) - `opentelemetry-instrumentation-dbapi` including sqlcomment in `db.statement` span attribute value is now opt-in From 356efccf7de7ac1dbc6787a71944858455372626 Mon Sep 17 00:00:00 2001 From: Michael Schuett <159061018+michaelschuett-tomtom@users.noreply.github.com> Date: Tue, 11 Feb 2025 16:22:39 +0100 Subject: [PATCH 9/9] Update CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Emídio Neto <9735060+emdneto@users.noreply.github.com> --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb847e6742..70b142cd17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -69,7 +69,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Breaking changes -- `opentelemetry-exporter-prometheus-remote-write` updated protobuf required version from 4.21 to 5.26 and regenerated protobufs ([#3219](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3219)) +- `opentelemetry-exporter-prometheus-remote-write` updated protobuf required version from 4.21 to 5.26 and regenerated protobufs + ([#3219](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3219)) - `opentelemetry-instrumentation-sqlalchemy` including sqlcomment in `db.statement` span attribute value is now opt-in ([#3112](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3112)) - `opentelemetry-instrumentation-dbapi` including sqlcomment in `db.statement` span attribute value is now opt-in