Skip to content

[chore] update genqlient to v0.8.0 and fix broken tests #37700

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

Merged
andrzej-stencel merged 4 commits into from
Feb 10, 2025
Merged

[chore] update genqlient to v0.8.0 and fix broken tests #37700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63a6aee
[chore] update genqlient to v0.8.0 and fix broken tests
adrielp Feb 5, 2025
1d00789
[chore] try manually setting to 1.22.0
adrielp Feb 5, 2025
8ca206f
[chore] tidy with go version 1.22.0
adrielp Feb 5, 2025
9bc61eb
Merge branch 'main' into khan-upgrade
adrielp Feb 9, 2025
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
10 changes: 6 additions & 4 deletions internal/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/internal/tools

go 1.22.1
go 1.22.5
Comment thread
adrielp marked this conversation as resolved.

toolchain go1.22.12

require (
github.com/Antonboom/testifylint v1.5.2
github.com/Khan/genqlient v0.7.0
github.com/Khan/genqlient v0.8.0
github.com/client9/misspell v0.3.4
github.com/daixiang0/gci v0.13.5
github.com/golangci/golangci-lint v1.63.4
Expand Down Expand Up @@ -56,7 +58,7 @@ require (
github.com/bitfield/gotestdox v0.2.2 // indirect
github.com/bkielbasa/cyclop v1.2.3 // indirect
github.com/blizzy78/varnamelen v0.8.0 // indirect
github.com/bmatcuk/doublestar/v4 v4.0.2 // indirect
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
github.com/bombsimon/wsl/v4 v4.5.0 // indirect
github.com/breml/bidichk v0.3.2 // indirect
github.com/breml/errchkjson v0.4.0 // indirect
Expand Down Expand Up @@ -226,7 +228,7 @@ require (
github.com/ultraware/whitespace v0.2.0 // indirect
github.com/uudashr/gocognit v1.2.0 // indirect
github.com/uudashr/iface v1.3.0 // indirect
github.com/vektah/gqlparser/v2 v2.5.16 // indirect
github.com/vektah/gqlparser/v2 v2.5.19 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xen0n/gosmopolitan v1.2.2 // indirect
github.com/yagipy/maintidx v1.0.0 // indirect
Expand Down
13 changes: 8 additions & 5 deletions internal/tools/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion receiver/githubreceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/github
go 1.22.8

require (
github.com/Khan/genqlient v0.7.0
github.com/Khan/genqlient v0.8.0
github.com/google/go-cmp v0.6.0
github.com/google/go-github/v68 v68.0.0
github.com/gorilla/mux v1.8.1
Expand Down
4 changes: 2 additions & 2 deletions receiver/githubreceiver/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 31 additions & 30 deletions receiver/githubreceiver/internal/scraper/githubscraper/generated_graphql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions receiver/githubreceiver/internal/scraper/githubscraper/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ func TestGetPullRequests(t *testing.T) {
responseCode: http.StatusNotFound,
},
}),
expectedErr: errors.New("returned error 404 Not Found: "),
expectedErr: errors.New("returned error 404"),
expectedPrCount: 0,
},
}
Expand All @@ -457,7 +457,7 @@ func TestGetPullRequests(t *testing.T) {
if tc.expectedErr == nil {
assert.NoError(t, err)
} else {
assert.EqualError(t, err, tc.expectedErr.Error())
assert.ErrorContains(t, err, tc.expectedErr.Error())
}
})
}
Expand Down Expand Up @@ -540,7 +540,7 @@ func TestGetRepos(t *testing.T) {
responseCode: http.StatusNotFound,
},
}),
expectedErr: errors.New("returned error 404 Not Found: "),
expectedErr: errors.New("returned error 404"),
expected: 0,
},
}
Expand All @@ -560,7 +560,7 @@ func TestGetRepos(t *testing.T) {
if tc.expectedErr == nil {
assert.NoError(t, err)
} else {
assert.EqualError(t, err, tc.expectedErr.Error())
assert.ErrorContains(t, err, tc.expectedErr.Error())
}
})
}
Expand Down Expand Up @@ -643,7 +643,7 @@ func TestGetBranches(t *testing.T) {
responseCode: http.StatusNotFound,
},
}),
expectedErr: errors.New("returned error 404 Not Found: "),
expectedErr: errors.New("returned error 404"),
expected: 0,
},
}
Expand All @@ -664,7 +664,7 @@ func TestGetBranches(t *testing.T) {
if tc.expectedErr == nil {
assert.NoError(t, err)
} else {
assert.EqualError(t, err, tc.expectedErr.Error())
assert.ErrorContains(t, err, tc.expectedErr.Error())
}
})
}
Expand Down Expand Up @@ -882,7 +882,7 @@ func TestEvalCommits(t *testing.T) {
expectedAge: 0,
expectedAdditions: 0,
expectedDeletions: 0,
expectedErr: errors.New("returned error 404 Not Found: "),
expectedErr: errors.New("returned error 404"),
},
}
for _, tc := range testCases {
Expand All @@ -907,7 +907,7 @@ func TestEvalCommits(t *testing.T) {
if tc.expectedErr == nil {
assert.NoError(t, err)
} else {
assert.EqualError(t, err, tc.expectedErr.Error())
assert.ErrorContains(t, err, tc.expectedErr.Error())
}
})
}
Expand Down