From 291f767f72a0a6ba1619297560dd8d81637c4ef8 Mon Sep 17 00:00:00 2001 From: Zach Reyes Date: Thu, 27 Jun 2024 16:30:48 -0400 Subject: [PATCH] Responded to Easwar's comments --- .../features/opentelemetry/client/main.go | 10 ++++------ .../features/opentelemetry/server/main.go | 20 ++++++++----------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/examples/features/opentelemetry/client/main.go b/examples/features/opentelemetry/client/main.go index db319f97795..4bc3d5afb12 100644 --- a/examples/features/opentelemetry/client/main.go +++ b/examples/features/opentelemetry/client/main.go @@ -37,8 +37,8 @@ import ( ) var ( - addr = flag.String("addr", ":50051", "the server address to connect to") - promAddr = flag.String("promAddr", ":9465", "the Prometheus exporter endpoint") + addr = flag.String("addr", ":50051", "the server address to connect to") + prometheusEndpoint = flag.String("prometheus_endpoint", ":9465", "the Prometheus exporter endpoint") ) func main() { @@ -46,10 +46,8 @@ func main() { if err != nil { log.Fatalf("Failed to start prometheus exporter: %v", err) } - provider := metric.NewMeterProvider( - metric.WithReader(exporter), - ) - go http.ListenAndServe(*promAddr, promhttp.Handler()) + provider := metric.NewMeterProvider(metric.WithReader(exporter)) + go http.ListenAndServe(*prometheusEndpoint, promhttp.Handler()) ctx := context.Background() do := opentelemetry.DialOption(opentelemetry.Options{MetricsOptions: opentelemetry.MetricsOptions{MeterProvider: provider}}) diff --git a/examples/features/opentelemetry/server/main.go b/examples/features/opentelemetry/server/main.go index 2ee1216db71..ae1c9105220 100644 --- a/examples/features/opentelemetry/server/main.go +++ b/examples/features/opentelemetry/server/main.go @@ -36,8 +36,8 @@ import ( ) var ( - addr = flag.String("addr", ":50051", "the server address to connect to") - promAddr = flag.String("promAddr", ":9464", "the Prometheus exporter endpoint") + addr = flag.String("addr", ":50051", "the server address to connect to") + prometheusEndpoint = flag.String("prometheus_endpoint", ":9464", "the Prometheus exporter endpoint") ) type echoServer struct { @@ -54,25 +54,21 @@ func main() { if err != nil { log.Fatalf("Failed to start prometheus exporter: %v", err) } - provider := metric.NewMeterProvider( - metric.WithReader(exporter), - ) - go http.ListenAndServe(*promAddr, promhttp.Handler()) + provider := metric.NewMeterProvider(metric.WithReader(exporter)) + go http.ListenAndServe(*prometheusEndpoint, promhttp.Handler()) so := opentelemetry.ServerOption(opentelemetry.Options{MetricsOptions: opentelemetry.MetricsOptions{MeterProvider: provider}}) lis, err := net.Listen("tcp", *addr) if err != nil { - log.Fatalf("failed to listen: %v", err) + log.Fatalf("Failed to listen: %v", err) } s := grpc.NewServer(so) - pb.RegisterEchoServer(s, &echoServer{ - addr: *addr, - }) + pb.RegisterEchoServer(s, &echoServer{addr: *addr}) - log.Printf("serving on %s\n", *addr) + log.Printf("Serving on %s\n", *addr) if err := s.Serve(lis); err != nil { - log.Fatalf("failed to serve: %v", err) + log.Fatalf("Failed to serve: %v", err) } }