*: use prefixed span names

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-12-13 16:18:26 +01:00
parent cb6edcb198
commit ac9cf590bc
7 changed files with 12 additions and 10 deletions

View File

@ -64,7 +64,7 @@ class GeoIPReader:
def city(self, ip_address: str) -> Optional[City]: def city(self, ip_address: str) -> Optional[City]:
"""Wrapper for Reader.city""" """Wrapper for Reader.city"""
with Hub.current.start_span( with Hub.current.start_span(
op="events.geo.city", op="authentik.events.geo.city",
description=ip_address, description=ip_address,
): ):
if not self.enabled: if not self.enabled:

View File

@ -126,7 +126,9 @@ class FlowPlanner:
) -> FlowPlan: ) -> FlowPlan:
"""Check each of the flows' policies, check policies for each stage with PolicyBinding """Check each of the flows' policies, check policies for each stage with PolicyBinding
and return ordered list""" and return ordered list"""
with Hub.current.start_span(op="flow.planner.plan", description=self.flow.slug) as span: with Hub.current.start_span(
op="authentik.flow.planner.plan", description=self.flow.slug
) as span:
span: Span span: Span
span.set_data("flow", self.flow) span.set_data("flow", self.flow)
span.set_data("request", request) span.set_data("request", request)
@ -181,7 +183,7 @@ class FlowPlanner:
"""Build flow plan by checking each stage in their respective """Build flow plan by checking each stage in their respective
order and checking the applied policies""" order and checking the applied policies"""
with Hub.current.start_span( with Hub.current.start_span(
op="flow.planner.build_plan", op="authentik.flow.planner.build_plan",
description=self.flow.slug, description=self.flow.slug,
) as span, HIST_FLOWS_PLAN_TIME.labels(flow_slug=self.flow.slug).time(): ) as span, HIST_FLOWS_PLAN_TIME.labels(flow_slug=self.flow.slug).time():
span: Span span: Span

View File

@ -160,7 +160,7 @@ class FlowExecutorView(APIView):
# pylint: disable=unused-argument, too-many-return-statements # pylint: disable=unused-argument, too-many-return-statements
def dispatch(self, request: HttpRequest, flow_slug: str) -> HttpResponse: def dispatch(self, request: HttpRequest, flow_slug: str) -> HttpResponse:
with Hub.current.start_span( with Hub.current.start_span(
op="flow.executor.dispatch", description=self.flow.slug op="authentik.flow.executor.dispatch", description=self.flow.slug
) as span: ) as span:
span.set_data("authentik Flow", self.flow.slug) span.set_data("authentik Flow", self.flow.slug)
get_params = QueryDict(request.GET.get("query", "")) get_params = QueryDict(request.GET.get("query", ""))
@ -275,7 +275,7 @@ class FlowExecutorView(APIView):
) )
try: try:
with Hub.current.start_span( with Hub.current.start_span(
op="flow.executor.stage", op="authentik.flow.executor.stage",
description=class_to_path(self.current_stage_view.__class__), description=class_to_path(self.current_stage_view.__class__),
) as span: ) as span:
span.set_data("Method", "GET") span.set_data("Method", "GET")
@ -319,7 +319,7 @@ class FlowExecutorView(APIView):
) )
try: try:
with Hub.current.start_span( with Hub.current.start_span(
op="flow.executor.stage", op="authentik.flow.executor.stage",
description=class_to_path(self.current_stage_view.__class__), description=class_to_path(self.current_stage_view.__class__),
) as span: ) as span:
span.set_data("Method", "POST") span.set_data("Method", "POST")

View File

@ -80,7 +80,7 @@ class BaseEvaluator:
"""Parse and evaluate expression. If the syntax is incorrect, a SyntaxError is raised. """Parse and evaluate expression. If the syntax is incorrect, a SyntaxError is raised.
If any exception is raised during execution, it is raised. If any exception is raised during execution, it is raised.
The result is returned without any type-checking.""" The result is returned without any type-checking."""
with Hub.current.start_span(op="lib.evaluator.evaluate") as span: with Hub.current.start_span(op="authentik.lib.evaluator.evaluate") as span:
span: Span span: Span
span.set_data("expression", expression_source) span.set_data("expression", expression_source)
param_keys = self._context.keys() param_keys = self._context.keys()

View File

@ -90,7 +90,7 @@ class PolicyEngine:
def build(self) -> "PolicyEngine": def build(self) -> "PolicyEngine":
"""Build wrapper which monitors performance""" """Build wrapper which monitors performance"""
with Hub.current.start_span( with Hub.current.start_span(
op="policy.engine.build", op="authentik.policy.engine.build",
description=self.__pbm, description=self.__pbm,
) as span, HIST_POLICIES_BUILD_TIME.labels( ) as span, HIST_POLICIES_BUILD_TIME.labels(
object_name=self.__pbm, object_name=self.__pbm,

View File

@ -130,7 +130,7 @@ class PolicyProcess(PROCESS_CLASS):
def profiling_wrapper(self): def profiling_wrapper(self):
"""Run with profiling enabled""" """Run with profiling enabled"""
with Hub.current.start_span( with Hub.current.start_span(
op="policy.process.execute", op="authentik.policy.process.execute",
) as span, HIST_POLICIES_EXECUTION_TIME.labels( ) as span, HIST_POLICIES_EXECUTION_TIME.labels(
binding_order=self.binding.order, binding_order=self.binding.order,
binding_target_type=self.binding.target_type, binding_target_type=self.binding.target_type,

View File

@ -47,7 +47,7 @@ type APIController struct {
// NewAPIController initialise new API Controller instance from URL and API token // NewAPIController initialise new API Controller instance from URL and API token
func NewAPIController(akURL url.URL, token string) *APIController { func NewAPIController(akURL url.URL, token string) *APIController {
rsp := sentry.StartSpan(context.TODO(), "authentik.outposts.init") rsp := sentry.StartSpan(context.Background(), "authentik.outposts.init")
config := api.NewConfiguration() config := api.NewConfiguration()
config.Host = akURL.Host config.Host = akURL.Host