Align flags with user guide and c-core

Author: zasweq

examples/features/csm_observability/client/Dockerfile

@@ -17,6 +17,8 @@
 # docker build -t <TAG> -f examples/features/csm_observability/client/Dockerfile .
 FROM golang:1.21-alpine as build
 
+RUN apk --no-cache add curl
+
 # Make a grpc-go directory and copy the repo into it.
 WORKDIR /go/src/grpc-go
 COPY . .
@@ -26,6 +28,7 @@ COPY . .
 RUN cd examples/features/csm_observability/client && go build -tags osusergo,netgo .
 
 FROM alpine
+RUN apk --no-cache add curl
 COPY --from=build /go/src/grpc-go/examples/features/csm_observability/client/client .
 ENV GRPC_GO_LOG_VERBOSITY_LEVEL=99
 ENV GRPC_GO_LOG_SEVERITY_LEVEL="info"

examples/features/csm_observability/client/main.go

@@ -39,22 +39,23 @@ import (
 )
 
 var (
-	addr     = flag.String("server_addr", "xds:///helloworld:50051", "the server address to connect to")
-	promAddr = flag.String("prom_addr", ":9464", "the Prometheus exporter endpoint")
+	target             = flag.String("target", "xds:///helloworld:50051", "the server address to connect to")
+	prometheusEndpoint = flag.String("prometheus_endpoint", ":9464", "the Prometheus exporter endpoint")
 )
 
 func main() {
+	flag.Parse()
 	exporter, err := prometheus.New()
 	if err != nil {
 		log.Fatalf("Failed to start prometheus exporter: %v", err)
 	}
 	provider := metric.NewMeterProvider(metric.WithReader(exporter))
-	go http.ListenAndServe(*promAddr, promhttp.Handler())
+	go http.ListenAndServe(*prometheusEndpoint, promhttp.Handler())
 
 	cleanup := csm.EnableObservability(context.Background(), opentelemetry.Options{MetricsOptions: opentelemetry.MetricsOptions{MeterProvider: provider}})
 	defer cleanup()
 
-	cc, err := grpc.NewClient(*addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	cc, err := grpc.NewClient(*target, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		log.Fatalf("Failed to start NewClient: %v", err)
 	}
@@ -64,7 +65,7 @@ func main() {
 	// Make a RPC every second. This should trigger telemetry to be emitted from
 	// the client and the server.
 	for {
-		ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 		r, err := c.UnaryEcho(ctx, &echo.EchoRequest{Message: "this is examples/opentelemetry"})
 		if err != nil {
 			log.Fatalf("UnaryEcho failed: %v", err)

examples/features/csm_observability/server/Dockerfile

@@ -17,7 +17,7 @@
 # docker build -t <TAG> -f examples/features/csm_observability/server/Dockerfile .
 
 FROM golang:1.21-alpine as build
-
+RUN apk --no-cache add curl
 # Make a grpc-go directory and copy the repo into it.
 WORKDIR /go/src/grpc-go
 COPY . .
@@ -27,6 +27,7 @@ COPY . .
 RUN cd examples/features/csm_observability/server && go build -tags osusergo,netgo .
 
 FROM alpine
+RUN apk --no-cache add curl
 COPY --from=build /go/src/grpc-go/examples/features/csm_observability/server/server .
 ENV GRPC_GO_LOG_VERBOSITY_LEVEL=99
 ENV GRPC_GO_LOG_SEVERITY_LEVEL="info"

examples/features/csm_observability/server/main.go

@@ -37,8 +37,8 @@ import (
 )
 
 var (
-	addr     = flag.String("server_addr", ":50051", "the server address to connect to")
-	promAddr = flag.String("prom_addr", ":9464", "the Prometheus exporter endpoint")
+	port               = flag.String("port", "50051", "the server address to connect to")
+	prometheusEndpoint = flag.String("prometheus_endpoint", ":9464", "the Prometheus exporter endpoint")
 )
 
 type echoServer struct {
@@ -51,24 +51,25 @@ func (s *echoServer) UnaryEcho(ctx context.Context, req *pb.EchoRequest) (*pb.Ec
 }
 
 func main() {
+	flag.Parse()
 	exporter, err := prometheus.New()
 	if err != nil {
 		log.Fatalf("Failed to start prometheus exporter: %v", err)
 	}
 	provider := metric.NewMeterProvider(metric.WithReader(exporter))
-	go http.ListenAndServe(*promAddr, promhttp.Handler())
+	go http.ListenAndServe(*prometheusEndpoint, promhttp.Handler())
 
 	cleanup := csm.EnableObservability(context.Background(), opentelemetry.Options{MetricsOptions: opentelemetry.MetricsOptions{MeterProvider: provider}})
 	defer cleanup()
 
-	lis, err := net.Listen("tcp", *addr)
+	lis, err := net.Listen("tcp", ":"+*port)
 	if err != nil {
 		log.Fatalf("Failed to listen: %v", err)
 	}
 	s := grpc.NewServer()
-	pb.RegisterEchoServer(s, &echoServer{addr: *addr})
+	pb.RegisterEchoServer(s, &echoServer{addr: ":" + *port})
 
-	log.Printf("Serving on %s\n", *addr)
+	log.Printf("Serving on %s\n", *port)
 
 	if err := s.Serve(lis); err != nil {
 		log.Fatalf("Failed to serve: %v", err)