Add OpenTelemetry tracing #1355
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
houndci-bot
reviewed
Nov 1, 2023
erikoqvist
force-pushed
the
add_opentelemetry_tracing
branch
from
44c7705 to
b443691
Compare
houndci-bot
reviewed
Nov 1, 2023
| return wrapped_view | ||
| except ImportError: | ||
| def create_span(view): | ||
| @functools.wraps(view) |
|
|
||
| return wrapped_view | ||
| except ImportError: | ||
| def create_span(view): |
There was a problem hiding this comment.
indentation is not a multiple of four
| return view(**kwargs) | ||
|
|
||
| return wrapped_view | ||
| except ImportError: |
| @wraps(f) | ||
| def decorated(*args, **kwargs): | ||
| return f(*args, **kwargs) | ||
| return decorated |
| if args[0].full_name is not None: | ||
| span.set_attribute("full_name", args[0].full_name) | ||
| if args[0].authoritative_source is not None: | ||
| span.set_attribute("authoritative_source", args[0].authoritative_source) |
| span.set_attribute("username", auth.username) | ||
| if auth.full_name is not None: | ||
| span.set_attribute("full_name", auth.full_name) | ||
| span.set_attribute("authoritative_source", auth.authoritative_source) |
| for parameter in signature.parameters: | ||
| if index > 1: | ||
| try: | ||
| span.set_attribute("argument." + parameter, str(args[index])) |
|
|
||
| auth = args[1] | ||
| signature = inspect.signature(f) | ||
| with tracer.start_as_current_span(args[0].__class__.__name__ + " " + f.__name__, context.get_current(), |
There was a problem hiding this comment.
line too long (115 > 79 characters)
| return post(f'{endpoint}{path}', data=request.data, headers=request.headers).content | ||
|
|
||
|
|
||
| def create_span(f): |
| def setup(app, endpoint): | ||
| @app.route('/v1/traces/', defaults={'path': ''}, methods=["POST"]) | ||
| def proxy(path): | ||
| return post(f'{endpoint}{path}', data=request.data, headers=request.headers).content |
erikoqvist
force-pushed
the
add_opentelemetry_tracing
branch
from
b443691 to
b7825dd
Compare
houndci-bot
reviewed
Nov 2, 2023
| trace.set_tracer_provider(provider) | ||
|
|
||
|
|
||
| def setup(app, endpoint): |
| tracer = trace.get_tracer("nipap") | ||
|
|
||
| def init_tracing(service_name, endpoint): | ||
| resource = Resource(attributes={ |
|
|
||
| from opentelemetry import trace, context | ||
| from opentelemetry.trace import SpanKind, StatusCode | ||
| from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter |
| @@ -17,7 +17,7 @@ | |||
| author_email = pynipap.__author_email__, | |||
| license = pynipap.__license__, | |||
| url = pynipap.__url__, | |||
| py_modules = ['pynipap'], | |||
| py_modules = ['pynipap','tracing'], | |||
There was a problem hiding this comment.
missing whitespace after ','
unexpected spaces around keyword / parameter equals
pynipap/tracing.py
Outdated
| """ | ||
|
|
||
| signature = inspect.signature(f) | ||
| with tracer.start_as_current_span(args[0].__name__ + " " + f.__name__, |
| if use_grpc: | ||
| processor = BatchSpanProcessor(OTLPSpanExporter(endpoint=endpoint)) | ||
| else: | ||
| processor = BatchSpanProcessor(opentelemetry.exporter.otlp.proto.http.trace_exporter.OTLPSpanExporter(endpoint=endpoint)) |
There was a problem hiding this comment.
line too long (133 > 79 characters)
| tracer = trace.get_tracer("pynipap") | ||
|
|
||
|
|
||
| def init_tracing(service_name, endpoint, use_grpc=True): |
|
|
||
| tracer = trace.get_tracer("pynipap") | ||
|
|
||
|
|
| try: | ||
| from opentelemetry import trace, context | ||
| from opentelemetry.trace import SpanKind, INVALID_SPAN | ||
| from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter |
| if sys.version_info[0] < 3: | ||
| import xmlrpclib | ||
|
|
||
| int = long |
erikoqvist
force-pushed
the
add_opentelemetry_tracing
branch
2 times, most recently
from
ae0f3b1 to
9b1c79c
Compare
garberg
reviewed
Nov 6, 2023
| try: | ||
| result = super().request(host, handler, request_body, verbose) | ||
| current_span.set_attribute("http.status_code", 200) | ||
| except xmlrpclib.ProtocolError as protocolError: |
There was a problem hiding this comment.
Shouldn't we make sure to re-raise the exception, this'll silently drop all ProtocolErrors?
There was a problem hiding this comment.
Yes, we definitely should. I've pushed an update correcting this.
erikoqvist
force-pushed
the
add_opentelemetry_tracing
branch
from
9b1c79c to
20ae1f8
Compare
|
LGTM 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add OpenTelemetry tracing for cli, www and nipapd