Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/rest-services/golang/calendar/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ func realMain() error {
logger.Error("meterProvider Shutdown failed", zap.Error(err))
}
}()
server, err := NewServer(name, meterProvider)
server, err := NewServer(name, meterProvider, tp)
if err != nil {
logger.Fatal("can't create new server", zap.Error(err))
return err
Expand Down
23 changes: 19 additions & 4 deletions apps/rest-services/golang/calendar/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ import (
"sync/atomic"
"time"

"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap"
)

type Server struct {
name string
tracer trace.Tracer
rnd *rand.Rand
apiCounter metric.Int64Counter
latency metric.Float64Histogram
Expand All @@ -25,7 +27,8 @@ type Server struct {
activeUsersCount *atomic.Int64
}

func NewServer(name string, mp metric.MeterProvider) (*Server, error) {
func NewServer(name string, mp metric.MeterProvider, tp trace.TracerProvider) (*Server, error) {
tracer := tp.Tracer(name)
meter := mp.Meter(name)
apiCounter, err := meter.Int64Counter(
name+".api.counter",
Expand Down Expand Up @@ -78,6 +81,7 @@ func NewServer(name string, mp metric.MeterProvider) (*Server, error) {

return &Server{
name: name,
tracer: tracer,
rnd: rand.New(rand.NewSource(time.Now().Unix())),
apiCounter: apiCounter,
latency: histogram,
Expand All @@ -87,13 +91,24 @@ func NewServer(name string, mp metric.MeterProvider) (*Server, error) {
}, nil
}

func getDate(ctx context.Context) string {
func (s *Server) getDate(ctx context.Context) string {
_, span := s.tracer.Start(
ctx,
"getDate",
trace.WithSpanKind(trace.SpanKindClient),
trace.WithAttributes(attribute.String("peer.service", "random-date-service")),
)
defer span.End()
logger.Info(
"getting random date",
zap.String("dd.trace_id", span.SpanContext().TraceID().String()),
zap.String("dd.span_id", span.SpanContext().SpanID().String()),
)
dayOffset := rand.Intn(365)
startDate := time.Date(2023, time.January, 1, 0, 0, 0, 0, time.Local)
day := startDate.AddDate(0, 0, dayOffset)

d := day.Format(time.DateOnly)
span := trace.SpanFromContext(ctx)
logger.Info(
"random date",
zap.String("date", d),
Expand Down Expand Up @@ -136,7 +151,7 @@ func (s *Server) calendarHandler(w http.ResponseWriter, r *http.Request) {
logger.Error("encoding resp", zap.Error(err))
}
case <-timer.C:
dt := getDate(ctx)
dt := s.getDate(ctx)
resp := response{
Date: dt,
}
Expand Down
Loading