Skip to content

Commit

Permalink
Responded to Easwar's comments
Browse files Browse the repository at this point in the history
  • Loading branch information
zasweq committed Jun 27, 2024
1 parent fdbd01b commit 291f767
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 18 deletions.
10 changes: 4 additions & 6 deletions examples/features/opentelemetry/client/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,17 @@ 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() {
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())
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}})
Expand Down
20 changes: 8 additions & 12 deletions examples/features/opentelemetry/server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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)
}
}

0 comments on commit 291f767

Please sign in to comment.