Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maunium
synapse
Commits
e07a8caf
Unverified
Commit
e07a8caf
authored
4 years ago
by
Erik Johnston
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add support for using rust-python-jaeger-reporter (#7697)
parent
b44bdd7f
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
changelog.d/7697.misc
+1
-0
1 addition, 0 deletions
changelog.d/7697.misc
mypy.ini
+3
-0
3 additions, 0 deletions
mypy.ini
synapse/logging/opentracing.py
+36
-3
36 additions, 3 deletions
synapse/logging/opentracing.py
with
40 additions
and
3 deletions
changelog.d/7697.misc
0 → 100644
+
1
−
0
View file @
e07a8caf
Add support for using `rust-python-jaeger-reporter` library to reduce jaeger tracing overhead.
This diff is collapsed.
Click to expand it.
mypy.ini
+
3
−
0
View file @
e07a8caf
...
@@ -78,3 +78,6 @@ ignore_missing_imports = True
...
@@ -78,3 +78,6 @@ ignore_missing_imports = True
[mypy-authlib.*]
[mypy-authlib.*]
ignore_missing_imports
=
True
ignore_missing_imports
=
True
[mypy-rust_python_jaeger_reporter.*]
ignore_missing_imports
=
True
This diff is collapsed.
Click to expand it.
synapse/logging/opentracing.py
+
36
−
3
View file @
e07a8caf
...
@@ -171,8 +171,9 @@ import logging
...
@@ -171,8 +171,9 @@ import logging
import
re
import
re
import
types
import
types
from
functools
import
wraps
from
functools
import
wraps
from
typing
import
TYPE_CHECKING
,
Dict
from
typing
import
TYPE_CHECKING
,
Dict
,
Optional
,
Type
import
attr
from
canonicaljson
import
json
from
canonicaljson
import
json
from
twisted.internet
import
defer
from
twisted.internet
import
defer
...
@@ -232,6 +233,30 @@ except ImportError:
...
@@ -232,6 +233,30 @@ except ImportError:
LogContextScopeManager
=
None
# type: ignore
LogContextScopeManager
=
None
# type: ignore
try
:
from
rust_python_jaeger_reporter
import
Reporter
@attr.s
(
slots
=
True
,
frozen
=
True
)
class
_WrappedRustReporter
:
"""
Wrap the reporter to ensure `report_span` never throws.
"""
_reporter
=
attr
.
ib
(
type
=
Reporter
,
default
=
attr
.
Factory
(
Reporter
))
def
set_process
(
self
,
*
args
,
**
kwargs
):
return
self
.
_reporter
.
set_process
(
*
args
,
**
kwargs
)
def
report_span
(
self
,
span
):
try
:
return
self
.
_reporter
.
report_span
(
span
)
except
Exception
:
logger
.
exception
(
"
Failed to report span
"
)
RustReporter
=
_WrappedRustReporter
# type: Optional[Type[_WrappedRustReporter]]
except
ImportError
:
RustReporter
=
None
logger
=
logging
.
getLogger
(
__name__
)
logger
=
logging
.
getLogger
(
__name__
)
...
@@ -320,11 +345,19 @@ def init_tracer(hs: "HomeServer"):
...
@@ -320,11 +345,19 @@ def init_tracer(hs: "HomeServer"):
set_homeserver_whitelist
(
hs
.
config
.
opentracer_whitelist
)
set_homeserver_whitelist
(
hs
.
config
.
opentracer_whitelist
)
JaegerConfig
(
config
=
JaegerConfig
(
config
=
hs
.
config
.
jaeger_config
,
config
=
hs
.
config
.
jaeger_config
,
service_name
=
"
{} {}
"
.
format
(
hs
.
config
.
server_name
,
hs
.
get_instance_name
()),
service_name
=
"
{} {}
"
.
format
(
hs
.
config
.
server_name
,
hs
.
get_instance_name
()),
scope_manager
=
LogContextScopeManager
(
hs
.
config
),
scope_manager
=
LogContextScopeManager
(
hs
.
config
),
).
initialize_tracer
()
)
# If we have the rust jaeger reporter available let's use that.
if
RustReporter
:
logger
.
info
(
"
Using rust_python_jaeger_reporter library
"
)
tracer
=
config
.
create_tracer
(
RustReporter
(),
config
.
sampler
)
opentracing
.
set_global_tracer
(
tracer
)
else
:
config
.
initialize_tracer
()
# Whitelisting
# Whitelisting
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment