Commit graph

93 commits

Author SHA1 Message Date
Eric Eastwood
b86869feef Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts:
	.github/workflows/tests.yml
	poetry.lock
	synapse/storage/schema/__init__.py
2022-09-20 18:00:28 -05:00
Olivier Wilkinson (reivilibre)
e124b24ad9 1.68.0rc1 2022-09-20 11:30:48 +01:00
Andrew Morgan
918c74bfb5
Add a MXCUri class to make working with mxc uri's easier. (#13162) 2022-09-15 12:57:16 +00:00
Eric Eastwood
15e242eeaa OTEL install with DMR 2022-09-13 08:54:18 -05:00
Erik Johnston
9772e362aa Merge branch 'master' into develop 2022-09-13 12:11:53 +01:00
Erik Johnston
4b678b20a2 1.67.0 2022-09-13 09:20:28 +01:00
Eric Eastwood
f73bc59d25 Try to resolve poetry deps 2022-09-09 17:02:40 -05:00
Eric Eastwood
50f0342594 Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
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
2022-09-09 16:28:05 -05:00
Erik Johnston
c9b7e97355
Add a stub Rust crate (#12595) 2022-09-06 19:01:37 +01:00
Erik Johnston
3d20115115
Fix trial-olddeps (#13725) 2022-09-06 14:21:55 +00:00
Erik Johnston
cdf7fb737b 1.67.0rc1 2022-09-06 09:01:26 +01:00
Sean Quah
ef88bc0775 1.66.0 2022-08-31 11:21:09 +01:00
David Robertson
8f6aa015a8
1.66.0rc2 2022-08-30 12:25:44 +01:00
David Robertson
f0b23927fc
1.66.0rc1 2022-08-23 09:49:51 +01:00
Eric Eastwood
8def7e4b4b Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
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
2022-08-18 16:33:22 -05:00
Andrew Morgan
5ace5d7b15 Merge branch 'master' into develop 2022-08-16 17:32:20 +01:00
Andrew Morgan
738c11729a 1.65.0 2022-08-16 16:52:07 +01:00
David Robertson
d642ce4b32
Use Pydantic to systematically validate a first batch of endpoints in synapse.rest.client.account. (#13188) 2022-08-15 19:05:57 +00:00
Olivier Wilkinson (reivilibre)
7a25b4302c 1.65.0rc2 2022-08-11 11:40:40 +01:00
Eric Eastwood
7024d7b86e Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts:
	synapse/logging/opentracing.py
	tests/logging/test_opentracing.py
2022-08-09 14:46:03 -05:00
Olivier Wilkinson (reivilibre)
827f0669bf 1.65.0rc1 2022-08-09 11:43:30 +01:00
Eric Eastwood
756637501f Try fix Twisted/treq problems
See https://github.com/matrix-org/synapse/pull/13400#discussion_r937213304
2022-08-04 01:41:56 -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
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
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
Olivier Wilkinson (reivilibre)
4e80ca2243 1.64.0 2022-08-02 11:04:08 +01:00
Richard van der Hoff
6b4fd8b430 1.64.0rc2 2022-07-29 12:23:13 +01:00
Eric Eastwood
242817213e Export to Jaeger (things are showing up) 2022-07-27 02:36:10 -05:00
Eric Eastwood
6984cefa79 Progress towards OTEL 2022-07-27 00:55:43 -05:00
Eric Eastwood
2fe6911957 Some shim and some new 2022-07-26 21:53:11 -05:00
Eric Eastwood
0cc610ecbe Migrate to OpenTelemetry tracing
See https://github.com/matrix-org/synapse/issues/11850
2022-07-26 18:44:21 -05:00
Olivier Wilkinson (reivilibre)
641412decd 1.64.0rc1 2022-07-26 12:12:22 +01:00
Erik Johnston
d3995049a8 Merge remote-tracking branch 'origin/master' into develop 2022-07-20 14:59:43 +01:00
Erik Johnston
93740cae57 1.63.1 2022-07-20 13:37:00 +01:00
Brendan Abolivier
47822fd2e8
Merge branch 'master' into develop 2022-07-19 16:14:02 +02:00
Brendan Abolivier
097afd0e0b 1.63.0 2022-07-19 14:43:28 +02:00
Brendan Abolivier
8c60c572f0
Up the dependency on canonicaljson to ^1.5.0 (#13172)
Co-authored-by: David Robertson <davidr@element.io>
2022-07-18 17:30:59 +02:00
Sean Quah
6173d585df 1.63.0rc1 2022-07-12 11:26:25 +01:00
David Robertson
cf63d57dce
1.62.0 2022-07-05 11:14:27 +01:00
Andrew Morgan
046d87756b 1.62.0rc3 2022-07-04 16:16:47 +01:00
Andrew Morgan
d40b2708cf 1.62.0rc2 2022-07-01 11:42:57 +01:00
Andrew Morgan
b210146fd9 1.62.0rc1 2022-06-28 16:42:44 +01:00
Andrew Morgan
6cba6a51af Merge branch 'master' into develop 2022-06-28 15:19:48 +01:00
Andrew Morgan
ea10cdbea7 1.61.1 2022-06-28 14:37:35 +01:00
David Robertson
f33356e8f8
Use caret (semver bounds) for matrix.org packages (#13082) 2022-06-17 19:07:04 +01:00
Hannes Lerchl
7d99414edf
Replace pyjwt with authlib in org.matrix.login.jwt (#13011) 2022-06-15 16:45:16 +00:00
Erik Johnston
de334ac183
Add a CI job to check that schema deltas are in the correct folder. (#13063) 2022-06-15 16:27:18 +01:00
Erik Johnston
5d139f578d Merge branch 'release-v1.61' into develop 2022-06-14 12:00:02 +01:00
Erik Johnston
d580014e22 1.61.0 2022-06-14 11:44:27 +01:00