Examples: Minor tweaks and improvements

Author: karmi

_examples/cloudfunction/README.md

@@ -23,4 +23,4 @@ Invoke your function over HTTP:
 $ curl https://...cloudfunctions.net/clusterstatus
 ```
 
-See the **[`function.go`](./function.go)** file for implementation.
+See the **[`function.go`](./function.go)** file for implementation and the **[`function_test.go`](./function_test.go)** file for the example of implementing a mock transport for testing.

_examples/customization.go

@@ -21,7 +21,7 @@ import (
 // CountingTransport adds a custom header to the request, logs the information about
 // the request and response, and counts the number of requests to the client.
 //
-// Since it implements the `http.RoundTripper` interface, so it can be passed
+// Since it implements the `http.RoundTripper` interface, it can be passed
 // to the client as a custom HTTP transport implementation.
 //
 type CountingTransport struct {
@@ -57,8 +57,12 @@ func (t *CountingTransport) RoundTrip(req *http.Request) (*http.Response, error)
 func main() {
 	var wg sync.WaitGroup
 
+	// Create the custom transport.
+	//
 	tp := CountingTransport{}
 
+	// Pass the custom transport to the client.
+	//
 	es, _ := elasticsearch.NewClient(
 		elasticsearch.Config{Transport: &tp},
 	)

_examples/encoding/Makefile

@@ -4,14 +4,14 @@ test: clean setup ## Run tests
 	go run gjson.go
 	go run easyjson.go
 
+bench: clean setup # Run benchmarks
+	go test -run=none -bench=. -benchmem benchmark_test.go
+
 setup: ## Install & Setup
 	@go get -u github.com/mailru/easyjson/...
 	go generate ./model
 
 clean: ## Remove artifacts
 	@rm -f model/*_easyjson.go
 
-bench: # Run benchmarks
-	go test -run=none -bench=. -benchmem benchmark_test.go
-
-.PHONY: clean setup test
+.PHONY: clean bench setup test

_examples/instrumentation/Dockerfile

@@ -1,13 +1,13 @@
 # $ docker build --tag elastic/go-elasticsearch-demo-instrumentation .
 # $ docker run -it --network instrumentation_elasticstack --rm elastic/go-elasticsearch-demo-instrumentation
 #
-FROM golang:1.11-alpine
+FROM golang:1-alpine
 
 RUN apk add --no-cache --quiet gcc g++ ca-certificates make curl git jq
 
 WORKDIR /go-elasticsearch-demo-instrumentation
 
-COPY ./go.mod ./
+COPY go.mod .
 RUN go mod download
 
 ENV TERM xterm-256color
@@ -20,6 +20,6 @@ ENV ELASTIC_APM_METRICS_INTERVAL=5s
 ENV ELASTIC_APM_LOG_FILE=stderr
 ENV ELASTIC_APM_LOG_LEVEL=debug
 
-COPY ./apmelasticsearch.go ./opencensus.go ./
+COPY apmelasticsearch.go opencensus.go ./
 
 CMD go run apmelasticsearch.go

_examples/instrumentation/README.md

@@ -17,3 +17,7 @@ The [**`apmelasticsearch.go`**](./apmelasticsearch.go) example demonstrates inst
 Run the example interactively with Docker and inspect the UI in <a href="http://localhost:5601/app/apm#/go-elasticsearch-demo-instrumentation/transactions?_g=(time:(from:now-15m,to:now))">Kibana</a>:
 
     docker-compose --file elasticstack.yml up --build
+
+To destroy the Docker assets for the example, run:
+
+    docker-compose --file elasticstack.yml down --remove-orphans --volumes

_examples/instrumentation/elasticstack.yml

@@ -16,7 +16,7 @@ services:
 
   # --- Elasticsearch ---------------------------------------------------------
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${VERSION:-7.0.0-beta1}
+    image: docker.elastic.co/elasticsearch/elasticsearch:${VERSION:-7.0.0}
     container_name: elasticsearch
     volumes:
       - es_data:/usr/share/elasticsearch/data:delegated
@@ -39,7 +39,7 @@ services:
 
   # --- Kibana ----------------------------------------------------------------
   kibana:
-    image: docker.elastic.co/kibana/kibana:${VERSION:-7.0.0-beta1}
+    image: docker.elastic.co/kibana/kibana:${VERSION:-7.0.0}
     container_name: kibana
     networks: ['elasticstack']
     environment:
@@ -52,7 +52,7 @@ services:
 
   # --- APM Server ------------------------------------------------------------
   apm-server:
-    image: docker.elastic.co/apm/apm-server:${VERSION:-7.0.0-beta1}
+    image: docker.elastic.co/apm/apm-server:${VERSION:-7.0.0}
     container_name: apm_server
     networks: ['elasticstack']
     command: >

_examples/main.go

@@ -114,7 +114,7 @@ func main() {
 	if res.IsError() {
 		var e map[string]interface{}
 		if err := json.NewDecoder(res.Body).Decode(&e); err != nil {
-			log.Fatalf("error parsing the response body: %s", err)
+			log.Fatalf("Error parsing the response body: %s", err)
 		} else {
 			// Print the response status and error information.
 			log.Fatalf("[%s] %s: %s",