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.

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

[receiver/gitproviderreceiver] add repo branch and contrib count metrics #28885

Merged
merged 36 commits into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
129665a
feat: add count metrics and update docs with test code
adrielp Oct 27, 2023
660a898
feat: add genqlient to gitprovider receiver, tools, and generate
adrielp Oct 27, 2023
dcefcc5
chore: add genqlient to makefile and run
adrielp Oct 28, 2023
009bd49
[receiver/gitproviderreceiver] add repo branch and contrib count metrics
adrielp Nov 3, 2023
8e180ac
chore: reset tools to main until feedback for tool install
adrielp Nov 3, 2023
0699f41
docs: update readme example
adrielp Nov 3, 2023
33d850a
test: add factor test for scraper and update format
adrielp Nov 3, 2023
4859a5a
chore: add changelog yaml
adrielp Nov 3, 2023
8eb6f7e
feat: add contrib count metric, address comments, and fix tests
adrielp Nov 8, 2023
07daa69
chore(ci): update generate command to include genqlient
adrielp Nov 8, 2023
1842d1e
chore: merge latest from main
adrielp Nov 8, 2023
1999577
chore: cleanup commented out section and add resource attributes
adrielp Nov 8, 2023
c0b4a8f
chore: merge latest from main and fix conflicts
adrielp Nov 8, 2023
1bc8e1b
chore: run updates and formatting
adrielp Nov 8, 2023
ff4137b
Merge branch 'main' into gitprovider-impl-2
adrielp Nov 8, 2023
4cb5aeb
Merge branch 'main' into gitprovider-impl-2
adrielp Nov 9, 2023
11d6606
Merge branch 'main' into gitprovider-impl-2
adrielp Nov 10, 2023
67cf50e
Merge branch 'main' into gitprovider-impl-2
adrielp Nov 10, 2023
f43ba58
Merge branch 'main' into gitprovider-impl-2
adrielp Nov 10, 2023
d4b1f0a
chore: update createClients to use const for graph url
adrielp Nov 15, 2023
06cebb9
chore: remove checkOwnerTypeValid redundent functionality
adrielp Nov 15, 2023
1993384
refactor: cleanup redundent functions and returned values
adrielp Nov 15, 2023
418ad57
chore: use wait groups in go routine and fix login function
adrielp Nov 16, 2023
bc3b413
chore: convert chain to switch statement
adrielp Nov 16, 2023
bf160ff
Merge remote-tracking branch 'origin/main' into gitprovider-impl-2
adrielp Nov 16, 2023
f24a636
chore: run tidy after merge from main
adrielp Nov 16, 2023
7dfc7d3
Merge branch 'main' into gitprovider-impl-2
adrielp Nov 16, 2023
c0456f1
chore: change logger debug formatting for search query
adrielp Nov 16, 2023
52c0c7b
chore: update generate command to leverage tools based on feedback and
adrielp Nov 16, 2023
b716fd6
Merge branch 'main' into gitprovider-impl-2
adrielp Nov 16, 2023
492b921
Merge branch 'main' into gitprovider-impl-2
adrielp Nov 16, 2023
d109466
chore: fmt tools.go as it's not picked up by workflow
adrielp Nov 16, 2023
1b1cee8
chore: update changelog per suggestion
adrielp Nov 22, 2023
b0d8d87
chore: revert formatting on mgo.mod in tools
adrielp Nov 22, 2023
3461be0
Merge branch 'main' into gitprovider-impl-2
adrielp Nov 22, 2023
946f3d7
chore: run make crosslink
adrielp Nov 22, 2023
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
27 changes: 27 additions & 0 deletions .chloggen/gitprovider-impl-2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: new_component

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: gitproviderreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: add repo, branch, and contributor count metrics as second implementation pull request
adrielp marked this conversation as resolved.
Show resolved Hide resolved

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [22028]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ docker-telemetrygen:
COMPONENT=telemetrygen $(MAKE) docker-component

