| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
poetry.lock
synapse/api/auth.py
synapse/federation/federation_client.py
synapse/logging/opentracing.py
synapse/rest/client/keys.py
synapse/rest/client/sendtodevice.py
synapse/storage/schema/__init__.py
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
poetry.lock
synapse/federation/federation_client.py
synapse/federation/federation_server.py
synapse/handlers/federation.py
synapse/handlers/federation_event.py
synapse/logging/opentracing.py
synapse/rest/client/room.py
synapse/storage/controllers/persist_events.py
synapse/storage/controllers/state.py
|
|
|
|
|
|
| |
Conflicts:
synapse/logging/opentracing.py
tests/logging/test_opentracing.py
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
docs/usage/configuration/config_documentation.md
synapse/logging/opentracing.py
Got changes from:
- https://github.com/matrix-org/synapse/pull/13362/files
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
This reverts commit d15fa457c987f51908cdba440655a0d6d88573a9.
|
| |
|
|
|
|
| |
Doesn't force tracing for the child spans yet
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
AFAICT, this never worked before because everything was serialized into `content["org.matrix.opentracing_context"]`
but `start_active_span_from_edu` read from `content["opentracing"]`.
See https://github.com/matrix-org/synapse/pull/5852#discussion_r934960586
Do we even still want this?
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
See:
- https://github.com/open-telemetry/opentelemetry-python/pull/198#discussion_r333399436
- https://github.com/open-telemetry/opentelemetry-python/issues/219
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
The `incoming-federation-request` vs `process-federation_request` was first introduced in
https://github.com/matrix-org/synapse/pull/11870
- Span for remote trace: `incoming-federation-request`
- `child_of` reference: `origin_span_context`
- `follows_from` reference: `servlet_span`
- Span for local trace: `process-federation-request`
- `child_of` reference: `servlet_span` (by the nature of it being active)
- `follows_from` reference: `incoming-federation-request`
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix error:
```
AttributeError: 'SpanContext' object has no attribute 'get'
```
`Context`:
```
{'current-span-1a226c96-a5db-4412-bcaa-1fdd34213c5c': _Span(name="sendToDevice", context=SpanContext(trace_id=0x5d2dcc3fdc8205046d60a5cd18672ac6, span_id=0x715c736ff5f4d208, trace_flags=0x01, trace_state=[], is_remote=False))}
```
`SpanContext`:
```
SpanContext(trace_id=0xf7cd9d058b7b76f364bdd649c4ba7b8a, span_id=0x287ce71bac31bfc4, trace_flags=0x01, trace_state=[], is_remote=False)
```
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|