1
0
Commit Graph

21195 Commits

Author SHA1 Message Date
Eric Eastwood
ccd475299b Fix tracing imports after merging in develop 2022-08-03 16:18:12 -05:00
Eric Eastwood
f5da762960 Revert "Update treq to match minimum Twisted Python versions"
This reverts commit 270db429cd.
2022-08-03 16:10:10 -05:00
Eric Eastwood
270db429cd Update treq to match minimum Twisted Python versions
Hopefully fix https://github.com/matrix-org/synapse/runs/7645395562?check_suite_focus=true#step:7:6727

```
builtins.ImportError: cannot import name '_PY3' from 'twisted.python.compat' (unknown location)
```
2022-08-03 15:36:04 -05:00
Eric Eastwood
699dad008c Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts:
	docs/usage/configuration/config_documentation.md
	synapse/api/auth.py
2022-08-03 15:15:34 -05:00
Shay
a648a06d52 Add some tracing spans to give insight into local joins (#13439) 2022-08-03 10:19:34 -07:00
Eric Eastwood
92d21faf12 Instrument /messages for understandable traces in Jaeger (#13368)
In Jaeger:

 - Before: huge list of uncategorized database calls
 - After: nice and collapsible into units of work
2022-08-03 10:57:38 -05:00
andrew do
78a3111c41 Return 404 or member list when getting joined_members after leaving (#13374)
Signed-off-by: Andrew Doh <andrewddo@gmail.com>
Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
Co-authored-by: Andrew Morgan <andrewm@element.io>
Co-authored-by: Brendan Abolivier <babolivier@matrix.org>
2022-08-03 14:26:31 +02:00
Jasper Spaans
503a95804e Install cryptography build dependencies in requirements image. (#13372) 2022-08-03 11:16:32 +01:00
jejo86
668597214f Improve documentation on becoming server admin (#13230)
* Improved section regarding server admin

Added steps describing how to elevate an existing user to administrator by manipulating a `postgres` database.

Signed-off-by: jejo86 28619134+jejo86@users.noreply.github.com

* Improved section regarding server admin

* Reference database settings

Add instructions to check database settings to find out the database name, instead of listing all available PostgreSQL databases.

* Add suggestions from PR conversation

Replace config filename `homeserver.yaml`. with "config file".
Remove instructions to switch to `postgres` user.
Add instructions how to connect to SQLite database.

* Update changelog.d/13230.doc

Co-authored-by: reivilibre <olivier@librepush.net>
2022-08-03 11:15:23 +01:00
Dirk Klimpel
fb7a2cc4cc Update doc for setting macaroon_secret_key (#13443)
* Update doc for setting `macaroon_secret_key`

* newsfile
2022-08-03 10:41:19 +01:00
Dirk Klimpel
d6e94ad9d9 Rename RateLimitConfig to RatelimitSettings (#13442) 2022-08-03 10:40:20 +01:00
Matt C
570bf32bbb Add module API method to resolve a room alias to a room ID (#13428)
Co-authored-by: MattC <buffless-matt@users.noreply.github.com>
Co-authored-by: Brendan Abolivier <babolivier@matrix.org>
2022-08-03 09:25:36 +00:00
Dirk Klimpel
5eccfdfafd Remove 'Contents' section from the Configuration Manual (#13438)
Fixes: #13053
2022-08-03 09:19:20 +00:00
Dirk Klimpel
ec6758d472 Fix wrong headline for url_preview_accept_language in docs (#13437)
Fixes: #13433
2022-08-03 09:41:57 +01:00
Eric Eastwood
b6f56656ab Use latested Twisted from source to fix contextvar issues causing OTEL Failed to detach context errors
See https://github.com/matrix-org/synapse/pull/13400#discussion_r936195492
2022-08-03 00:10:14 -05:00
Eric Eastwood
16d17f7553 Fix table missing column 2022-08-02 20:09:22 -05:00
Eric Eastwood
2491665ed9 Fix remnant 2022-08-02 15:19:28 -05:00
Eric Eastwood
5999132287 Fix lints 2022-08-02 15:12:33 -05:00
Eric Eastwood
c26fa2d0d1 Move to 72 schema version
Do as they tell us:
https://github.com/matrix-org/synapse/runs/7639487550?check_suite_focus=true
2022-08-02 15:10:01 -05:00
Eric Eastwood
72c718df54 Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts:
	docs/usage/configuration/config_documentation.md
	synapse/logging/opentracing.py

Got changes from:

 - https://github.com/matrix-org/synapse/pull/13362/files
2022-08-02 15:05:27 -05:00
Eric Eastwood
ba4a46a7fb Seems to (see test_side_by_side_spans) 2022-08-02 14:36:05 -05:00
Eric Eastwood
d72cacfb3e Add changelog 2022-08-02 14:32:45 -05:00
Eric Eastwood
fcc42208ae Update docs 2022-08-02 14:32:38 -05:00
Eric Eastwood
9d6fcf3ab9 Clean up some opentracing text references 2022-08-02 14:07:04 -05:00
Eric Eastwood
59facea792 Restore logging current_context (not sure why removed 2022-08-02 13:52:34 -05:00
Eric Eastwood
ad71bc39d6 End on exit is already the default expected behavior 2022-08-02 13:48:15 -05:00
Eric Eastwood
da396a2538 Add test for what happens when side by side spans in with statement 2022-08-02 13:43:06 -05:00
Eric Eastwood
b09651a00a Always return config path for config error 2022-08-02 13:31:23 -05:00
Eric Eastwood
fb0e8203ca More clear method names 2022-08-02 13:27:45 -05:00
Eric Eastwood
36d6648fad Remove type ignore comments
See https://github.com/matrix-org/synapse/pull/13400#discussion_r935887649
2022-08-02 13:22:58 -05:00
Eric Eastwood
0f93ec8d59 Fix lints 2022-08-02 12:49:57 -05:00
Eric Eastwood
dbd9005cd1 Revert crazy custom sampler and span process to try force tracing for users 2022-08-02 11:56:51 -05:00
Eric Eastwood
6bb7cb7166 Revert "Non-working try baggage to inherit force tracing/sampling"
This reverts commit d15fa457c9.
2022-08-02 11:43:28 -05:00
Eric Eastwood
d15fa457c9 Non-working try baggage to inherit force tracing/sampling 2022-08-02 11:43:17 -05:00
reivilibre
1c910e2216 Add a merge-back command to the release script, which automates merging the correct branches after a release. (#13393) 2022-08-02 15:56:28 +00:00
Sean Quah
8d317f6da5 Fix error when out of servers to sync partial state with (#13432)
so that we raise the intended error instead.

Signed-off-by: Sean Quah <seanq@matrix.org>
2022-08-02 12:12:44 +01:00
Olivier Wilkinson (reivilibre)
a2a867b521 Merge branch 'master' into develop 2022-08-02 11:56:02 +01:00
Olivier Wilkinson (reivilibre)
c2f4871226 Mention specific version in rc2 notes v1.64.0 2022-08-02 11:19:32 +01:00
Olivier Wilkinson (reivilibre)
cb209638ea Add upgrade notes 2022-08-02 11:10:26 +01:00
Olivier Wilkinson (reivilibre)
4e80ca2243 1.64.0 2022-08-02 11:04:08 +01:00
Eric Eastwood
b3cdbad985 PoC force tracing
Doesn't force tracing for the child spans yet
2022-08-02 02:36:56 -05:00
Eric Eastwood
6255a1a622 Fix tests and some lints 2022-08-01 19:07:11 -05:00
Eric Eastwood
00be06cfd9 Try to align read from edu content 2022-08-01 17:54:14 -05:00
Eric Eastwood
8e902b858d Remove what's left of scopemanager 2022-08-01 17:38:07 -05:00
Eric Eastwood
a9fb504dcd Implement start_active_span_from_edu for OTEL
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?
2022-08-01 17:23:19 -05:00
Eric Eastwood
33fd24e48c todos 2022-08-01 16:21:40 -05:00
Eric Eastwood
322da5137f Fix some lints 2022-08-01 14:42:13 -05:00
reivilibre
e17e5c97e0 Faster Room Joins: don't leave a stuck room partial state flag if the join fails. (#13403) 2022-08-01 16:45:39 +00:00
Patrick Cloke
f8e7a9418a Fix missing import in federation_event handler. (#13431)
#13404 removed an import of `Optional` which was still needed
due to #13413 added more usages.
2022-08-01 14:14:29 +00:00
Sean Quah
224d792dd7 Refactor _resolve_state_at_missing_prevs to return an EventContext (#13404)
Previously, `_resolve_state_at_missing_prevs` returned the resolved
state before an event and a partial state flag. These were unwieldy to
carry around would only ever be used to build an event context. Build
the event context directly instead.

Signed-off-by: Sean Quah <seanq@matrix.org>
2022-08-01 13:53:56 +01:00