Dep migration #1240

isaachier · 2018-12-06T03:22:23Z

Which problem is this PR solving?

Resumes work from Replace Glide with Dep #610.

Short description of the changes

Title says it all.

codecov · 2018-12-06T03:31:17Z

Codecov Report

Merging #1240 into master will not change coverage.
The diff coverage is n/a.

@@          Coverage Diff           @@
##           master   #1240   +/-   ##
======================================
  Coverage     100%    100%           
======================================
  Files         159     159           
  Lines        7145    7145           
======================================
  Hits         7145    7145

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7b18bd9...a2e06b7. Read the comment docs.

isaachier · 2018-12-06T14:06:00Z

@vprithvi @yurishkuro any thoughts on this change?

jpkrohling

Shouldn't we go directly to go modules instead of dep?

jpkrohling · 2018-12-06T14:12:40Z

Makefile

@@ -153,13 +156,13 @@ lint: lint-gosec
 	@./scripts/import-order-cleanup.sh stdout > $(IMPORT_LOG)
 	@[ ! -s "$(FMT_LOG)" -a ! -s "$(IMPORT_LOG)" ] || (echo "Go fmt, license check, or import ordering failures, run 'make fmt'" | cat - $(FMT_LOG) && false)

-.PHONY: install-glide


Could we keep this for a while, as an alias to install-dep + WARN message stating that it's deprecated?

Sure good idea.

isaachier · 2018-12-06T14:22:52Z

@jpkrohling I hear the reasoning to move to Go modules. This PR addresses an Uber-specific issue, where we must use dep or glide, but do not support Go modules.

yurishkuro · 2018-12-06T18:12:22Z

Makefile

@@ -1,15 +1,18 @@
 PROJECT_ROOT=github.com/jaegertracing/jaeger
 # TOP_PKGS is used with 'go test'
