Upgrade to latest Goa examples and Clue for observability (#165)

* Upgrade plugins to use latest Goa and Clue

* Fix Makefiles to use relative paths

.gitignore

@@ -8,6 +8,8 @@
 /goakit/examples/fetcher/archiver/cmd/archivercli/archivercli
 /goakit/examples/calc/cmd/calccli/calccli
 /goakit/examples/calc/cmd/calccli/calccli
+/zaplogger/examples/calc/calc
+/zaplogger/examples/calc/calc-cli
 
 *.swp
 .vscode/*

Makefile

@@ -3,7 +3,6 @@
 # Makefile for goa v3 plugins
 
 GOOS=$(shell go env GOOS)
-GOPATH=$(shell go env GOPATH)
 GOA:=$(shell goa version 2> /dev/null)
 
 # Only list test and build dependencies
@@ -38,7 +37,6 @@ endif
 ifeq ($(GOOS),windows)
 	PROTOC=protoc-$(PROTOC_VERSION)-win32
 	PROTOC_EXEC="$(PROTOC)\bin\protoc.exe"
-	GOPATH:=$(subst \,/,$(GOPATH))
 endif
 
 all: check-goa gen tidy lint test

cors/Makefile

@@ -7,21 +7,21 @@
 # - "example" generates the example files for the example services
 
 # include common Makefile content for plugins
-GOPATH=$(shell go env GOPATH)
+PLUGIN_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 include ../plugins.mk
 
 gen:
-	@goa gen goa.design/plugins/v3/cors/examples/calc/design -o "$(GOPATH)/src/goa.design/plugins/cors/examples/calc" && \
+	@goa gen goa.design/plugins/v3/cors/examples/calc/design -o "$(PLUGIN_DIR)/examples/calc" && \
 	make example
 
 example:
-	@rm -rf "$(GOPATH)/src/goa.design/plugins/cors/examples/calc/cmd"
-	goa example goa.design/plugins/v3/cors/examples/calc/design -o "$(GOPATH)/src/goa.design/plugins/cors/examples/calc"
+	@rm -rf "$(PLUGIN_DIR)/examples/calc/cmd"
+	goa example goa.design/plugins/v3/cors/examples/calc/design -o "$(PLUGIN_DIR)/examples/calc"
 
 build-examples:
-	@cd "$(GOPATH)/src/goa.design/plugins/cors/examples/calc" && \
+	@cd "$(PLUGIN_DIR)/examples/calc" && \
 		go build ./cmd/calc && go build ./cmd/calc-cli
 
 clean:
-	@cd "$(GOPATH)/src/goa.design/plugins/cors/examples/calc" && \
+	@cd "$(PLUGIN_DIR)/examples/calc" && \
 		rm -f calc calc-cli

cors/examples/calc/cmd/calc/http.go

@@ -60,6 +60,7 @@ func handleHTTPServer(ctx context.Context, u *url.URL, calcEndpoints *calc.Endpo
 		// Log query and response bodies if debug logs are enabled.
 		handler = debug.HTTP()(handler)
 	}
+	handler = log.HTTP(ctx)(handler)
 
 	// Start HTTP server using default configuration, change the code to
 	// configure the server as required by your service.

cors/examples/calc/cmd/calc/main.go

@@ -103,7 +103,7 @@ func main() {
 		}
 
 	default:
-		log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: localhost)\n", *hostF))
+		log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: localhost)", *hostF))
 	}
 
 	// Wait for signal.

docs/Makefile

@@ -6,22 +6,22 @@
 # - "gen" generates the goa files for the example services
 
 # include common Makefile content for plugins
-GOPATH=$(shell go env GOPATH)
+PLUGIN_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 include ../plugins.mk
 
 gen:
 	@rm -f examples/calc/gen/docs.json
-	goa gen goa.design/plugins/v3/docs/examples/calc/design -o "$(GOPATH)/src/goa.design/plugins/docs/examples/calc" && \
+	goa gen goa.design/plugins/v3/docs/examples/calc/design -o "$(PLUGIN_DIR)/examples/calc" && \
 	make example
 
 example:
-	@ rm -rf "$(GOPATH)/src/goa.design/plugins/docs/examples/calc/cmd" && \
-	goa example goa.design/plugins/v3/docs/examples/calc/design -o "$(GOPATH)/src/goa.design/plugins/docs/examples/calc"
+	@ rm -rf "$(PLUGIN_DIR)/examples/calc/cmd" && \
+	goa example goa.design/plugins/v3/docs/examples/calc/design -o "$(PLUGIN_DIR)/examples/calc"
 
 build-examples:
-	@cd "$(GOPATH)/src/goa.design/plugins/docs/examples/calc" && \
+	@cd "$(PLUGIN_DIR)/examples/calc" && \
 		go build ./cmd/calc && go build ./cmd/calc-cli
 
 clean:
-	@cd "$(GOPATH)/src/goa.design/plugins/docs/examples/calc" && \
+	@cd "$(PLUGIN_DIR)/examples/calc" && \
 		rm -f calc calc-cli

docs/examples/calc/cmd/calc/http.go

@@ -62,6 +62,7 @@ func handleHTTPServer(ctx context.Context, u *url.URL, calcEndpoints *calc.Endpo
 		// Log query and response bodies if debug logs are enabled.
 		handler = debug.HTTP()(handler)
 	}
+	handler = log.HTTP(ctx)(handler)
 
 	// Start HTTP server using default configuration, change the code to
 	// configure the server as required by your service.

docs/examples/calc/cmd/calc/main.go

@@ -103,7 +103,7 @@ func main() {
 		}
 
 	default:
-		log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: localhost)\n", *hostF))
+		log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: localhost)", *hostF))
 	}
 
 	// Wait for signal.