Loki: Move weaveworks/common back to upstream

Created on 28 Aug 2019 · 9Comments · Source: grafana/loki

To not block some PR we moved weaveworks/common to a personal fork. Once weaveworks/common#153 is merged we can go back to upstream.

good first issue help wanted lifecyclupstream

Source

cyriltovena

👍2

Most helpful comment

@clickyotomy it's merged!

ThoreKr on 3 Nov 2019

🎉2

All 9 comments

As weaveworks/common#153 is more or less dead and waiting for a rebase I reopened a new (rebased) PR (weaveworks/common#167).

ThoreKr on 27 Sep 2019

Hello! Can I work on this after https://github.com/weaveworks/common/pull/167 is merged?

clickyotomy on 30 Sep 2019

@clickyotomy If you are more familiar with the dependencies a bit of help in weaveworks/common#167 would be most welcome.

Initially it was only meant to be a rebase to resolve a merge conflict, but now the actual change has been reviewed again.

ThoreKr on 1 Oct 2019

@clickyotomy Please also take a look at my notes in #1051 as there is apparently another version in the vendor subdirectory.

ThoreKr on 1 Oct 2019

@ThoreKr, I am not familiar with the changes introduced in https://github.com/weaveworks/common/pull/167, but I will try to help. :)

I don't know what needs to be done here - should we include/replace localhost on all the tests?
However, here - maybe we can get rid of HTTPListen{Port,Address} for TestErrorInstrumentationMiddleware, because it's probably not needed for that test.

How do I make changes to the PR? Fork from https://github.com/ThoreKr/weaveworks-common/tree/server-listen-addr and open a new one?

Regarding https://github.com/grafana/loki/issues/1051, this repo was moved to go modules (https://github.com/grafana/loki/pull/1062) for dependency management. We might just have to do a go mod edit -dropreplace=personal_fork[@v] and use the latest from upstream for this issue.

clickyotomy on 1 Oct 2019

@clickyotomy Me neither, I just rebased it. Maybe wait for comments from upstream whether it should be tested or not.

ThoreKr on 1 Oct 2019

👍1

This issue has been automatically marked as stale because it has not had any activity in the past 30 days. It will be closed in 7 days if no further activity occurs. Thank you for your contributions.