diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 0b3b510e5e896..2788b67d2a6e7 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,10 +1,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/tools -go 1.22.1 +go 1.22.5 + +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 @@ -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 @@ -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 diff --git a/internal/tools/go.sum b/internal/tools/go.sum index 4a34b1a08c511..872bcd15767af 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -22,8 +22,8 @@ github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rW github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 h1:/fTUt5vmbkAcMBt4YQiuC23cV0kEsN1MVMNqeOW43cU= github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0/go.mod h1:ONJg5sxcbsdQQ4pOW8TGdTidT2TMAUy/2Xhr8mrYaao= -github.com/Khan/genqlient v0.7.0 h1:GZ1meyRnzcDTK48EjqB8t3bcfYvHArCUUvgOwpz1D4w= -github.com/Khan/genqlient v0.7.0/go.mod h1:HNyy3wZvuYwmW3Y7mkoQLZsa/R5n5yIRajS1kPBvSFM= +github.com/Khan/genqlient v0.8.0 h1:Hd1a+E1CQHYbMEKakIkvBH3zW0PWEeiX6Hp1i2kP2WE= +github.com/Khan/genqlient v0.8.0/go.mod h1:hn70SpYjWteRGvxTwo0kfaqg4wxvndECGkfa1fdDdYI= github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0= github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= @@ -73,8 +73,9 @@ github.com/bkielbasa/cyclop v1.2.3 h1:faIVMIGDIANuGPWH031CZJTi2ymOQBULs9H21HSMa5 github.com/bkielbasa/cyclop v1.2.3/go.mod h1:kHTwA9Q0uZqOADdupvcFJQtp/ksSnytRMe8ztxG8Fuo= github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M= github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k= -github.com/bmatcuk/doublestar/v4 v4.0.2 h1:X0krlUVAVmtr2cRoTqR8aDMrDqnB36ht8wpWTiQ3jsA= github.com/bmatcuk/doublestar/v4 v4.0.2/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= +github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I= +github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/bombsimon/wsl/v4 v4.5.0 h1:iZRsEvDdyhd2La0FVi5k6tYehpOR/R7qIUjmKk7N74A= github.com/bombsimon/wsl/v4 v4.5.0/go.mod h1:NOQ3aLF4nD7N5YPXMruR6ZXDOAqLoM0GEpLwTdvmOSc= github.com/bradleyjkemp/cupaloy/v2 v2.6.0 h1:knToPYa2xtfg42U3I6punFEjaGFKWQRXJwj0JTv4mTs= @@ -242,6 +243,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gordonklaus/ineffassign v0.1.0 h1:y2Gd/9I7MdY1oEIt+n+rowjBNDcLQq3RsH5hwJd0f9s= github.com/gordonklaus/ineffassign v0.1.0/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gostaticanalysis/analysisutil v0.7.1 h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk= github.com/gostaticanalysis/analysisutil v0.7.1/go.mod h1:v21E3hY37WKMGSnbsw2S/ojApNWb6C1//mXO48CXbVc= github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= @@ -540,8 +543,8 @@ github.com/uudashr/gocognit v1.2.0 h1:3BU9aMr1xbhPlvJLSydKwdLN3tEUUrzPSSM8S4hDYR github.com/uudashr/gocognit v1.2.0/go.mod h1:k/DdKPI6XBZO1q7HgoV2juESI2/Ofj9AcHPZhBBdrTU= github.com/uudashr/iface v1.3.0 h1:zwPch0fs9tdh9BmL5kcgSpvnObV+yHjO4JjVBl8IA10= github.com/uudashr/iface v1.3.0/go.mod h1:4QvspiRd3JLPAEXBQ9AiZpLbJlrWWgRChOKDJEuQTdg= -github.com/vektah/gqlparser/v2 v2.5.16 h1:1gcmLTvs3JLKXckwCwlUagVn/IlV2bwqle0vJ0vy5p8= -github.com/vektah/gqlparser/v2 v2.5.16/go.mod h1:1lz1OeCqgQbQepsGxPVywrjdBHW2T08PUS3pJqepRww= +github.com/vektah/gqlparser/v2 v2.5.19 h1:bhCPCX1D4WWzCDvkPl4+TP1N8/kLrWnp43egplt7iSg= +github.com/vektah/gqlparser/v2 v2.5.19/go.mod h1:y7kvl5bBlDeuWIvLtA9849ncyvx6/lj06RsMrEjVy3U= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/xen0n/gosmopolitan v1.2.2 h1:/p2KTnMzwRexIW8GlKawsTWOxn7UHA+jCMF/V8HHtvU= diff --git a/receiver/githubreceiver/go.mod b/receiver/githubreceiver/go.mod index ffc1c0917444b..61c2a4381f7df 100644 --- a/receiver/githubreceiver/go.mod +++ b/receiver/githubreceiver/go.mod @@ -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 diff --git a/receiver/githubreceiver/go.sum b/receiver/githubreceiver/go.sum index 2352cc8573c24..cdc19f737a3cb 100644 --- a/receiver/githubreceiver/go.sum +++ b/receiver/githubreceiver/go.sum @@ -1,5 +1,5 @@ -github.com/Khan/genqlient v0.7.0 h1:GZ1meyRnzcDTK48EjqB8t3bcfYvHArCUUvgOwpz1D4w= -github.com/Khan/genqlient v0.7.0/go.mod h1:HNyy3wZvuYwmW3Y7mkoQLZsa/R5n5yIRajS1kPBvSFM= +github.com/Khan/genqlient v0.8.0 h1:Hd1a+E1CQHYbMEKakIkvBH3zW0PWEeiX6Hp1i2kP2WE= +github.com/Khan/genqlient v0.8.0/go.mod h1:hn70SpYjWteRGvxTwo0kfaqg4wxvndECGkfa1fdDdYI= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= diff --git a/receiver/githubreceiver/internal/scraper/githubscraper/generated_graphql.go b/receiver/githubreceiver/internal/scraper/githubscraper/generated_graphql.go index 6965cbd664223..e891cef0fe97c 100644 --- a/receiver/githubreceiver/internal/scraper/githubscraper/generated_graphql.go +++ b/receiver/githubreceiver/internal/scraper/githubscraper/generated_graphql.go @@ -508,6 +508,12 @@ const ( PullRequestStateMerged PullRequestState = "MERGED" ) +var AllPullRequestState = []PullRequestState{ + PullRequestStateOpen, + PullRequestStateClosed, + PullRequestStateMerged, +} + // SearchNode includes the requested fields of the GraphQL interface SearchResultItem. // // SearchNode is implemented by the following types: @@ -1218,7 +1224,7 @@ func (v *getRepoDataBySearchSearchSearchResultItemConnectionPageInfo) GetEndCurs return v.EndCursor } -// The query or mutation executed by checkLogin. +// The query executed by checkLogin. const checkLogin_Operation = ` query checkLogin ($login: String!) { user(login: $login) { @@ -1234,7 +1240,7 @@ func checkLogin( ctx_ context.Context, client_ graphql.Client, login string, -) (*checkLoginResponse, error) { +) (data_ *checkLoginResponse, err_ error) { req_ := &graphql.Request{ OpName: "checkLogin", Query: checkLogin_Operation, @@ -1242,10 +1248,9 @@ func checkLogin( Login: login, }, } - var err_ error - var data_ checkLoginResponse - resp_ := &graphql.Response{Data: &data_} + data_ = &checkLoginResponse{} + resp_ := &graphql.Response{Data: data_} err_ = client_.MakeRequest( ctx_, @@ -1253,10 +1258,10 @@ func checkLogin( resp_, ) - return &data_, err_ + return data_, err_ } -// The query or mutation executed by getBranchData. +// The query executed by getBranchData. const getBranchData_Operation = ` query getBranchData ($name: String!, $owner: String!, $branchFirst: Int!, $targetBranch: String!, $branchCursor: String) { repository(name: $name, owner: $owner) { @@ -1292,7 +1297,7 @@ func getBranchData( branchFirst int, targetBranch string, branchCursor *string, -) (*getBranchDataResponse, error) { +) (data_ *getBranchDataResponse, err_ error) { req_ := &graphql.Request{ OpName: "getBranchData", Query: getBranchData_Operation, @@ -1304,10 +1309,9 @@ func getBranchData( BranchCursor: branchCursor, }, } - var err_ error - var data_ getBranchDataResponse - resp_ := &graphql.Response{Data: &data_} + data_ = &getBranchDataResponse{} + resp_ := &graphql.Response{Data: data_} err_ = client_.MakeRequest( ctx_, @@ -1315,10 +1319,10 @@ func getBranchData( resp_, ) - return &data_, err_ + return data_, err_ } -// The query or mutation executed by getCommitData. +// The query executed by getCommitData. const getCommitData_Operation = ` query getCommitData ($name: String!, $owner: String!, $branchFirst: Int!, $commitFirst: Int!, $commitCursor: String, $branchName: String!) { repository(name: $name, owner: $owner) { @@ -1356,7 +1360,7 @@ func getCommitData( commitFirst int, commitCursor *string, branchName string, -) (*getCommitDataResponse, error) { +) (data_ *getCommitDataResponse, err_ error) { req_ := &graphql.Request{ OpName: "getCommitData", Query: getCommitData_Operation, @@ -1369,10 +1373,9 @@ func getCommitData( BranchName: branchName, }, } - var err_ error - var data_ getCommitDataResponse - resp_ := &graphql.Response{Data: &data_} + data_ = &getCommitDataResponse{} + resp_ := &graphql.Response{Data: data_} err_ = client_.MakeRequest( ctx_, @@ -1380,10 +1383,10 @@ func getCommitData( resp_, ) - return &data_, err_ + return data_, err_ } -// The query or mutation executed by getPullRequestData. +// The query executed by getPullRequestData. const getPullRequestData_Operation = ` query getPullRequestData ($name: String!, $owner: String!, $prFirst: Int!, $prCursor: String, $prStates: [PullRequestState!]) { repository(name: $name, owner: $owner) { @@ -1429,7 +1432,7 @@ func getPullRequestData( prFirst int, prCursor *string, prStates []PullRequestState, -) (*getPullRequestDataResponse, error) { +) (data_ *getPullRequestDataResponse, err_ error) { req_ := &graphql.Request{ OpName: "getPullRequestData", Query: getPullRequestData_Operation, @@ -1441,10 +1444,9 @@ func getPullRequestData( PrStates: prStates, }, } - var err_ error - var data_ getPullRequestDataResponse - resp_ := &graphql.Response{Data: &data_} + data_ = &getPullRequestDataResponse{} + resp_ := &graphql.Response{Data: data_} err_ = client_.MakeRequest( ctx_, @@ -1452,10 +1454,10 @@ func getPullRequestData( resp_, ) - return &data_, err_ + return data_, err_ } -// The query or mutation executed by getRepoDataBySearch. +// The query executed by getRepoDataBySearch. const getRepoDataBySearch_Operation = ` query getRepoDataBySearch ($searchQuery: String!, $repoCursor: String) { search(query: $searchQuery, type: REPOSITORY, first: 100, after: $repoCursor) { @@ -1484,7 +1486,7 @@ func getRepoDataBySearch( client_ graphql.Client, searchQuery string, repoCursor *string, -) (*getRepoDataBySearchResponse, error) { +) (data_ *getRepoDataBySearchResponse, err_ error) { req_ := &graphql.Request{ OpName: "getRepoDataBySearch", Query: getRepoDataBySearch_Operation, @@ -1493,10 +1495,9 @@ func getRepoDataBySearch( RepoCursor: repoCursor, }, } - var err_ error - var data_ getRepoDataBySearchResponse - resp_ := &graphql.Response{Data: &data_} + data_ = &getRepoDataBySearchResponse{} + resp_ := &graphql.Response{Data: data_} err_ = client_.MakeRequest( ctx_, @@ -1504,5 +1505,5 @@ func getRepoDataBySearch( resp_, ) - return &data_, err_ + return data_, err_ } diff --git a/receiver/githubreceiver/internal/scraper/githubscraper/helpers_test.go b/receiver/githubreceiver/internal/scraper/githubscraper/helpers_test.go index 0b9c92bf03098..6eeefb4c4b349 100644 --- a/receiver/githubreceiver/internal/scraper/githubscraper/helpers_test.go +++ b/receiver/githubreceiver/internal/scraper/githubscraper/helpers_test.go @@ -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, }, } @@ -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()) } }) } @@ -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, }, } @@ -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()) } }) } @@ -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, }, } @@ -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()) } }) } @@ -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 { @@ -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()) } }) }