Tracing

app.go

@@ -16,6 +16,7 @@ import (
 	"net"
 	"sync"
 
+	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 )
@@ -43,8 +44,14 @@ func NewAppWithConfig(config configs.Config) (*app, error) {
 	}, nil
 }
 
-func (a *app) Start() error {
-	a.init()
+func (a *app) Start(ctx context.Context) error {
+	shutdownTracing := initTracing(
+		"apollo",
+		a.config.Tracing().Endpoint(),
+	)
+	a.shutdownProcesses = append(a.shutdownProcesses, shutdownTracing)
+
+	a.init(ctx)
 	return a.startGrpcServer()
 }
 
@@ -76,13 +83,13 @@ func (a *app) GracefulStop(ctx context.Context) {
 	}
 }
 
-func (a *app) init() {
+func (a *app) init(ctx context.Context) {
 	manager := db.NewScyllaManager()
 	a.cm = manager
 
 	a.initUserRepo(a.cm)
 
-	a.initVaultClientService()
+	a.initVaultClientService(ctx)
 	a.initAuthService()
 
 	a.initAuthServiceServer()
@@ -94,7 +101,9 @@ func (a *app) initGrpcServer() {
 	if a.authServiceServer == nil {
 		log.Fatalln("eval grpc server is nil")
 	}
-	s := grpc.NewServer()
+	s := grpc.NewServer(
+		grpc.StatsHandler(otelgrpc.NewServerHandler()),
+	)
 	proto1.RegisterAuthServiceServer(s, a.authServiceServer)
 	reflection.Register(s)
 	a.grpcServer = s
@@ -111,8 +120,8 @@ func (a *app) initAuthServiceServer() {
 	a.authServiceServer = server
 }
 
-func (a *app) initVaultClientService() {
-	vaultService, err := vault.NewVaultClientService()
+func (a *app) initVaultClientService(ctx context.Context) {
+	vaultService, err := vault.NewVaultClientService(ctx)
 	if err != nil {
 		log.Fatalln(err)
 	}

client/oort_client.go

@@ -11,7 +11,7 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 )
 
-func AuthorizeUser(permission string, subjectId string) bool {
+func AuthorizeUser(ctx context.Context, permission string, subjectId string) bool {
 	conn, err := grpc.Dial("oort:8000", grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		log.Fatal(err)
@@ -20,7 +20,7 @@ func AuthorizeUser(permission string, subjectId string) bool {
 
 	evaluatorClient := oort.NewOortEvaluatorClient(conn)
 
-	getResp, err := evaluatorClient.Authorize(context.Background(), &oort.AuthorizationReq{
+	getResp, err := evaluatorClient.Authorize(ctx, &oort.AuthorizationReq{
 		Subject: &oort.Resource{
 			Id:   subjectId,
 			Kind: "user",
@@ -40,7 +40,7 @@ func AuthorizeUser(permission string, subjectId string) bool {
 	return getResp.Authorized
 }
 
-func CreateOrgUserRelationship(org_id string, user_id string) error {
+func CreateOrgUserRelationship(ctx context.Context, org_id string, user_id string) error {
 	conn, err := grpc.Dial("oort:8000", grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		log.Fatal(err)
@@ -51,7 +51,7 @@ func CreateOrgUserRelationship(org_id string, user_id string) error {
 
 	log.Printf("Org za inherit: " + org_id)
 	log.Printf("User za inherit: " + user_id)
-	_, err = administratorClient.CreateInheritanceRel(context.TODO(), &oort.CreateInheritanceRelReq{
+	_, err = administratorClient.CreateInheritanceRel(ctx, &oort.CreateInheritanceRelReq{
 		From: &oort.Resource{
 			Id:   org_id,
 			Kind: "org",
@@ -68,7 +68,7 @@ func CreateOrgUserRelationship(org_id string, user_id string) error {
 	return nil
 }
 
-func GetGrantedPermissions(user string) []*oort.GrantedPermission {
+func GetGrantedPermissions(ctx context.Context, user string) []*oort.GrantedPermission {
 	conn, err := grpc.Dial("oort:8000", grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		log.Fatal(err)
@@ -77,7 +77,7 @@ func GetGrantedPermissions(user string) []*oort.GrantedPermission {
 
 	evaluatorClient := oort.NewOortEvaluatorClient(conn)
 
-	resp, err := evaluatorClient.GetGrantedPermissions(context.TODO(), &oort.GetGrantedPermissionsReq{
+	resp, err := evaluatorClient.GetGrantedPermissions(ctx, &oort.GetGrantedPermissionsReq{
 		Subject: &oort.Resource{
 			Id:   user,
 			Kind: "user",
@@ -96,7 +96,7 @@ func GetGrantedPermissions(user string) []*oort.GrantedPermission {
 	return resp.Permissions
 }
 
-func CreatePolicyAsync(org_id string, user string, perms []string) {
+func CreatePolicyAsync(ctx context.Context, org_id string, user string, perms []string) {
 	permissions := getPermissionsForOort(perms)
 	administratorAsync, err := oort.NewAdministrationAsyncClient("nats:4222")
 
@@ -107,7 +107,7 @@ func CreatePolicyAsync(org_id string, user string, perms []string) {
 	log.Printf("User za policy: " + user)
 	log.Printf("Org za policy: " + org_id)
 	for _, perm := range permissions {
-		err := administratorAsync.SendRequest(&oort.CreatePolicyReq{
+		err := administratorAsync.SendRequest(ctx, &oort.CreatePolicyReq{
 			SubjectScope: &oort.Resource{
 				Id:   user,
 				Kind: "user",

configs/config.go

@@ -1,24 +1,28 @@
 package configs
 
 import (
-	"apollo/configs/server"
 	"apollo/configs/nats"
+	"apollo/configs/server"
+	"apollo/configs/tracing"
 )
 
 type Config interface {
 	Server() server.Config
-	Nats()	nats.Config
+	Nats() nats.Config
+	Tracing() tracing.Config
 }
 
 type config struct {
-	server server.Config
-	nats   nats.Config
+	server  server.Config
+	nats    nats.Config
+	tracing tracing.Config
 }
 
 func NewConfig() (Config, error) {
 	return &config{
-		server: server.NewConfig(),
-		nats: 	nats.NewConfig(),
+		server:  server.NewConfig(),
+		nats:    nats.NewConfig(),
+		tracing: tracing.NewConfig(),
 	}, nil
 }
 
@@ -29,3 +33,7 @@ func (c config) Server() server.Config {
 func (c config) Nats() nats.Config {
 	return c.nats
 }
+
+func (c config) Tracing() tracing.Config {
+	return c.tracing
+}

configs/tracing/config.go

@@ -0,0 +1,26 @@
+package tracing
+
+import (
+	"fmt"
+	"os"
+)
+
+type Config interface {
+	Endpoint() string
+}
+
+type config struct {
+	jaegerHost     string
+	jaegerGRPCPort string
+}
+
+func NewConfig() Config {
+	return config{
+		jaegerHost:     os.Getenv("JAEGER_HOST"),
+		jaegerGRPCPort: os.Getenv("JAEGER_GRPC_PORT"),
+	}
+}
+
+func (c config) Endpoint() string {
+	return fmt.Sprintf("%s:%s", c.jaegerHost, c.jaegerGRPCPort)
+}

go.mod

@@ -1,15 +1,18 @@
 module apollo
 
-go 1.21.3
+go 1.24.0
 
 require (
 	github.com/c12s/oort v1.0.0
 	github.com/gocql/gocql v1.6.0
 	github.com/hashicorp/vault-client-go v0.4.2
-	github.com/neo4j/neo4j-go-driver/v4 v4.4.1
 	github.com/scylladb/gocqlx/v3 v3.0.1
-	google.golang.org/grpc v1.65.0
-	google.golang.org/protobuf v1.34.1
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.65.0
+	go.opentelemetry.io/otel v1.40.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0
+	go.opentelemetry.io/otel/sdk v1.40.0
+	google.golang.org/grpc v1.78.0
+	google.golang.org/protobuf v1.36.11
 )
 
 require (
@@ -34,15 +37,27 @@ require (
 	github.com/nats-io/nats.go v1.31.0 // indirect
 	github.com/nats-io/nkeys v0.4.5 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
-	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/crypto v0.47.0 // indirect
 )
 
 require (
+	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect
 	github.com/scylladb/go-reflectx v1.0.1 // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
+	go.opentelemetry.io/otel/metric v1.40.0 // indirect
+	go.opentelemetry.io/otel/trace v1.40.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.9.0 // indirect
+	golang.org/x/net v0.49.0 // indirect
+	golang.org/x/sys v0.40.0 // indirect
+	golang.org/x/text v0.33.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
 )
 
 replace github.com/c12s/oort => ../oort