mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-22 12:44:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
14838 commits 936 branches 734 tags 467 MiB
Commit graph

14838 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Morgan
f16aa3a44b Merge branch 'master' into develop 2019-07-25 15:19:22 +01:00
Andrew Morgan
c0a1301ccd 1.2.0 2019-07-25 14:10:32 +01:00
Andrew Morgan
baf081cd3b Bugfixes 
--------
 
 - Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734))
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCgAxFiEEgQG31Z317NrSMt0QiISIDS7+X/QFAl04Ur0THGFuZHJld0Bh
 bW9yZ2FuLnh5egAKCRCIhIgNLv5f9F4oD/0TY6S/SEd2uAmzor64ojmbX5BOwPzf
 j/wzUTrfvuf40EvkNPDpnejNZSvy/ysbaGQaQusv0SQKlV3xrvdn4RuMvnOWVWck
 kBsO+lvzOaUTR0KHDxN4y9F5eI2NdPbub4847PPVzyqSIHAd+kolxXS8kSBBhwpL
 yfaICWV/AOy5L7xN+JZ9IQpnegVAvUj5DmgXzDHd6VdeiHDVJuARaBgrR5uCkwVS
 ZoLRqZ95XV/qiguMAUvPOwyEqht2mwO64989MswP16YYm8oMkB5QA6I5nYnACsTP
 qk9YcN/oNvEfQXUhttku6MxK1/4yUMPUhEoDBDH7ebc0440QDtWN+IHTdA6oPVZB
 IuStL9YGY16m7Ltx37ZUA4URfNMiSeLHo3zKc/mCAcwxN4HyOjJewtxbG5zKQAOZ
 SMs8UcDwGR4zL1hnt8ZDNYtWwfzJBQIdGjoHvjXJEY7/1csTv2lmAwewFTXiqSAr
 30GW5ews94kotqBK53zZT6V0F5gHNqgGHniOz1ZpqLLxYLqO3LSAGe97CrqlWUdX
 GkhA9tZyweknociD9fyyBmKdcFJ4mL4a+oGI5CMnSMph8UvCY8Y5XMb1T+iYEABI
 tA9G3mBvgkLPj+5V+8QggNkBafSigW2Q4FX7enGsDmiiskZOtfeKrAcVkapD4ooi
 3I7IW5aetZr2IQ==
 =+JBn
 -----END PGP SIGNATURE-----

Merge tag 'v1.2.0rc2' into develop

Bugfixes
--------

- Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734))
 2019-07-24 13:47:51 +01:00
Andrew Morgan
2d573e2e2b 1.2.0rc2 2019-07-24 13:43:40 +01:00
Erik Johnston
2276936bac
Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch 
Log when we receive receipt from a different origin
 2019-07-24 13:27:57 +01:00
