mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-14 20:03:54 +01:00
Clean up the interface for injecting opentracing over HTTP (#10143)
* Remove unused helper functions * Clean up the interface for injecting opentracing over HTTP * changelog
This commit is contained in:
parent
c7f3fb2745
commit
1bf83a191b
4 changed files with 26 additions and 92 deletions
1
changelog.d/10143.misc
Normal file
1
changelog.d/10143.misc
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Clean up the interface for injecting opentracing over HTTP.
|
|
@ -65,13 +65,9 @@ from synapse.http.client import (
|
||||||
read_body_with_max_size,
|
read_body_with_max_size,
|
||||||
)
|
)
|
||||||
from synapse.http.federation.matrix_federation_agent import MatrixFederationAgent
|
from synapse.http.federation.matrix_federation_agent import MatrixFederationAgent
|
||||||
|
from synapse.logging import opentracing
|
||||||
from synapse.logging.context import make_deferred_yieldable
|
from synapse.logging.context import make_deferred_yieldable
|
||||||
from synapse.logging.opentracing import (
|
from synapse.logging.opentracing import set_tag, start_active_span, tags
|
||||||
inject_active_span_byte_dict,
|
|
||||||
set_tag,
|
|
||||||
start_active_span,
|
|
||||||
tags,
|
|
||||||
)
|
|
||||||
from synapse.types import ISynapseReactor, JsonDict
|
from synapse.types import ISynapseReactor, JsonDict
|
||||||
from synapse.util import json_decoder
|
from synapse.util import json_decoder
|
||||||
from synapse.util.async_helpers import timeout_deferred
|
from synapse.util.async_helpers import timeout_deferred
|
||||||
|
@ -497,7 +493,7 @@ class MatrixFederationHttpClient:
|
||||||
|
|
||||||
# Inject the span into the headers
|
# Inject the span into the headers
|
||||||
headers_dict = {} # type: Dict[bytes, List[bytes]]
|
headers_dict = {} # type: Dict[bytes, List[bytes]]
|
||||||
inject_active_span_byte_dict(headers_dict, request.destination)
|
opentracing.inject_header_dict(headers_dict, request.destination)
|
||||||
|
|
||||||
headers_dict[b"User-Agent"] = [self.version_string_bytes]
|
headers_dict[b"User-Agent"] = [self.version_string_bytes]
|
||||||
|
|
||||||
|
|
|
@ -168,7 +168,7 @@ import inspect
|
||||||
import logging
|
import logging
|
||||||
import re
|
import re
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
from typing import TYPE_CHECKING, Dict, Optional, Pattern, Type
|
from typing import TYPE_CHECKING, Dict, List, Optional, Pattern, Type
|
||||||
|
|
||||||
import attr
|
import attr
|
||||||
|
|
||||||
|
@ -574,22 +574,22 @@ def set_operation_name(operation_name):
|
||||||
# Injection and extraction
|
# Injection and extraction
|
||||||
|
|
||||||
|
|
||||||
@ensure_active_span("inject the span into a header")
|
@ensure_active_span("inject the span into a header dict")
|
||||||
def inject_active_span_twisted_headers(headers, destination, check_destination=True):
|
def inject_header_dict(
|
||||||
|
headers: Dict[bytes, List[bytes]],
|
||||||
|
destination: Optional[str] = None,
|
||||||
|
check_destination: bool = True,
|
||||||
|
) -> None:
|
||||||
"""
|
"""
|
||||||
Injects a span context into twisted headers in-place
|
Injects a span context into a dict of HTTP headers
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
headers (twisted.web.http_headers.Headers)
|
headers: the dict to inject headers into
|
||||||
destination (str): address of entity receiving the span context. If check_destination
|
destination: address of entity receiving the span context. Must be given unless
|
||||||
is true the context will only be injected if the destination matches the
|
check_destination is False. The context will only be injected if the
|
||||||
opentracing whitelist
|
destination matches the opentracing whitelist
|
||||||
check_destination (bool): If false, destination will be ignored and the context
|
check_destination (bool): If false, destination will be ignored and the context
|
||||||
will always be injected.
|
will always be injected.
|
||||||
span (opentracing.Span)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
In-place modification of headers
|
|
||||||
|
|
||||||
Note:
|
Note:
|
||||||
The headers set by the tracer are custom to the tracer implementation which
|
The headers set by the tracer are custom to the tracer implementation which
|
||||||
|
@ -598,45 +598,13 @@ def inject_active_span_twisted_headers(headers, destination, check_destination=T
|
||||||
here:
|
here:
|
||||||
https://github.com/jaegertracing/jaeger-client-python/blob/master/jaeger_client/constants.py
|
https://github.com/jaegertracing/jaeger-client-python/blob/master/jaeger_client/constants.py
|
||||||
"""
|
"""
|
||||||
|
if check_destination:
|
||||||
if check_destination and not whitelisted_homeserver(destination):
|
if destination is None:
|
||||||
return
|
raise ValueError(
|
||||||
|
"destination must be given unless check_destination is False"
|
||||||
span = opentracing.tracer.active_span
|
)
|
||||||
carrier = {} # type: Dict[str, str]
|
if not whitelisted_homeserver(destination):
|
||||||
opentracing.tracer.inject(span.context, opentracing.Format.HTTP_HEADERS, carrier)
|
return
|
||||||
|
|
||||||
for key, value in carrier.items():
|
|
||||||
headers.addRawHeaders(key, value)
|
|
||||||
|
|
||||||
|
|
||||||
@ensure_active_span("inject the span into a byte dict")
|
|
||||||
def inject_active_span_byte_dict(headers, destination, check_destination=True):
|
|
||||||
"""
|
|
||||||
Injects a span context into a dict where the headers are encoded as byte
|
|
||||||
strings
|
|
||||||
|
|
||||||
Args:
|
|
||||||
headers (dict)
|
|
||||||
destination (str): address of entity receiving the span context. If check_destination
|
|
||||||
is true the context will only be injected if the destination matches the
|
|
||||||
opentracing whitelist
|
|
||||||
check_destination (bool): If false, destination will be ignored and the context
|
|
||||||
will always be injected.
|
|
||||||
span (opentracing.Span)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
In-place modification of headers
|
|
||||||
|
|
||||||
Note:
|
|
||||||
The headers set by the tracer are custom to the tracer implementation which
|
|
||||||
should be unique enough that they don't interfere with any headers set by
|
|
||||||
synapse or twisted. If we're still using jaeger these headers would be those
|
|
||||||
here:
|
|
||||||
https://github.com/jaegertracing/jaeger-client-python/blob/master/jaeger_client/constants.py
|
|
||||||
"""
|
|
||||||
if check_destination and not whitelisted_homeserver(destination):
|
|
||||||
return
|
|
||||||
|
|
||||||
span = opentracing.tracer.active_span
|
span = opentracing.tracer.active_span
|
||||||
|
|
||||||
|
@ -647,38 +615,6 @@ def inject_active_span_byte_dict(headers, destination, check_destination=True):
|
||||||
headers[key.encode()] = [value.encode()]
|
headers[key.encode()] = [value.encode()]
|
||||||
|
|
||||||
|
|
||||||
@ensure_active_span("inject the span into a text map")
|
|
||||||
def inject_active_span_text_map(carrier, destination, check_destination=True):
|
|
||||||
"""
|
|
||||||
Injects a span context into a dict
|
|
||||||
|
|
||||||
Args:
|
|
||||||
carrier (dict)
|
|
||||||
destination (str): address of entity receiving the span context. If check_destination
|
|
||||||
is true the context will only be injected if the destination matches the
|
|
||||||
opentracing whitelist
|
|
||||||
check_destination (bool): If false, destination will be ignored and the context
|
|
||||||
will always be injected.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
In-place modification of carrier
|
|
||||||
|
|
||||||
Note:
|
|
||||||
The headers set by the tracer are custom to the tracer implementation which
|
|
||||||
should be unique enough that they don't interfere with any headers set by
|
|
||||||
synapse or twisted. If we're still using jaeger these headers would be those
|
|
||||||
here:
|
|
||||||
https://github.com/jaegertracing/jaeger-client-python/blob/master/jaeger_client/constants.py
|
|
||||||
"""
|
|
||||||
|
|
||||||
if check_destination and not whitelisted_homeserver(destination):
|
|
||||||
return
|
|
||||||
|
|
||||||
opentracing.tracer.inject(
|
|
||||||
opentracing.tracer.active_span.context, opentracing.Format.TEXT_MAP, carrier
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@ensure_active_span("get the active span context as a dict", ret={})
|
@ensure_active_span("get the active span context as a dict", ret={})
|
||||||
def get_active_span_text_map(destination=None):
|
def get_active_span_text_map(destination=None):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -23,7 +23,8 @@ from prometheus_client import Counter, Gauge
|
||||||
|
|
||||||
from synapse.api.errors import HttpResponseException, SynapseError
|
from synapse.api.errors import HttpResponseException, SynapseError
|
||||||
from synapse.http import RequestTimedOutError
|
from synapse.http import RequestTimedOutError
|
||||||
from synapse.logging.opentracing import inject_active_span_byte_dict, trace
|
from synapse.logging import opentracing
|
||||||
|
from synapse.logging.opentracing import trace
|
||||||
from synapse.util.caches.response_cache import ResponseCache
|
from synapse.util.caches.response_cache import ResponseCache
|
||||||
from synapse.util.stringutils import random_string
|
from synapse.util.stringutils import random_string
|
||||||
|
|
||||||
|
@ -235,7 +236,7 @@ class ReplicationEndpoint(metaclass=abc.ABCMeta):
|
||||||
# Add an authorization header, if configured.
|
# Add an authorization header, if configured.
|
||||||
if replication_secret:
|
if replication_secret:
|
||||||
headers[b"Authorization"] = [b"Bearer " + replication_secret]
|
headers[b"Authorization"] = [b"Bearer " + replication_secret]
|
||||||
inject_active_span_byte_dict(headers, None, check_destination=False)
|
opentracing.inject_header_dict(headers, check_destination=False)
|
||||||
try:
|
try:
|
||||||
result = await request_func(uri, data, headers=headers)
|
result = await request_func(uri, data, headers=headers)
|
||||||
break
|
break
|
||||||
|
|
Loading…
Reference in a new issue