ntppool/data-api
Private
Public Access
1
0
Fork 0
Code Activity

Add tracing

Browse Source
This commit is contained in:
Ask Bjørn Hansen
2023-10-14 04:01:43 -07:00
parent 42dccd28a7
commit f9b521664d
13 changed files with 407 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/dnsanswers.go
View File

@@ -50,7 +50,7 @@ func (srv *Server) dnsAnswers(c echo.Context) error {
queryGroup.Go(func() error {
var err error
q := ntpdb.New(srv.db)
q := ntpdb.NewWrappedQuerier(ntpdb.New(srv.db))
zoneStats, err = q.GetZoneStatsV2(ctx, ip.String())
if err != nil {
slog.Error("GetZoneStatsV2", "err", err)

12
server/server.go
View File

@@ -16,6 +16,7 @@ import (
"go.ntppool.org/common/health"
"go.ntppool.org/common/logger"
"go.ntppool.org/common/metricsserver"
"go.ntppool.org/common/tracing"
chdb "go.ntppool.org/data-api/chdb"
"go.ntppool.org/data-api/ntpdb"
@@ -48,12 +49,15 @@ func NewServer(ctx context.Context, configFile string) (*Server, error) {
metrics: metricsserver.New(),
}
err = srv.initTracer()
err = tracing.InitTracer(ctx, &tracing.TracerConfig{
ServiceName: "data-api",
Environment: "",
})
if err != nil {
return nil, err
}
srv.tracer = srv.NewTracer()
srv.tracer = tracing.NewTracer("data-api-tracer")
return srv, nil
}
@@ -107,8 +111,8 @@ func (srv *Server) userCountryData(c echo.Context) error {
ctx := c.Request().Context()
q := ntpdb.New(srv.db)
zoneStats, err := q.GetZoneStats(ctx)
q := ntpdb.NewWrappedQuerier(ntpdb.New(srv.db))
zoneStats, err := ntpdb.GetZoneStats(ctx, q)
if err != nil {
slog.Error("GetZoneStats", "err", err)
return c.String(http.StatusInternalServerError, err.Error())

110
server/tracing.go
View File

@@ -1,110 +0,0 @@
package server
import (
"context"
"log"
"os"
"go.ntppool.org/common/version"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/exporters/jaeger"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
"go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/sdk/resource"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
"go.opentelemetry.io/otel/trace"
)
// https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/instrumentation/github.com/labstack/echo/otelecho/example/server.go
// https://github.com/open-telemetry/opentelemetry-go/blob/main/exporters/otlp/otlptrace/otlptracehttp/example_test.go
func (srv *Server) NewTracer() trace.Tracer {
traceProvider := otel.GetTracerProvider()
return traceProvider.Tracer("data-api")
}
func (srv *Server) initTracer() error {
// exporter, err := srv.newStdoutExporter(os.Stdout)
var err error
var exporter sdktrace.SpanExporter
if otlp := os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT"); len(otlp) > 0 {
exporter, err = srv.newOLTPExporter()
} else if jaegerHost := os.Getenv("OTEL_EXPORTER_JAEGER_ENDPOINT"); len(jaegerHost) > 0 {
exporter, err = srv.newJaegerExporter()
}
if err != nil {
return err
}
if exporter != nil {
tp := sdktrace.NewTracerProvider(
sdktrace.WithSampler(sdktrace.AlwaysSample()),
sdktrace.WithBatcher(exporter),
sdktrace.WithResource(srv.newResource("prod")),
)
otel.SetTracerProvider(tp)
otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{}))
} else {
log.Println("tracing not configured")
}
return nil
}
func (srv *Server) newJaegerExporter() (sdktrace.SpanExporter, error) {
exporter, err := jaeger.New(jaeger.WithAgentEndpoint())
if err != nil {
log.Fatalf("creating jaeger trace exporter: %v", err)
}
return exporter, err
}
func (srv *Server) newOLTPExporter() (sdktrace.SpanExporter, error) {
ctx := context.TODO()
client := otlptracehttp.NewClient()
exporter, err := otlptrace.New(ctx, client)
if err != nil {
log.Fatalf("creating OTLP trace exporter: %v", err)
}
return exporter, err
}
// func (srv *Server) newStdoutExporter(w io.Writer) (sdktrace.SpanExporter, error) {
// return stdouttrace.New(
// stdouttrace.WithWriter(w),
// // Use human-readable output.
// stdouttrace.WithPrettyPrint(),
// // Do not print timestamps for the demo.
// stdouttrace.WithoutTimestamps(),
// )
// }
// newResource returns a resource describing this application.
func (srv *Server) newResource(depEnv string) *resource.Resource {
r, err := resource.Merge(
resource.Default(),
resource.NewWithAttributes(
semconv.SchemaURL,
semconv.ServiceNameKey.String("data-api"),
semconv.ServiceVersionKey.String(version.Version()),
attribute.String("environment", depEnv),
),
)
if err != nil {
panic(err)
}
log.Printf("merged resource: %+v", r)
return r
}