Skip to content

Commit

Permalink
Show the diff instead of files and fix import
Browse files Browse the repository at this point in the history
  • Loading branch information
songy23 committed Jul 31, 2019
1 parent e1df22a commit 394ea59
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ lint:

.PHONY: goimports
goimports:
@IMPORTSOUT=`$(GOIMPORTS) -l . 2>&1`; \
@IMPORTSOUT=`$(GOIMPORTS) -d . 2>&1`; \
if [ "$$IMPORTSOUT" ]; then \
echo "$(GOIMPORTS) FAILED => fix the import order in the following files:\n"; \
echo "$(GOIMPORTS) FAILED => fix the following goimports errors:\n"; \
echo "$$IMPORTSOUT\n"; \
exit 1; \
else \
Expand Down
2 changes: 1 addition & 1 deletion exporter/zipkinexporter/zipkin.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"github.com/open-telemetry/opentelemetry-service/consumer/consumerdata"
"github.com/open-telemetry/opentelemetry-service/consumer/consumererror"
"github.com/open-telemetry/opentelemetry-service/observability"
"github.com/open-telemetry/opentelemetry-service/translator/trace"
tracetranslator "github.com/open-telemetry/opentelemetry-service/translator/trace"
spandatatranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/spandata"
)

Expand Down

0 comments on commit 394ea59

Please sign in to comment.