Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Prometheus dependency to latest release (v2.40.4) #7826

Merged
merged 4 commits into from
Dec 4, 2022

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Dec 1, 2022

Closes #7811, which is needed for Grafana Agent to update to v2.40 and add support for native histograms.

I did not add support for native histograms to Loki, sorry :)

@rfratto rfratto requested a review from a team as a code owner December 1, 2022 15:48
@rfratto
Copy link
Member Author

rfratto commented Dec 1, 2022

Hm, this is failing on the protobufs:

github.com/weaveworks/common/httpgrpc/httpgrpc.proto: Import "gogoproto/gogo.proto" was not found or had errors.
pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.proto: Import "github.com/weaveworks/common/httpgrpc/httpgrpc.proto" was not found or had errors.
pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.proto:30:3: "httpgrpc.HTTPRequest" is not defined.
pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.proto:39:3: "httpgrpc.HTTPResponse" is not defined.

I'm not sure what I should do here; I think it might be related to @krajorama's resent changes to weaveworks/common but I can't tell.

@krajorama
Copy link

krajorama commented Dec 2, 2022

Hm, this is failing on the protobufs:

github.com/weaveworks/common/httpgrpc/httpgrpc.proto: Import "gogoproto/gogo.proto" was not found or had errors.
pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.proto: Import "github.com/weaveworks/common/httpgrpc/httpgrpc.proto" was not found or had errors.
pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.proto:30:3: "httpgrpc.HTTPRequest" is not defined.
pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.proto:39:3: "httpgrpc.HTTPResponse" is not defined.

I'm not sure what I should do here; I think it might be related to @krajorama's resent changes to weaveworks/common but I can't tell.

Yes, we've fixed non-reproducable build in weaveworks/common#264 and weaveworks/common#265 . See comment here on knock on effect: weaveworks/common#262 (comment)

TL;DR; you need to have a -I include directive for protoc to find gogoproto/gogo.proto

@rfratto
Copy link
Member Author

rfratto commented Dec 2, 2022

@krajorama Thanks! Looks like there was two set of issues:

  1. I needed to add the -I directive for gogoproto/gogo.proto as you mentioned
  2. I needed to update Loki protos to import gogoproto/gogo.proto instead of the full path, otherwise it caused a collision from protoc and failed to compile.

@rfratto rfratto force-pushed the update-prometheus-2.40 branch 2 times, most recently from f442ea1 to 8114d47 Compare December 2, 2022 19:15
rfratto added a commit to rfratto/loki that referenced this pull request Dec 2, 2022
faillint needs an update for Go 1.19 where it fails unexpectedly. First
observed in grafana#7826.

See fatih/faillint#36
slim-bean pushed a commit that referenced this pull request Dec 4, 2022
faillint needs an update for Go 1.19 where it fails unexpectedly. First
observed in #7826.

See fatih/faillint#36
@rfratto rfratto force-pushed the update-prometheus-2.40 branch from 33963f2 to ac1db91 Compare December 4, 2022 17:41
@rfratto rfratto force-pushed the update-prometheus-2.40 branch from ac1db91 to 65c09cc Compare December 4, 2022 17:54
@grafanabot
Copy link
Collaborator

./tools/diff_coverage.sh ../loki-target-branch/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for putting in all the effort to make this change @rfratto !

@slim-bean slim-bean merged commit 85392a9 into grafana:main Dec 4, 2022
@rfratto rfratto deleted the update-prometheus-2.40 branch December 4, 2022 18:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update Prometheus dependency to v2.40
4 participants