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

Add goimports check and fix import order for all files #209

Merged
merged 4 commits into from
Jul 31, 2019

Conversation

songy23
Copy link
Member

@songy23 songy23 commented Jul 30, 2019

Updates #155.

Copy link
Contributor

@pjanotti pjanotti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@pjanotti
Copy link
Contributor

Missing goimports on the tools to be installed.

Makefile:96: recipe for target 'goimports' failed
make: *** [goimports] Error 1
The command "make travis-ci" exited with 2.

@songy23
Copy link
Member Author

songy23 commented Jul 30, 2019

Seems there's another error on import:
https://travis-ci.org/open-telemetry/opentelemetry-service/builds/565729405?utm_source=github_status&utm_medium=notification

goimports FAILED => fix the import order in the following files:
exporter/zipkinexporter/zipkin.go
Makefile:96: recipe for target 'goimports' failed
make: *** [goimports] Error 1

@songy23
Copy link
Member Author

songy23 commented Jul 31, 2019

Hmmm still the same error, though the exact same check passed on my desktop...

@pjanotti
Copy link
Contributor

Have you updated the go.mod with the correct version of goimports? Likely your desktop is using a different version than travis.

@songy23
Copy link
Member Author

songy23 commented Jul 31, 2019

Finally fixed in 394ea59...

@codecov-io
Copy link

codecov-io commented Jul 31, 2019

Codecov Report

Merging #209 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #209   +/-   ##
=======================================
  Coverage   73.23%   73.23%           
=======================================
  Files         108      108           
  Lines        6329     6329           
=======================================
  Hits         4635     4635           
  Misses       1459     1459           
  Partials      235      235
Impacted Files Coverage Δ
...iver/prometheusreceiver/internal/metricsbuilder.go 100% <ø> (ø) ⬆️
exporter/zipkinexporter/zipkin.go 73.62% <ø> (ø) ⬆️
service/builder/builder.go 0% <ø> (ø) ⬆️
receiver/prometheusreceiver/internal/ocastore.go 71.42% <ø> (ø) ⬆️
...eceiver/prometheusreceiver/internal/transaction.go 96.36% <ø> (ø) ⬆️
receiver/prometheusreceiver/internal/metadata.go 75% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 831d805...03abebe. Read the comment docs.

Copy link
Member

@tigrannajaryan tigrannajaryan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for taking care of this!

.PHONY: goimports
goimports:
@IMPORTSOUT=`$(GOIMPORTS) -d . 2>&1`; \
if [ "$$IMPORTSOUT" ]; then \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this? I remember we had similar checks for govet, which was sometimes failing because it was based on wrong assumption that govet only print output when something is wrong.

Why not simply rely on exit code of goimports?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From reading the code, it seems goimports diff won't set an error exit code:
https://github.com/golang/tools/blob/0133cac3176f225883c5d817146de8633ed07ebc/cmd/goimports/goimports.go#L311-L336

I did an experiment and the result supported it:

$ goimports -d -e .
# some output
$ echo $?
0

Diff will only print output when there's an actual difference so I think it's safe to use.

Makefile Outdated Show resolved Hide resolved
Copy link
Contributor

@pjanotti pjanotti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @songy23

@songy23
Copy link
Member Author

songy23 commented Jul 31, 2019

/cc @rghetia

@songy23
Copy link
Member Author

songy23 commented Jul 31, 2019

Need one more approval for this PR - PTAL.

@pjanotti pjanotti merged commit c7eacad into open-telemetry:master Jul 31, 2019
@songy23 songy23 deleted the tools branch July 31, 2019 18:44
pjanotti pushed a commit that referenced this pull request Aug 7, 2019
* Migrate updates to Prometheus receiver from opencensus-service

* Remove unnecessary configuration for adjusting metrics

