Regenerate HotROD proto

Makefile

@@ -26,13 +26,10 @@ endif
 
 # All .go files that are not auto-generated and should be auto-formatted and linted.
 ALL_SRC = $(shell find . -name '*.go' \
-				   -not -name 'doc.go' \
 				   -not -name '_*' \
 				   -not -name '.*' \
 				   -not -name 'mocks*' \
-				   -not -name 'model.pb.go' \
-				   -not -name 'model_test.pb.go' \
-				   -not -name 'storage_test.pb.go' \
+				   -not -name '*.pb.go' \
 				   -not -path './vendor/*' \
 				   -not -path '*/mocks/*' \
 				   -not -path '*/*-gen/*' \
@@ -166,18 +163,20 @@ goleak:
 
 .PHONY: fmt
 fmt:
-	./scripts/import-order-cleanup.sh inplace
+	@echo Running import-order-cleanup on ALL_SRC ...
+	@./scripts/import-order-cleanup.py -o inplace -t $(ALL_SRC)
 	@echo Running gofmt on ALL_SRC ...
 	@$(GOFMT) -e -s -l -w $(ALL_SRC)
 	@echo Running gofumpt on ALL_SRC ...
 	@$(GOFUMPT) -e -l -w $(ALL_SRC)
-	./scripts/updateLicenses.sh
+	@echo Running updateLicense.py on ALL_SRC ...
+	@./scripts/updateLicense.py $(ALL_SRC)
 
 .PHONY: lint
 lint: goleak
 	golangci-lint -v run
-	./scripts/updateLicenses.sh > $(FMT_LOG)
-	./scripts/import-order-cleanup.sh stdout > $(IMPORT_LOG)
+	@./scripts/updateLicense.py $(ALL_SRC) > $(FMT_LOG)
+	@./scripts/import-order-cleanup.py -o stdout -t $(ALL_SRC) > $(IMPORT_LOG)
 	@[ ! -s "$(FMT_LOG)" -a ! -s "$(IMPORT_LOG)" ] || (echo "License check or import ordering failures, run 'make fmt'" | cat - $(FMT_LOG) $(IMPORT_LOG) && false)
 	./scripts/check-semconv-version.sh
 	./scripts/check-go-version.sh

Makefile.Protobuf.mk

@@ -79,7 +79,14 @@ endef
 
 # TODO add proto-hotrod to the list after regenerating its file (may need linter tweaking)
 .PHONY: proto
-proto: proto-model proto-api-v2 proto-storage-v1 proto-zipkin proto-openmetrics proto-otel proto-api-v3
+proto: proto-model \
+	proto-api-v2 \
+	proto-storage-v1 \
+	proto-hotrod \
+	proto-zipkin \
+	proto-openmetrics \
+	proto-otel \
+	proto-api-v3
 
 .PHONY: proto-model
 proto-model:

model/converter/empty_test.go

@@ -0,0 +1,30 @@
+// Copyright (c) 2020 The Jaeger Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package converter
+
+import (
+	"testing"
+
+	"go.uber.org/goleak"
+)
+
+func TestDummy(t *testing.T) {
+	// This is a dummy test in the root package.
+	// Without it `go test -v .` prints "testing: warning: no tests to run".
+}
+
+func TestMain(m *testing.M) {
+	goleak.VerifyTestMain(m)
+}

model/converter/thrift/empty_test.go

@@ -0,0 +1,30 @@
+// Copyright (c) 2020 The Jaeger Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package thrift
+
+import (
+	"testing"
+
+	"go.uber.org/goleak"
+)
+
+func TestDummy(t *testing.T) {
+	// This is a dummy test in the root package.
+	// Without it `go test -v .` prints "testing: warning: no tests to run".
+}
+
+func TestMain(m *testing.M) {
+	goleak.VerifyTestMain(m)
+}

pkg/empty_test.go

@@ -0,0 +1,30 @@
+// Copyright (c) 2020 The Jaeger Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pkg
+
+import (
+	"testing"
+
+	"go.uber.org/goleak"
+)
+
+func TestDummy(t *testing.T) {
+	// This is a dummy test in the root package.
+	// Without it `go test -v .` prints "testing: warning: no tests to run".
+}
+
+func TestMain(m *testing.M) {
+	goleak.VerifyTestMain(m)
+}