Merge branch 'main' into garciadiaz-migrate-region-step-1-389070563

GoogleCloudPlatform · Jan 16, 2025 · 9e2e360 · 9e2e360
2 parents 1a64539 + 7778c64
commit 9e2e360
Show file tree

Hide file tree

Showing 44 changed files with 164 additions and 77 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -91,7 +91,7 @@ The top level directory should be the product the sample is for (e.g.
 Sub-directories can be used to keep different groups of samples for the product
 separate.
 
-The package name should match the directory name, as is standard go practice.
+The package name should match the directory name, as is standard Go practice.
 
 Files should be named after the sample in them (e.g. `hello.go`). No need to
 include the product name or "sample" in the filename.

diff --git a/appengine/go11x/tasks/handle_task/Dockerfile b/appengine/go11x/tasks/handle_task/Dockerfile
@@ -1,4 +1,4 @@
-# Use the offical Golang image to create a build artifact.
+# Use the offical Go image to create a build artifact.
 # This is based on Debian and sets the GOPATH to /go.
 # https://hub.docker.com/_/golang
 FROM golang:1.21 as builder

diff --git a/appengine_flexible/go115_and_earlier/websockets/static/index.html b/appengine_flexible/go115_and_earlier/websockets/static/index.html
@@ -16,7 +16,7 @@
 <!doctype html>
 <html>
   <head>
-    <title>Google App Engine Flexible Environment - Golang Websockets Chat</title>
+    <title>Google App Engine Flexible Environment - Go Websockets Chat</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta charset="utf-8">
     <style>

diff --git a/appengine_flexible/static_files/static/main.css b/appengine_flexible/static_files/static/main.css
@@ -12,9 +12,11 @@ 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. */
 
+/* [START gae_flex_example_css_go] */
 /* [START example] */
 body {
   font-family: Verdana, Helvetica, sans-serif;
   background-color: #CCCCFF;
 }
 /* [END example] */
+/* [END gae_flex_example_css_go] */
diff --git a/appengine_flexible/websockets/static/index.html b/appengine_flexible/websockets/static/index.html
@@ -16,7 +16,7 @@
 <!doctype html>
 <html>
   <head>
-    <title>Google App Engine Flexible Environment - Golang Websockets Chat</title>
+    <title>Google App Engine Flexible Environment - Go Websockets Chat</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta charset="utf-8">
     <style>

diff --git a/auth/go.mod b/auth/go.mod
@@ -31,11 +31,11 @@ require (
 	go.opentelemetry.io/otel v1.29.0 // indirect
 	go.opentelemetry.io/otel/metric v1.29.0 // indirect
 	go.opentelemetry.io/otel/trace v1.29.0 // indirect
-	golang.org/x/crypto v0.26.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.6.0 // indirect
 	google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect

diff --git a/auth/go.sum b/auth/go.sum
@@ -103,8 +103,8 @@ go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt3
 go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
-golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -115,26 +115,26 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
 golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
 golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

diff --git a/bigtable/helloworld/main.go b/bigtable/helloworld/main.go
@@ -35,7 +35,7 @@ const (
 	columnName       = "greeting"
 )
 
-var greetings = []string{"Hello World!", "Hello Cloud Bigtable!", "Hello golang!"}
+var greetings = []string{"Hello World!", "Hello Cloud Bigtable!", "Hello Go!"}
 
 // sliceContains reports whether the provided string is present in the given slice of strings.
 func sliceContains(list []string, target string) bool {

diff --git a/cloudsql/mysql/database-sql/Dockerfile b/cloudsql/mysql/database-sql/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Use the offical golang image to create a binary.
+# Use the official Go image to create a binary.
 # This is based on Debian and sets the GOPATH to /go.
 # https://hub.docker.com/_/golang
 FROM golang:1.21-bookworm as builder

diff --git a/cloudsql/postgres/database-sql/Dockerfile b/cloudsql/postgres/database-sql/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Use the offical golang image to create a binary.
+# Use the official Go image to create a binary.
 # This is based on Debian and sets the GOPATH to /go.
 # https://hub.docker.com/_/golang
 FROM golang:1.21-bookworm as builder

diff --git a/cloudsql/sqlserver/database-sql/Dockerfile b/cloudsql/sqlserver/database-sql/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Use the offical golang image to create a binary.
+# Use the official Go image to create a binary.
 # This is based on Debian and sets the GOPATH to /go.
 # https://hub.docker.com/_/golang
 FROM golang:1.21-bookworm as builder

diff --git a/docs/appengine/multitenancy/namespace_user.go b/docs/appengine/multitenancy/namespace_user.go
@@ -14,6 +14,7 @@
 
 package sample
 
+// [START gae_creating_namespaces_on_a_per_user_basis]
 // [START creating_namespaces_on_a_per_user_basis]
 import (
 	"context"
@@ -32,3 +33,4 @@ func namespace(ctx context.Context) context.Context {
 }
 
 // [END creating_namespaces_on_a_per_user_basis]
+// [END gae_creating_namespaces_on_a_per_user_basis]
diff --git a/endpoints/getting-started/k8s/esp_echo_http.yaml b/endpoints/getting-started/k8s/esp_echo_http.yaml
@@ -39,15 +39,12 @@ spec:
         app: esp-echo
     spec:
       # [START endpoints_secret1_yaml_go]
-      # [START endpoints_secret_1]
       volumes:
         - name: service-account-creds
           secret:
             secretName: service-account-creds
-      # [END endpoints_secret_1]
       # [END endpoints_secret1_yaml_go]
       # [START endpoints_service_yaml_go]
-      # [START endpoints_service]
       containers:
         - name: esp
           image: gcr.io/endpoints-release/endpoints-runtime:1
@@ -58,17 +55,14 @@ spec:
             "--rollout_strategy", "managed",
             "--service_account_key", "/etc/nginx/creds/service-account-creds.json",
           ]
-      # [END endpoints_service]
       # [END endpoints_service_yaml_go]
           ports:
             - containerPort: 8080
           # [START endpoints_secret2_yaml_go]
-          # [START endpoints_secret_2]
           volumeMounts:
             - mountPath: /etc/nginx/creds
               name: service-account-creds
               readOnly: true
-          # [END endpoints_secret_2]
           # [END endpoints_secret2_yaml_go]
         - name: echo
           image: gcr.io/endpoints-release/echo:latest

diff --git a/eventarc/audit_storage/Dockerfile b/eventarc/audit_storage/Dockerfile
@@ -14,7 +14,7 @@
 
 # [START eventarc_audit_storage_dockerfile]
 
-# Use the offical golang image to create a binary.
+# Use the official Go image to create a binary.
 # This is based on Debian and sets the GOPATH to /go.
 # https://hub.docker.com/_/golang
 FROM golang:1.21-bookworm as builder

diff --git a/eventarc/generic/Dockerfile b/eventarc/generic/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-# Use the offical golang image to create a binary.
+# Use the official Go image to create a binary.
 # This is based on Debian and sets the GOPATH to /go.
 # https://hub.docker.com/_/golang
 FROM golang:1.21-bookworm as builder

diff --git a/eventarc/pubsub/Dockerfile b/eventarc/pubsub/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Use the offical golang image to create a binary.
+# Use the official Go image to create a binary.
 # This is based on Debian and sets the GOPATH to /go.
 # https://hub.docker.com/_/golang
 FROM golang:1.21-bookworm as builder

diff --git a/getting-started/gopher-run/Dockerfile b/getting-started/gopher-run/Dockerfile
@@ -1,4 +1,4 @@
-# Use the offical Golang image to create a build artifact.
+# Use the offical Go image to create a build artifact.
 # This is based on Debian and sets the GOPATH to /go.
 # https://hub.docker.com/_/golang
 FROM golang:1.21 as builder

diff --git a/jobs/v3/howto/basic_job_sample.go b/jobs/v3/howto/basic_job_sample.go
@@ -25,7 +25,6 @@ import (
 )
 
 // [START job_create_job]
-// [START create_job]
 
 // createJob create a job as given.
 func createJob(w io.Writer, projectID string, jobToCreate *talent.Job) (*talent.Job, error) {
@@ -52,7 +51,6 @@ func createJob(w io.Writer, projectID string, jobToCreate *talent.Job) (*talent.
 	return job, err
 }
 
-// [END create_job]
 // [END job_create_job]
 
 // [START job_get_job]

diff --git a/jobs/v3/howto/location_based_search_sample.go b/jobs/v3/howto/location_based_search_sample.go
@@ -85,7 +85,6 @@ func basicLocationSearch(w io.Writer, projectID, companyName, location string, d
 // [END job_basic_location_search]
 
 // [START job_city_location_search]
-// [START city_location_search]
 
 // cityLocationSearch searches for jobs in the same city of given location.
 func cityLocationSearch(w io.Writer, projectID, companyName, location string) (*talent.SearchJobsResponse, error) {
@@ -143,11 +142,9 @@ func cityLocationSearch(w io.Writer, projectID, companyName, location string) (*
 	return resp, nil
 }
 
-// [END city_location_search]
 // [END job_city_location_search]
 
 // [START job_broadening_location_search]
-// [START broadening_location_search]
 
 // broadeningLocationSearch searches for jobs with a broadening area of given
 // location.
@@ -207,7 +204,6 @@ func broadeningLocationSearch(w io.Writer, projectID, companyName, location stri
 	return resp, nil
 }
 
-// [END broadening_location_search]
 // [END job_broadening_location_search]
 
 // [START job_keyword_location_search]

diff --git a/memorystore/redis/cloud_run_deployment/Dockerfile b/memorystore/redis/cloud_run_deployment/Dockerfile
@@ -14,7 +14,7 @@
 
 # [START memorystore_cloud_run_dockerfile]
 
-# Use the offical golang image to create a binary.
+# Use the official Go image to create a binary.
 # This is based on Debian and sets the GOPATH to /go.
 # https://hub.docker.com/_/golang
 FROM golang:1.21-bookworm as builder

diff --git a/opentelemetry/instrumentation/app/logger.go b/opentelemetry/instrumentation/app/logger.go
@@ -36,7 +36,7 @@ type spanContextLogHandler struct {
 // Handle overrides slog.Handler's Handle method. This adds attributes from the
 // span context to the slog.Record.
 func (t *spanContextLogHandler) Handle(ctx context.Context, record slog.Record) error {
-	// Get the SpanContext from the golang Context.
+	// Get the SpanContext from the context.
 	if s := trace.SpanContextFromContext(ctx); s.IsValid() {
 		// Add trace context attributes following Cloud Logging structured log format described
 		// in https://cloud.google.com/logging/docs/structured-logging#special-payload-fields

diff --git a/opentelemetry/instrumentation/docker-compose.yaml b/opentelemetry/instrumentation/docker-compose.yaml
@@ -7,12 +7,13 @@ services:
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://otelcol:4318
       - OTEL_SERVICE_NAME=otel-quickstart-go
       - OTEL_GO_X_EXEMPLAR=true
+      - OTEL_EXPORTER_OTLP_METRICS_DEFAULT_HISTOGRAM_AGGREGATION=BASE2_EXPONENTIAL_BUCKET_HISTOGRAM
     volumes:
       - logs:/var/log:rw
     depends_on:
       - "otelcol"
   otelcol:
-    image: otel/opentelemetry-collector-contrib:0.105.0
+    image: otel/opentelemetry-collector-contrib:0.115.1
     volumes:
       - ./otel-collector-config.yaml:/etc/otelcol-contrib/config.yaml:ro
       - logs:/var/log:ro

diff --git a/opentelemetry/instrumentation/otel-collector-config.yaml b/opentelemetry/instrumentation/otel-collector-config.yaml
@@ -90,6 +90,14 @@ processors:
     detectors: ["env", "gcp"]
 
 service:
+  telemetry:
+    metrics:
+      readers:
+        - pull:
+            exporter:
+              prometheus:
+                host: '0.0.0.0'
+                port: 8888
   pipelines:
     traces:
       receivers: ["otlp"]

diff --git a/run/custom-metrics/main.go b/run/custom-metrics/main.go
@@ -48,7 +48,7 @@ func main() {
 
 func handler(w http.ResponseWriter, r *http.Request) {
 	counter.Add(context.Background(), 100)
-	fmt.Fprintln(w, "Incremented sidecar_sample_counter metric!")
+	fmt.Fprintln(w, "Incremented sidecar_sample_counter_total metric!")
 }
 
 func setupCounter(ctx context.Context) func(context.Context) error {
@@ -59,7 +59,7 @@ func setupCounter(ctx context.Context) func(context.Context) error {
 	r, err := resource.Merge(
 		resource.Default(),
 		resource.NewWithAttributes(
-			semconv.SchemaURL,
+			resource.Default().SchemaURL(),
 			semconv.ServiceName(serviceName),
 		),
 	)

diff --git a/run/custom-metrics/main_test.go b/run/custom-metrics/main_test.go
@@ -40,7 +40,7 @@ func TestHandler(t *testing.T) {
 	}{
 		{
 			name:     "basic test",
-			expected: "Incremented sidecar_sample_counter metric!\n",
+			expected: "Incremented sidecar_sample_counter_total metric!\n",
 		},
 	}
 

diff --git a/run/grpc-ping/Dockerfile b/run/grpc-ping/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Use the offical golang image to create a binary.
+# Use the official Go image to create a binary.
 # This is based on Debian and sets the GOPATH to /go.
 # https://hub.docker.com/_/golang
 FROM golang:1.21-bookworm as builder

diff --git a/run/grpc-ping/connection.go b/run/grpc-ping/connection.go
@@ -36,7 +36,7 @@ func NewConn(host string, insecure bool) (*grpc.ClientConn, error) {
 		opts = append(opts, grpc.WithInsecure())
 	} else {
 		// Note: On the Windows platform, use of x509.SystemCertPool() requires
-		// go version 1.18 or higher.
+		// Go version 1.18 or higher.
 		systemRoots, err := x509.SystemCertPool()
 		if err != nil {
 			return nil, err

diff --git a/run/grpc-server-streaming/Dockerfile b/run/grpc-server-streaming/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-# Use the offical golang image to create a binary.
+# Use the official Go image to create a binary.
 # This is based on Debian and sets the GOPATH to /go.
 # https://hub.docker.com/_/golang
 FROM golang:1.21-bookworm as builder

diff --git a/run/hello-broken/Dockerfile b/run/hello-broken/Dockerfile
@@ -14,7 +14,7 @@
 
 # [START cloudrun_broken_dockerfile]
 
-# Use the offical golang image to create a binary.
+# Use the official Go image to create a binary.
 # This is based on Debian and sets the GOPATH to /go.
 # https://hub.docker.com/_/golang
 FROM golang:1.21-bookworm as builder

diff --git a/run/helloworld/Dockerfile b/run/helloworld/Dockerfile
@@ -15,7 +15,7 @@
 # [START cloudrun_helloworld_dockerfile]
 # [START run_helloworld_dockerfile]
 
-# Use the offical golang image to create a binary.
+# Use the official Go image to create a binary.
 # This is based on Debian and sets the GOPATH to /go.
 # https://hub.docker.com/_/golang
 FROM golang:1.21-bookworm as builder

diff --git a/run/image-processing/Dockerfile b/run/image-processing/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Use the offical golang image to create a binary.
+# Use the official Go image to create a binary.
 # This is based on Debian and sets the GOPATH to /go.
 # https://hub.docker.com/_/golang
 FROM golang:1.21-bookworm as builder
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ func TestHandler(t *testing.T) { @@
     	}{
     		{
     			name:     "basic test",
-    			expected: "Incremented sidecar_sample_counter metric!\n",
+    			expected: "Incremented sidecar_sample_counter_total metric!\n",
     		},
     	}
@@ Expand Down @@