Skip to content

Commit fbc0309

Browse files
authored
First batch for beta3 (#542)
* Update dependencies * Fix metrics test now that tally adds + for tags * Re-generate Cherami mocks * Remove interfacer, run lint * ^2 cherami
1 parent 75ea3fd commit fbc0309

15 files changed

Lines changed: 148 additions & 84 deletions

File tree

.build/deps.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ deps: libdeps
1616
$(ECHO_V)go install ./vendor/github.com/kisielk/errcheck
1717
@$(call label,Installing md-to-godoc...)
1818
$(ECHO_V)go install ./vendor/github.com/sectioneight/md-to-godoc
19-
@$(call label,Installing interfacer...)
20-
$(ECHO_V)go install ./vendor/github.com/mvdan/interfacer/cmd/interfacer
2119
@$(call label,Installing richgo...)
2220
$(ECHO_V)go install ./vendor/github.com/kyoh86/richgo
2321

.build/lint.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ lint:
1717
$(ECHO_V)rm -rf $(LINT_LOG)
1818
@echo "Installing test dependencies for vet..."
1919
$(ECHO_V)go test -i $(PKGS)
20-
@echo "Running interfacer..."
21-
$(ECHO_V)interfacer $(LIST_PKGS) | tee -a $(LINT_LOG)
2220
@echo "Checking formatting..."
2321
$(ECHO_V)gofmt -d -s $(PKG_FILES) 2>&1 | tee $(LINT_LOG)
2422
@echo "Checking vet..."

config/doc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
//
3434
// Nesting
3535
//
36-
// The configuration system wraps a set of *providers* that each know how to get
36+
// The configuration system wraps a set of providers that each know how to get
3737
// values from an underlying source:
3838
//
3939
//
@@ -108,7 +108,7 @@
108108
// be useful, so UberFx treats them specially. Dynamic configuration providers
109109
// conform to the
110110
// Provider interface, but they're instantiated
111-
// **after** the Static Providers on order to read bootstrap values.
111+
// after the Static Providers on order to read bootstrap values.
112112
//
113113
// For example, if you were to implement a ZooKeeper-backed
114114
// Provider, you'd likely need to specify (via YAML or environment

doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
//
5858
// Service Model
5959
//
60-
// A service is a container for a set of **modules** and controls their lifecycle.
60+
// A service is a container for a set of modules and controls their lifecycle.
6161
// A service can have any number of modules, each responsible for a specific type
6262
// of functionality, such as a Kafka message ingestion, exposing an HTTP server,
6363
// or a set of RPC service endpoints.

glide.lock

Lines changed: 96 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

glide.yaml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ import:
33
- package: go.uber.org/zap
44
version: ^1
55
- package: github.com/uber-go/tally
6-
version: ^2.1.0
6+
version: ^3.0.2
77
- package: github.com/gorilla/mux
88
version: ^1.1.0
99
- package: github.com/gorilla/context
1010
version: ^1.1.0
1111
- package: go.uber.org/yarpc
12-
version: ^v1.4.0
12+
version: ^1
1313
- package: go.uber.org/dig
1414
version: ~0.1
1515
- package: go.uber.org/thriftrw
1616
version: ^1
1717
- package: github.com/go-validator/validator
1818
version: v2
1919
- package: github.com/pkg/errors
20-
version: ^0.8.0
20+
version: ~0.8.0
2121
- package: github.com/getsentry/raven-go
2222
version: master
2323
- package: github.com/uber/jaeger-client-go
@@ -27,11 +27,7 @@ import:
2727
- assert
2828
- require
2929
- package: github.com/uber/cherami-client-go
30-
version: ^v0.1.0
31-
subpackages:
32-
- client/cherami
33-
- common
34-
- common/metrics
30+
version: ^2
3531
- package: github.com/uber/cherami-thrift
3632
subpackages:
3733
- .generated/go/cherami
@@ -66,7 +62,6 @@ testImport:
6662
- package: github.com/russross/blackfriday
6763
version: 2
6864
- package: github.com/shurcooL/sanitized_anchor_name
69-
- package: github.com/mvdan/interfacer/cmd/interfacer
7065
- package: github.com/kyoh86/richgo
7166
- package: go.uber.org/tools
7267
subpackages:

0 commit comments

Comments
 (0)