-# TODO: try to do this without glide, since it may not be installed initially
-TOP_PKGS := $(shell glide novendor | \
+TOP_PKGS := $(shell go list ./... | \


so:

$ time go list ./... ... go list ./... 1.51s user 2.29s system 105% cpu 3.595 total

Can we do without it altogether? Do we still need TOP_PKGS? If we do, can we use something lighter than go list?

Personally remember writing a script for this in some PR but have to dig it up. If we absolutely need it, will let you know.

yurishkuro · 2018-12-06T18:12:59Z

Makefile

@@ -155,11 +158,15 @@ lint: lint-gosec

 .PHONY: install-glide
 install-glide:
-	@which glide > /dev/null || go get github.com/Masterminds/glide
+	@echo "Jaeger has migrated to dep, please run 'make install-dep'" 1>&2


this target should be removed

@jpkrohling disagreed above and I added this. Do you think the target is unhelpful?

he said to fall back to dep, which this doesn't. Also, this looks like it's always been an internal target, not something used outside of make, so I don't see much value in keeping just the name.

yurishkuro · 2018-12-06T18:16:28Z

Gopkg.toml

+#   go-tests = true
+#   unused-packages = true
+
+


I am not sure this file is equivalent to glide.yaml. We can debate separately if we do or do not want to pin certain things, but for the purpose of this migration I would prefer no changes to the dependencies.

Specifically, dep defaults to ^, i.e. version = "1.16.0" in dep is equivalent to "^1.16.0" in glide. In order to do an actual pin, we need to use =, e.g. version = "=1.16.0"

Actually, I ran dep init which did all of the automatically. I was assuming it chose the correct convention.

I don't think it did, none of the projects are pinned, while many were pinned in glide.

OK but why did we pin these. I imagine this will end up being a nuisance for internal dep to handle constraints.

we don't pin all of them, but we do pin some, esp. I remember having issues with gogo versions and had to work out a consistent working set. Like I said, we should have a discussion about not-pinning, but this migration should not be introducing changes to dependencies, imo.

It is funny you say that because internally gogo/protobuf seems to be the packages causing the issue I have experienced.

yurishkuro · 2018-12-06T18:18:39Z

Retain install-glide but print warning …

why?

isaachier · 2018-12-06T18:26:57Z

Retain install-glide but print warning …

why?

Ask @jpkrohling.

yurishkuro · 2018-12-06T22:01:27Z

Gopkg.toml

+
+[[constraint]]
+  name = "github.com/spf13/pflag"
+  version = "1.0.0"


nit: maybe explicitly use ^ when we're not pinning?

yurishkuro · 2018-12-06T22:02:33Z

Makefile

@@ -92,7 +81,7 @@ clean:

 .PHONY: test
 test: go-gen
-	bash -c "set -e; set -o pipefail; $(GOTEST) $(TOP_PKGS) | $(COLORIZE)"
+	bash -c "set -e; set -o pipefail; $(GOTEST) ./... | $(COLORIZE)"


yurishkuro · 2018-12-06T22:04:29Z

Makefile

@@ -112,7 +101,7 @@ all-srcs:
 cover: nocover
 	@echo pre-compiling tests
 	@time go test -i $(ALL_PKGS)
-	@./scripts/cover.sh $(shell go list $(TOP_PKGS))
+	@./scripts/cover.sh $(shell go list ./...)


I think we need to get rid of this script, it's no longer needed. See opentracing/opentracing-go#202

But can do in another PR (add a TODO)

yurishkuro · 2018-12-06T22:06:08Z

please rebase

jpkrohling · 2018-12-07T09:02:11Z

Retain install-glide but print warning …

why?

The idea is to give a chance to people who might be using this target. This seems internal, but it's possible that people might be building Jaeger on their own, applying custom patches to it. It would be polite to give them a heads-up before breaking their scripts.

Signed-off-by: Isaac Hier <isaachier@gmail.com>

Signed-off-by: Isaac Hier <ihier@uber.com>

isaachier requested review from black-adder, jpkrohling, objectiser, pavolloffay, tiffon, vprithvi and yurishkuro as code owners December 6, 2018 03:22

jpkrohling reviewed Dec 6, 2018

View reviewed changes

jpkrohling approved these changes Dec 6, 2018

View reviewed changes

vprithvi approved these changes Dec 6, 2018

View reviewed changes

yurishkuro reviewed Dec 6, 2018

View reviewed changes

isaachier force-pushed the dep-migration branch from 513dded to 101a1f4 Compare December 6, 2018 21:07

yurishkuro reviewed Dec 6, 2018

View reviewed changes

Gopkg.toml

[[constraint]]

name = "github.com/spf13/pflag"

version = "1.0.0"

Copy link

Member

yurishkuro Dec 6, 2018

Choose a reason for hiding this comment

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

nit: maybe explicitly use ^ when we're not pinning?

yurishkuro approved these changes Dec 6, 2018

View reviewed changes

Migrate to dep

609bb9c

Signed-off-by: Isaac Hier <isaachier@gmail.com>

isaachier force-pushed the dep-migration branch from 836893d to 609bb9c Compare December 7, 2018 13:11

Warn on install-glide and redirect to use dep

a2e06b7

Signed-off-by: Isaac Hier <ihier@uber.com>

yurishkuro merged commit 5f6af99 into jaegertracing:master Dec 7, 2018

isaachier deleted the dep-migration branch December 7, 2018 17:25

justinclift mentioned this pull request Jan 1, 2019

Replace Glide with Dep #610

Closed

3 tasks

yurishkuro mentioned this pull request Apr 2, 2019

Switch from Glide to Dep #483

Closed

bhavin192 mentioned this pull request May 31, 2019

Pin dependencies that do not use semver to specific commits #887

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dep migration #1240

Dep migration #1240

isaachier commented Dec 6, 2018

codecov bot commented Dec 6, 2018 •

edited

Loading

isaachier commented Dec 6, 2018

jpkrohling left a comment

jpkrohling Dec 6, 2018

isaachier Dec 6, 2018

isaachier commented Dec 6, 2018

yurishkuro Dec 6, 2018

isaachier Dec 6, 2018

yurishkuro Dec 6, 2018

isaachier Dec 6, 2018

yurishkuro Dec 6, 2018

yurishkuro Dec 6, 2018

isaachier Dec 6, 2018

yurishkuro Dec 6, 2018

isaachier Dec 6, 2018

yurishkuro Dec 6, 2018

isaachier Dec 6, 2018

yurishkuro commented Dec 6, 2018

isaachier commented Dec 6, 2018

yurishkuro Dec 6, 2018

yurishkuro Dec 6, 2018

yurishkuro Dec 6, 2018

yurishkuro commented Dec 6, 2018

jpkrohling commented Dec 7, 2018

Dep migration #1240

Dep migration #1240

Conversation

isaachier commented Dec 6, 2018

Which problem is this PR solving?

Short description of the changes

codecov bot commented Dec 6, 2018 • edited Loading

Codecov Report

isaachier commented Dec 6, 2018

jpkrohling left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

isaachier commented Dec 6, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yurishkuro commented Dec 6, 2018

isaachier commented Dec 6, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yurishkuro commented Dec 6, 2018

jpkrohling commented Dec 7, 2018

codecov bot commented Dec 6, 2018 •

edited

Loading