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.

Sign up for GitHub

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

Use Go 1.11 in Travis #1104

Merged
merged 3 commits into from
Oct 8, 2018
Merged

Use Go 1.11 in Travis #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b46dc20
Use Go 1.11 in Travis
Sep 6, 2018
241d5ee
Use Go 1.11 formatting
isaachier Sep 7, 2018
b74db4e
Bump patch version
Oct 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,27 @@ dist: trusty

matrix:
include:
- go: "1.10"
- go: "1.11.1"
env:
- TESTS=true
- COVERAGE=true
- go: "1.10"
- go: "1.11.1"
env:
- ALL_IN_ONE=true
- go: "1.10"
- go: "1.11.1"
env:
- CROSSDOCK=true
- go: "1.10"
- go: "1.11.1"
env:
- DOCKER=true
- DEPLOY=true
- go: "1.10"
- go: "1.11.1"
env:
- ES_INTEGRATION_TEST=true
- go: "1.10"
- go: "1.11.1"
env:
- KAFKA_INTEGRATION_TEST=true
- go: "1.10"
- go: "1.11.1"
env:
- HOTROD=true

Expand Down
2 changes: 1 addition & 1 deletion crossdock/services/tracehandler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ func TestCreateTracesLoop(t *testing.T) {
defer server.Close()

handler := &TraceHandler{
logger: zap.NewNop(),
logger: zap.NewNop(),
createTracesLoopInterval: time.Millisecond,
getClientURL: func(service string) string {
return server.URL
Expand Down
2 changes: 1 addition & 1 deletion plugin/storage/cassandra/dependencystore/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func NewDependencyStore(
return &DependencyStore{
session: session,
dependenciesTableMetrics: casMetrics.NewTable(metricsFactory, "dependencies"),
logger: logger,
logger: logger,
}
}

Expand Down
4 changes: 2 additions & 2 deletions plugin/storage/cassandra/spanstore/writer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func TestSpanWriter(t *testing.T) {
},
},
{
caption: "add span to operation name index",
caption: "add span to operation name index",
serviceOperationNameQueryError: errors.New("serviceOperationNameQueryError"),
expectedError: "Failed to index operation name: failed to Exec query 'select from service_operation_index': serviceOperationNameQueryError",
expectedLogs: []string{
Expand All @@ -132,7 +132,7 @@ func TestSpanWriter(t *testing.T) {
},
},
{
caption: "add duration with no operation name",
caption: "add duration with no operation name",
durationNoOperationQueryError: errors.New("durationNoOperationError"),
expectedError: "Failed to index duration: failed to Exec query 'select from duration_index': durationNoOperationError",
expectedLogs: []string{
Expand Down