* Update exporters README (#210)

Remove stale content, put in place a simple skeleton, and put information for the Zipkin exporter.

* Added Jaeger gRPC receiver (#197)

* Added Jaeger gRPC receiver

Signed-off-by: Juraci Paixão Kröhling <[email protected]>

* Addressed first review round

Signed-off-by: Juraci Paixão Kröhling <[email protected]>

* Changes based on the feedback from the second review

Signed-off-by: Juraci Paixão Kröhling <[email protected]>

* Fixed import order, check for same ip:port on endpoints

Signed-off-by: Juraci Paixão Kröhling <[email protected]>

* Reverted the port-check

Signed-off-by: Juraci Paixão Kröhling <[email protected]>

* Fix README - remove broken links and commands (#211)

Signed-off-by: Hui Kang <[email protected]>

* Refactor opencensus exporter to make it easily extensible (#212)

Refactored oc exporter code to make it easier to import in derived
builds without copying all the code.

Example derived exporter: https://github.com/owais/example-derived-oc-exporter

- Moved internal/compression to root
- Split opencensusexporter factory's `CreateTraceExporter` method into
  - `OCAgentOptions` and `CreateOCAgent`

* Use sha256 instead of md5 in node batcher processor (#202)

MD5 is insecure cryptographic hash functions, and are therefore unsuitable for security applications.

* Add goimports check and fix import order for all files (#209)

* Add goimports check and fix import order for all files

Updates #155.

* Try specifying a version for goimports

* Show the diff instead of files and fix import

* Fix default in Makefile

* Add factory and update config for tail sampling processor (#200)

* Add factory and update config for tail sampling processor

Updates #146

* Move to package processor

* Remove an unnecessary check

* Move CreateDefaultConfig to factory and add unit tests

* Fix test failure

* Remove commented code

* Add misspell check and fix all typos (#214)

* Add misspell check and fix all typos

Updates #155.

* Format

* Include yaml files

* Move tail sampling config to its own package and remove stale configs (#217)

Follow up of #200. Second step of #146.

* Add Observability Vision document (#188)

* Add Observability Vision document

This is a guidance document that developers can consult with when
working on improving own observability of OpenTelemetry Service.

* PR fixes

* Add Zipkin exporter factory (#207)

* Add Zipkin exporter factory

Add the Zipkin exporter configuration factory using the new configuration format. This does not bring many of the settings from the old configuration since they won't be used. In a sub-sequent PR the code of the exporter itself will be changed.

* PR Feedback: add 1 test plus some comments

* Rename endpoint to http-url and related field

* Fix goimports issue

* Remove TODO commented code

Replaced the TODO commented code with an issue.

* Rename the field used to specify destination

* Update README to address reviewer comments.

* Update module dependencies and import order for metricfamily

* Improve OC Receiver Documentation (#203)

* First round of receiver and opencensus receiver documentation.

* Undo go mod/sum changes

* Address initial set of comments.

* Address next set of comments.

* Address next set of comments.

* Fix use of server instead of receiver in comment and explain settings can be mix and matched.

* Merged master and fixed mispell error caugh with new tools

* Add static check and fix all errors (#218)

* Add static check

Fixes #155.

* Fix most staticcheck errors

* More fixes

* Fix id_batcher

* Rename exporterhelp parameter (#220)

The paramater was named exportFormat but it actually used as the exporter name.

* Fix build: lower casing error message (#224)

* Add jaeger grpc exporter (#219)

* Add Jaeger gRPC exporter

Adds a Jaeger gRPC exporter.

* Update exporters/README.md

* Fixes on the exporter/README.md

* Add doc.go with package description.

* Fix import order on config_test.go

* Migrate updates to Prometheus receiver from opencensus-service

* Remove unnecessary configuration for adjusting metrics

* Update README to address reviewer comments.

* Update module dependencies and import order for metricfamily

* Fix goimports

* Fix staticcheck issues
hughesjj pushed a commit to hughesjj/opentelemetry-collector that referenced this pull request Apr 27, 2023
Troels51 pushed a commit to Troels51/opentelemetry-collector that referenced this pull request Jul 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants