Add protobufs for Prometheus remote-write/remote-read protocols#66069
Merged
vitlibar merged 2 commits intoClickHouse:masterfrom Jul 5, 2024
Merged
Add protobufs for Prometheus remote-write/remote-read protocols#66069vitlibar merged 2 commits intoClickHouse:masterfrom
vitlibar merged 2 commits intoClickHouse:masterfrom
Conversation
20 tasks
Contributor
|
This is an automated comment for commit 1ef5bca with description of existing statuses. It's updated for the latest CI running ❌ Click here to open a full report in a separate page
Successful checks
|
nikitamikhaylov
approved these changes
Jul 3, 2024
alexey-milovidov
approved these changes
Jul 4, 2024
f8316ea to
5b4a3f7
Compare
5b4a3f7 to
0559621
Compare
…ths in SRCS and HDRS even if input ".proto" files are located in sibling directories.
0559621 to
1ef5bca
Compare
vitlibar
commented
Jul 4, 2024
| @@ -0,0 +1,2 @@ | |||
| Files "prompb/remote.proto" and "prompb/types.proto" were downloaded from the Prometheus repository: | |||
| https://github.com/prometheus/prometheus/tree/main/prompb | |||
Member
Author
There was a problem hiding this comment.
The whole repository https://github.com/prometheus/prometheus is quite big, and I need only two small files remote.proto and types.proto from it, so I decided not to add the prometheus repository as a submodule and just download these two files into our contrib/prometheus-protobufs/ folder instead.
vitlibar
commented
Jul 4, 2024
| option go_package = "prompb"; | ||
|
|
||
| import "prompb/types.proto"; | ||
| import "gogoproto/gogo.proto"; |
Member
Author
There was a problem hiding this comment.
Here remote.proto from the Prometheus repository depends on gogo.proto from the Protocol Buffers for Go with Gadgets repository. And again, that repository is quite big and I need only one file from it, so I just downloaded it into our contrib/prometheus-protobufs-gogo/ folder instead of making a new submodule.
vitlibar
commented
Jul 4, 2024
| # _basename - filename of the .proto file (without path and without extenstion). | ||
| get_proto_absolute_path(_abs_file "${_proto}" ${_protobuf_include_path}) | ||
| get_proto_relative_path(_possible_rel_dir "${_abs_file}" ${_protobuf_include_path}) | ||
| get_filename_component(_basename "${_abs_file}" NAME_WE) |
Member
Author
There was a problem hiding this comment.
Without my changes here this cmake script returned incorrect paths for generated source files after compiling .proto files. As a result variables prometheus_protobufs_sources and prometheus_protobufs_headers here were incorrect and the build failed.
Member
Author
|
Test failures are unrelated: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changelog category:
Changelog entry:
Add protobufs for
Prometheusremote-write/remote-readprotocols to our repository.Fix cmake script for compiling protobufs.
This PR is required for #64183