.PHONY: generate
generate:
generate: install-tools
cd cmd/mdatagen && $(GOCMD) install .
$(MAKE) for-all CMD="$(GOCMD) generate ./..."

Expand Down
47 changes: 26 additions & 21 deletions internal/tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,20 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/tools

go 1.20

// openshift removed all tags from their repo, use the pseudoversion from the release-3.9 branch HEAD
replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37

// It appears that the v0.2.0 tag was modified. Replacing with v0.2.1
replace github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1

retract (
adrielp marked this conversation as resolved.
Show resolved Hide resolved
v0.76.2
v0.76.1
v0.65.0
)

require (
github.com/Khan/genqlient v0.6.0
github.com/client9/misspell v0.3.4
github.com/daixiang0/gci v0.11.2
github.com/golangci/golangci-lint v1.55.2
Expand Down Expand Up @@ -36,7 +49,10 @@ require (
github.com/OpenPeeDeeP/depguard/v2 v2.1.0 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/agnivade/levenshtein v1.1.1 // indirect
github.com/alecthomas/go-check-sumtype v0.1.3 // indirect
github.com/alexflint/go-arg v1.4.2 // indirect
github.com/alexflint/go-scalar v1.0.0 // indirect
github.com/alexkohler/nakedret/v2 v2.0.2 // indirect
github.com/alexkohler/prealloc v1.0.0 // indirect
github.com/alingse/asasalint v0.0.11 // indirect
Expand All @@ -45,15 +61,15 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/bkielbasa/cyclop v1.2.1 // indirect
github.com/blizzy78/varnamelen v0.8.0 // indirect
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
github.com/bmatcuk/doublestar/v4 v4.0.2 // indirect
github.com/bombsimon/wsl/v3 v3.4.0 // indirect
github.com/breml/bidichk v0.2.7 // indirect
github.com/breml/errchkjson v0.3.6 // indirect
github.com/butuzov/ireturn v0.2.2 // indirect
github.com/butuzov/mirror v1.1.0 // indirect
github.com/catenacyber/perfsprint v0.2.0 // indirect
github.com/ccojocar/zxcvbn-go v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/charithe/durationcheck v0.0.10 // indirect
github.com/chavacava/garif v0.1.0 // indirect
github.com/cloudflare/circl v1.3.3 // indirect
Expand Down Expand Up @@ -97,7 +113,7 @@ require (
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-github v17.0.0+incompatible // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 // indirect
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
github.com/gostaticanalysis/comment v1.4.2 // indirect
Expand Down Expand Up @@ -140,7 +156,7 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
github.com/mgechev/revive v1.3.4 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
Expand All @@ -157,10 +173,10 @@ require (
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/polyfloyd/go-errorlint v1.4.5 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/prometheus/client_golang v1.12.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/quasilyte/go-ruleguard v0.4.0 // indirect
github.com/quasilyte/gogrep v0.5.0 // indirect
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
Expand Down Expand Up @@ -201,6 +217,7 @@ require (
github.com/ultraware/funlen v0.1.0 // indirect
github.com/ultraware/whitespace v0.0.5 // indirect
github.com/uudashr/gocognit v1.1.2 // indirect
github.com/vektah/gqlparser/v2 v2.5.1 // 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 All @@ -217,7 +234,7 @@ require (
golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/oauth2 v0.14.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.14.0 // indirect
Expand All @@ -233,15 +250,3 @@ require (
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
mvdan.cc/unparam v0.0.0-20230312165513-e84e2d14e3b8 // indirect
)

adrielp marked this conversation as resolved.
Show resolved Hide resolved
// openshift removed all tags from their repo, use the pseudoversion from the release-3.9 branch HEAD
replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37

// It appears that the v0.2.0 tag was modified. Replacing with v0.2.1
replace github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1

retract (
v0.76.2
v0.76.1
v0.65.0
)
Loading