3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-10 15:47:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

keep trace span context (#3724)

Browse source
This commit is contained in:
Denis Mishin 2022-11-04 17:52:13 -04:00 • committed by GitHub
parent c178819875
commit a3cfe8fa42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
authorize/authorize.go
View file

@ -91,7 +91,7 @@ func newPolicyEvaluator(opts *config.Options, store *store.Store) (*evaluator.Ev
return int64(len(opts.GetAllPolicies()))
})
ctx := context.Background()
_, span := trace.StartSpan(ctx, "authorize.newPolicyEvaluator")
ctx, span := trace.StartSpan(ctx, "authorize.newPolicyEvaluator")
defer span.End()
clientCA, err := opts.GetClientCA()

2
authorize/evaluator/evaluator.go
View file

@ -120,7 +120,7 @@ func New(ctx context.Context, store *store.Store, options ...Option) (*Evaluator
// Evaluate evaluates the rego for the given policy and generates the identity headers.
func (e *Evaluator) Evaluate(ctx context.Context, req *Request) (*Result, error) {
_, span := trace.StartSpan(ctx, "authorize.Evaluator.Evaluate")
ctx, span := trace.StartSpan(ctx, "authorize.Evaluator.Evaluate")
defer span.End()
if req.Policy == nil {

2
authorize/evaluator/headers_evaluator.go
View file

@ -78,7 +78,7 @@ func NewHeadersEvaluator(ctx context.Context, store *store.Store) (*HeadersEvalu
// Evaluate evaluates the headers.rego script.
func (e *HeadersEvaluator) Evaluate(ctx context.Context, req *HeadersRequest) (*HeadersResponse, error) {
_, span := trace.StartSpan(ctx, "authorize.HeadersEvaluator.Evaluate")
ctx, span := trace.StartSpan(ctx, "authorize.HeadersEvaluator.Evaluate")
defer span.End()
rs, err := safeEval(ctx, e.q, rego.EvalInput(req))
if err != nil {

2
authorize/evaluator/policy_evaluator.go
View file

@ -198,7 +198,7 @@ func (e *PolicyEvaluator) Evaluate(ctx context.Context, req *PolicyRequest) (*Po
}
func (e *PolicyEvaluator) evaluateQuery(ctx context.Context, req *PolicyRequest, query policyQuery) (*PolicyResponse, error) {
_, span := trace.StartSpan(ctx, "authorize.PolicyEvaluator.evaluateQuery")
ctx, span := trace.StartSpan(ctx, "authorize.PolicyEvaluator.evaluateQuery")
defer span.End()
span.AddAttributes(octrace.StringAttribute("script_checksum", query.checksum()))

14
internal/databroker/server.go
View file

@ -76,7 +76,7 @@ func (srv *Server) UpdateConfig(options ...ServerOption) {
// AcquireLease acquires a lease.
func (srv *Server) AcquireLease(ctx context.Context, req *databroker.AcquireLeaseRequest) (*databroker.AcquireLeaseResponse, error) {
_, span := trace.StartSpan(ctx, "databroker.grpc.AcquireLease")
ctx, span := trace.StartSpan(ctx, "databroker.grpc.AcquireLease")
defer span.End()
log.Info(ctx).
Str("name", req.GetName()).
@ -103,7 +103,7 @@ func (srv *Server) AcquireLease(ctx context.Context, req *databroker.AcquireLeas
// Get gets a record from the in-memory list.
func (srv *Server) Get(ctx context.Context, req *databroker.GetRequest) (*databroker.GetResponse, error) {
_, span := trace.StartSpan(ctx, "databroker.grpc.Get")
ctx, span := trace.StartSpan(ctx, "databroker.grpc.Get")
defer span.End()
log.Info(ctx).
Str("type", req.GetType()).
@ -130,7 +130,7 @@ func (srv *Server) Get(ctx context.Context, req *databroker.GetRequest) (*databr
// Query queries for records.
func (srv *Server) Query(ctx context.Context, req *databroker.QueryRequest) (*databroker.QueryResponse, error) {
_, span := trace.StartSpan(ctx, "databroker.grpc.Query")
ctx, span := trace.StartSpan(ctx, "databroker.grpc.Query")
defer span.End()
log.Info(ctx).
Str("type", req.GetType()).
@ -183,7 +183,7 @@ func (srv *Server) Query(ctx context.Context, req *databroker.QueryRequest) (*da
// Put updates an existing record or adds a new one.
func (srv *Server) Put(ctx context.Context, req *databroker.PutRequest) (*databroker.PutResponse, error) {
_, span := trace.StartSpan(ctx, "databroker.grpc.Put")
ctx, span := trace.StartSpan(ctx, "databroker.grpc.Put")
defer span.End()
records := req.GetRecords()
@ -222,7 +222,7 @@ func (srv *Server) Put(ctx context.Context, req *databroker.PutRequest) (*databr
// ReleaseLease releases a lease.
func (srv *Server) ReleaseLease(ctx context.Context, req *databroker.ReleaseLeaseRequest) (*emptypb.Empty, error) {
_, span := trace.StartSpan(ctx, "databroker.grpc.ReleaseLease")
ctx, span := trace.StartSpan(ctx, "databroker.grpc.ReleaseLease")
defer span.End()
log.Info(ctx).
Str("name", req.GetName()).
@ -244,7 +244,7 @@ func (srv *Server) ReleaseLease(ctx context.Context, req *databroker.ReleaseLeas
// RenewLease releases a lease.
func (srv *Server) RenewLease(ctx context.Context, req *databroker.RenewLeaseRequest) (*emptypb.Empty, error) {
_, span := trace.StartSpan(ctx, "databroker.grpc.RenewLease")
ctx, span := trace.StartSpan(ctx, "databroker.grpc.RenewLease")
defer span.End()
log.Debug(ctx).
Str("name", req.GetName()).
@ -269,7 +269,7 @@ func (srv *Server) RenewLease(ctx context.Context, req *databroker.RenewLeaseReq
// SetOptions sets options for a type in the databroker.
func (srv *Server) SetOptions(ctx context.Context, req *databroker.SetOptionsRequest) (*databroker.SetOptionsResponse, error) {
_, span := trace.StartSpan(ctx, "databroker.grpc.SetOptions")
ctx, span := trace.StartSpan(ctx, "databroker.grpc.SetOptions")
defer span.End()
backend, err := srv.getBackend()