Richard van der Hoff
f30a71a67b
Stop trying to fetch events with event_id=None. (#5753) 
`None` is not a valid event id, so queuing up a database fetch for it seems
like a silly thing to do.

I considered making `get_event` return `None` if `event_id is None`, but then
its interaction with `allow_none` seemed uninituitive, and strong typing ftw.
 2019-07-24 13:16:18 +01:00
Jorik Schellekens
cf2972c818
Fix servlet metric names (#5734) 
* Fix servlet metric names

Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>

* Remove redundant check

* Cover all return paths
 2019-07-24 13:07:35 +01:00
Erik Johnston
c159803067 Newsfile 2019-07-24 11:51:44 +01:00
Erik Johnston
0c4a99607e Remove join when calculating room summaries. 2019-07-24 11:49:15 +01:00
Erik Johnston
62921fb53e Remove join on room_memberships when fetching rooms for user. 2019-07-24 11:45:58 +01:00
Erik Johnston
32768e96d4 Add function to get all forgotten rooms for user 
This will allow us to efficiently filter out rooms that have been
forgotten in other queries without having to join against the
`room_memberships` table.
 2019-07-24 11:44:23 +01:00
Richard van der Hoff
418635e68a
Add a prometheus metric for active cache lookups. (#5750) 
* Add a prometheus metric for active cache lookups.

* changelog
 2019-07-24 11:33:13 +01:00
Erik Johnston
adcd5368b0 Newsfile 2019-07-23 17:00:24 +01:00
Erik Johnston
73bbaf2bc6 Add unit test for current state membership bg update 2019-07-23 17:00:22 +01:00
Jorik Schellekens
1801578795 Use unified trace method 2019-07-23 16:06:33 +01:00
Jorik Schellekens
beea2e31b9 I wish python had a good type system. 2019-07-23 16:06:33 +01:00
Jorik Schellekens
d395650bcf Use better decorator names. 2019-07-23 16:06:33 +01:00
Jorik Schellekens
cffba280de Trailing .d 2019-07-23 16:06:33 +01:00
Jorik Schellekens
d26cbb4e23 Unbreak json parsing. 2019-07-23 16:06:33 +01:00
Jorik Schellekens
6944c994a5 Make sure there is an active span here. 2019-07-23 16:06:33 +01:00
Jorik Schellekens
30738e978e newsfile 2019-07-23 16:06:33 +01:00
Jorik Schellekens
4824e30810 Add user _id 2019-07-23 16:06:33 +01:00
Jorik Schellekens
e49487fc91 Better args wrapper 2019-07-23 16:05:58 +01:00
Jorik Schellekens
ab191f99f9 A little extra device_list tracing 2019-07-23 16:05:58 +01:00
Jorik Schellekens
a293759d8c Though style is subjective it depends on a ruthless objectivity: you either have it, or you don't· 2019-07-23 16:05:58 +01:00
Jorik Schellekens
d44f303fe0 Isort of ran out of puns for this one. 2019-07-23 16:05:58 +01:00
Jorik Schellekens
2fd49cedbb Nicer tracing 2019-07-23 16:05:58 +01:00
Jorik Schellekens
d4bdc2ba80 Trace key claiming 2019-07-23 16:05:58 +01:00
Jorik Schellekens
794c9e2a75 Cleanup key upload tracing 2019-07-23 16:05:58 +01:00
Jorik Schellekens
01229a4af9 Clean up room key tracing 2019-07-23 16:05:21 +01:00
Jorik Schellekens
1ed790d67a Some tracing 2019-07-23 16:05:21 +01:00
Jorik Schellekens
957cd77e95 Opentracing across streams 2019-07-23 16:05:21 +01:00
Jorik Schellekens
bfc50050fd The great logging/ migration 2019-07-23 16:05:20 +01:00
Jorik Schellekens
7ae7e796ff These functions were not deferreds! 2019-07-23 16:04:02 +01:00
Jorik Schellekens
d9f0c7ff47 How did that half of the statement get deleted? 2019-07-23 16:04:02 +01:00
Jorik Schellekens
28113ad335 typo 2019-07-23 16:04:02 +01:00
Jorik Schellekens
d94897e818 Include servletname in incoming-request trace 2019-07-23 16:04:02 +01:00
Jorik Schellekens
21940cadf0 Update to new access pattern 2019-07-23 16:04:02 +01:00
Jorik Schellekens
c988c02c7c Trace device messages. 2019-07-23 16:01:06 +01:00
Jorik Schellekens
fd669e5e44 Trace devices 2019-07-23 16:00:46 +01:00
Jorik Schellekens
d876cda725 Trace more e2e stuff and less e2e stuff 2019-07-23 15:59:23 +01:00
Jorik Schellekens
1e7099d04c Fix e2e bugs 2019-07-23 15:59:23 +01:00
Jorik Schellekens
565544b603 Trace e2e 2019-07-23 15:59:23 +01:00
Jorik Schellekens
823c34a940 One tracing decorator to rule them all. 2019-07-23 15:56:29 +01:00
Jorik Schellekens
3641784e8c
Make Jaeger fully configurable (#5694) 
* Allow Jaeger to be configured

* Update sample config
 2019-07-23 15:46:04 +01:00
Erik Johnston
65afc535a6
Update changelog.d/5743.bugfix 
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
 2019-07-23 15:14:21 +01:00
Amber Brown
4806651744
Replace returnValue with return (#5736) 2019-07-23 23:00:55 +10:00
Erik Johnston
fadfde9aaa Newsfile 2019-07-23 13:32:37 +01:00
Jorik Schellekens
18a466b84e
Opentracing Utils (#5722) 
* Add decerators for tracing functions

* Use the new clean contexts

* Context and edu utils

* Move opentracing setters

* Move whitelisting

* Sectioning comments

* Better args wrapper

* Docstrings

Co-Authored-By: Erik Johnston <erik@matrix.org>

* Remove unused methods.

* Don't use global

* One tracing decorator to rule them all.
 2019-07-23 13:31:16 +01:00
Erik Johnston
3db1377b26 Log when we receive receipt from a different origin 2019-07-23 13:31:03 +01:00