Refactor metrictank repo to be compatible with go modules #2042

ywwg · 2022-10-07T16:05:40Z

This PR refactors the entire metrictank repository to make it compatible with Go modules as well with vscode's static compilation. All of the Makefile commands have been fixed (as far as I know). I believe travis/circleci is also working.

As part of the change, the vendor/ directory has been removed from checked-in source, instead users should run go mod vendor locally as needed.

ywwg · 2022-10-11T19:18:45Z

cmd/mt-store-cp-experimental/main.go

@@ -75,7 +75,7 @@ func main() {
 		fmt.Fprintln(os.Stderr, "Copies data in Cassandra to use another table (and possibly another cluster).")
 		fmt.Fprintln(os.Stderr, "It is up to you to assure table-out exists before running this tool")
 		fmt.Fprintln(os.Stderr, "This tool is EXPERIMENTAL and needs doublechecking whether data is successfully written to Cassandra")
-		fmt.Fprintln(os.Stderr, "see https://github.com/grafana/metrictank/pkg/pull/909 for details")
+		fmt.Fprintln(os.Stderr, "see https://github.com/grafana/metrictank/pull/909 for details")


this was a find-replace error

ywwg · 2022-10-11T19:19:04Z

pkg/api/query_engine_test.go

-//   and singles in groups by retention (in schemaID order)
-// * PNGroups obviously will need a common interval, which gets interesting when using multiple schemas
-// * coarsening continues until all data is fetched at its coarsest. At that point we may breach soft, but never hard
+//   - requests are coarsened, PNGroup by PNGroup (we cannot predict PNGroup map iteration order, so we only test with 1 PNGroup),


the new gofmt does different things

pkg/api/graphite.go

replay · 2022-10-11T20:40:25Z

pkg/api/query_engine.go

@@ -64,7 +64,7 @@ var (
 // also takes a "now" value which we compare the TTL against

 // Note: MDP-yes code path may not take into account that archive 0 may have a different raw interval.
-// see https://github.com/grafana/metrictank/issues/1679
+// see https://github.com/grafana/metrictank/pkg/issues/1679


pkg/api/response/error.go

pkg/expr/plan_test.go

pkg/mdata/aggmetrics.go

pkg/mdata/importer/chunk_encoder.go

pkg/schema/msg/format.go

replay · 2022-10-11T20:45:32Z

I think to fix the pointed out search & replace issue the easiest would be to just search and replace these strings:

github.com/grafana/metrictank/pkg/blob
github.com/grafana/metrictank/pkg/issue(s)
github.com/grafana/metrictank/pkg/pull(s)

and remove the pkg again from them

ywwg · 2022-10-12T16:37:16Z

ok I rolled the deps back that I could get from gopkg.lock, but unfortunately there are still massive diffs between the checked-in vendor/ dir in metrictank and the versions created by go mod vendor. What's more, it looks like the checked-in vendor/ dir has been hacked up, removing README and CHANGES files, making it impossible to know which version was downloaded. And given the huge number for dependencies I'm not sure there's a reliable way to pin all the deps at the correct old versions.

I think the next step is figuring out a way to test this branch to see if any of the module updates break anything.

ywwg · 2022-10-18T15:31:45Z

due to the risk of instability, we are going to put off merging this until ~Q1 or so.

ywwg force-pushed the owilliams/gofixes2 branch from df95a3d to c87cb62 Compare October 7, 2022 16:24

ywwg marked this pull request as ready for review October 7, 2022 16:30

ywwg requested review from Dieterbe and replay October 7, 2022 17:40

ywwg force-pushed the owilliams/gofixes2 branch from 1b21e43 to a123880 Compare October 11, 2022 19:09

Convert to Go module style by moving files to pkg/ etc

2b9d8e3

ywwg force-pushed the owilliams/gofixes2 branch 3 times, most recently from 1254c68 to 731321a Compare October 11, 2022 19:17

ywwg commented Oct 11, 2022

View reviewed changes