Commit 3eb3f76

authored

Merge pull request #177 from cloudforet-io/add-span-kind-for-tracing

chore(tracing): set span kind for client and server

2 parents 24067c9 + c079f84 commit 3eb3f76Copy full SHA for 3eb3f76

File tree

-4

lines changed

-4

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`from typing import Any, List, Tuple`
`4`	`4`	`from google.protobuf.json_format import MessageToDict`
`5`	`5`	`from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator`
	`6`	`+from opentelemetry import trace`
	`7`	`+from opentelemetry.trace import SpanKind`
`6`	`8`
`7`	`9`	`from spaceone.core.connector import BaseConnector`
`8`	`10`	`from spaceone.core import pygrpc`
`@@ -13,7 +15,7 @@`
`13`	`15`	`__all__ = ["SpaceConnector"]`
`14`	`16`
`15`	`17`	`_LOGGER = logging.getLogger(__name__)`
`16`		`-`
	`18`	`+_TRACER=trace.get_tracer(__name__)`
`17`	`19`
`18`	`20`	`class SpaceConnector(BaseConnector):`
`19`	`21`	`name = "SpaceConnector"`
`@@ -46,7 +48,8 @@ def client(self) -> GRPCClient:`
`46`	`48`	`return self._client`
`47`	`49`
`48`	`50`	`def dispatch(self, method: str, params: dict = None, **kwargs) -> Any:`
`49`		`- return self._call_api(method, params, **kwargs)`
	`51`	`+ with _TRACER.start_as_current_span(method, kind=SpanKind.CLIENT):`
	`52`	`+ return self._call_api(method, params, **kwargs)`
`50`	`53`
`51`	`54`	`def _call_api(`
`52`	`55`	`self,`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`from typing import Generator, Union, Literal, Any`
`7`	`7`
`8`	`8`	`from opentelemetry import trace`
`9`		`-from opentelemetry.trace import format_trace_id`
	`9`	`+from opentelemetry.trace import format_trace_id, SpanKind`
`10`	`10`	`from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator`
`11`	`11`
`12`	`12`	`from spaceone.core.base import CoreObject`
`@@ -129,7 +129,9 @@ def wrapped_func(self, params: dict):`
`129`	`129`	`_traceparent = self.metadata.get("traceparent")`
`130`	`130`
`131`	`131`	`with _TRACER.start_as_current_span(`
`132`		`- f"{self.resource}.{_verb}", context=_get_span_context(_traceparent)`
	`132`	`+ f"{self.resource}.{_verb}",`
	`133`	`+ context=_get_span_context(_traceparent),`
	`134`	`+ kind=SpanKind.SERVER`
`133`	`135`	`) as span:`
`134`	`136`	`self.current_span_context = span.get_span_context()`
`135`	`137`	`trace_id = format_trace_id(self.current_span_context.trace_id)`

Comments

(0)