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

[crosslink tool] Implement crosslink tool #8822

Merged
merged 19 commits into from
Apr 4, 2022
Merged

[crosslink tool] Implement crosslink tool #8822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1543062
Add crosslink tool
bryan-aguilar Mar 22, 2022
a96458b
Fix replace statements with crosslink
bryan-aguilar Mar 23, 2022
1134982
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
bryan-aguilar Mar 23, 2022
d9f46ab
Update go.mod from standard crosslink exec
bryan-aguilar Mar 23, 2022
d390338
Update dep
bryan-aguilar Mar 23, 2022
d4a0d0b
Fix bad merge
bryan-aguilar Mar 23, 2022
dee177a
Update changelog
bryan-aguilar Mar 23, 2022
4743afa
Update CHANGELOG.md
bryan-aguilar Mar 23, 2022
71ee8d1
Add makefile newline
bryan-aguilar Mar 23, 2022
cbc1873
Merge branch 'main' into crosslink
Mar 30, 2022
bee779b
Update grammar
bryan-aguilar Mar 30, 2022
c7fc755
Add crosslink tool
bryan-aguilar Mar 22, 2022
a3c3c14
Fix replace statements with crosslink
bryan-aguilar Mar 23, 2022
4a53472
Update CHANGELOG.md
bryan-aguilar Mar 23, 2022
b164a48
Add makefile newline
bryan-aguilar Mar 23, 2022
60b56f3
Update grammar
bryan-aguilar Mar 30, 2022
cc6a848
Merge branch 'main' into crosslink
Apr 1, 2022
3fa4e6f
Merge branch 'crosslink' of https://github.com/bryan-aguilar/opentele…
bryan-aguilar Apr 4, 2022
464f5ab
Merge branch 'main' into crosslink
bryan-aguilar Apr 4, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

- `cmd/mdatagen`: Add resource attributes definition to metadata.yaml and move `pdata.Metrics` creation to the
generated code (#5270)
- Add `make crosslink` target to ensure replace statements are included in `go.mod` for all transitive dependencies within repository (#8822)

### 🛑 Breaking changes 🛑

Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,5 @@ in general try to follow them.
- When implementing exporters try to leverage the exporter helpers from the core repo, see [exporterhelper
package](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/exporterhelper). This will
ensure that the exporter provides [zPages](https://opencensus.io/zpages/) and a standard set of metrics.
- `replace` statements in `go.mod` files can be automatically inserted by running `make crosslink`. For more information
on the `crosslink` tool see the README [here](https://github.com/open-telemetry/opentelemetry-go-build-tools/tree/main/crosslink).
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ install-tools:
cd $(TOOLS_MOD_DIR) && $(GOCMD) install golang.org/x/tools/cmd/goimports
cd $(TOOLS_MOD_DIR) && $(GOCMD) install go.opentelemetry.io/build-tools/multimod
cd $(TOOLS_MOD_DIR) && $(GOCMD) install github.com/jcchavezs/porto/cmd/porto
cd $(TOOLS_MOD_DIR) && $(GOCMD) install go.opentelemetry.io/build-tools/crosslink

.PHONY: run
run:
Expand Down Expand Up @@ -307,3 +308,8 @@ multimod-verify: install-tools
.PHONY: multimod-prerelease
multimod-prerelease: install-tools
multimod prerelease -v ./versions.yaml -m contrib-base

.PHONY: crosslink
crosslink: install-tools
@echo "Executing crosslink"
crosslink --root=$(shell pwd)
4 changes: 2 additions & 2 deletions exporter/awscloudwatchlogsexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ require (
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => ./../../internal/aws/awsutil
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => ../../internal/aws/awsutil

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => ./../../internal/aws/cwlogs
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => ../../internal/aws/cwlogs
6 changes: 3 additions & 3 deletions exporter/awsemfexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ require (
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => ./../../internal/aws/metrics
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => ../../internal/aws/metrics

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => ./../../internal/aws/awsutil
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => ../../internal/aws/awsutil

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => ./../../internal/aws/cwlogs
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => ../../internal/aws/cwlogs

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal

Expand Down
2 changes: 1 addition & 1 deletion exporter/awsprometheusremotewriteexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ require (
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../../exporter/prometheusremotewriteexporter
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../prometheusremotewriteexporter

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal

Expand Down
7 changes: 4 additions & 3 deletions internal/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ require (
github.com/jcchavezs/porto v0.4.0
github.com/jstemmer/go-junit-report v1.0.0
github.com/pavius/impi v0.0.3
github.com/stretchr/objx v0.2.0 // indirect
github.com/tcnksm/ghr v0.14.0
go.opentelemetry.io/build-tools/checkdoc v0.0.0-20220110194441-2a9d5288bd70
go.opentelemetry.io/build-tools/crosslink v0.0.0-20220323195613-c6fe4f9fe445
go.opentelemetry.io/build-tools/issuegenerator v0.0.0-20210920164323-2ceabab23375
go.opentelemetry.io/build-tools/multimod v0.0.0-20220110194441-2a9d5288bd70
go.uber.org/atomic v1.8.0 // indirect
golang.org/x/tools v0.1.10
)

Expand Down Expand Up @@ -126,6 +125,7 @@ require (
github.com/nishanths/exhaustive v0.7.11 // indirect
github.com/nishanths/predeclared v0.2.1 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/otiai10/copy v1.7.0 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
github.com/pkg/errors v0.9.1 // indirect
Expand Down Expand Up @@ -156,6 +156,7 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.10.1 // indirect
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
github.com/stretchr/objx v0.1.1 // indirect
github.com/stretchr/testify v1.7.1 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/sylvia7788/contextcheck v1.0.4 // indirect
Expand All @@ -173,7 +174,7 @@ require (
github.com/yagipy/maintidx v1.0.0 // indirect
github.com/yeya24/promlinter v0.1.1-0.20210918184747-d757024714a1 // indirect
gitlab.com/bosi/decorder v0.2.1 // indirect
go.opentelemetry.io/build-tools v0.0.0-20210719163622-92017e64f35b // indirect
go.opentelemetry.io/build-tools v0.0.0-20220321164008-b8e03aff061a // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
Expand Down
Loading