diff --git a/poetry.lock b/poetry.lock index 5136eaebfe..5730c9135c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -539,12 +539,11 @@ version = "1.2.13" description = "Python @deprecated decorator to deprecate old python classes, functions or methods." optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -groups = ["main", "dev"] +groups = ["dev"] files = [ {file = "Deprecated-1.2.13-py2.py3-none-any.whl", hash = "sha256:64756e3e14c8c5eea9795d93c524551432a0be75629f8f29e67ab8caf076c76d"}, {file = "Deprecated-1.2.13.tar.gz", hash = "sha256:43ac5335da90c31c24ba028af536a91d41d53f9e6901ddb021bcc572ce44e38d"}, ] -markers = {main = "extra == \"opentracing-otlp\" or extra == \"opentelemetry-log-handler\" or extra == \"all\""} [package.dependencies] wrapt = ">=1.10,<2" @@ -1707,209 +1706,169 @@ nicer-shell = ["ipython"] [[package]] name = "opentelemetry-api" -version = "1.33.0.dev0" +version = "1.34.1" description = "OpenTelemetry Python API" optional = true -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["main"] markers = "extra == \"opentracing-otlp\" or extra == \"opentelemetry-log-handler\" or extra == \"all\"" -files = [] -develop = false +files = [ + {file = "opentelemetry_api-1.34.1-py3-none-any.whl", hash = "sha256:b7df4cb0830d5a6c29ad0c0691dbae874d8daefa934b8b1d642de48323d32a8c"}, + {file = "opentelemetry_api-1.34.1.tar.gz", hash = "sha256:64f0bd06d42824843731d05beea88d4d4b6ae59f9fe347ff7dfa2cc14233bbb3"}, +] [package.dependencies] -deprecated = ">=1.2.6" -importlib-metadata = ">=6.0,<8.7.0" - -[package.source] -type = "git" -url = "https://github.com/open-telemetry/opentelemetry-python" -reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -resolved_reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -subdirectory = "opentelemetry-api" +importlib-metadata = ">=6.0,<8.8.0" +typing-extensions = ">=4.5.0" [[package]] name = "opentelemetry-exporter-otlp" -version = "1.33.0.dev0" +version = "1.34.1" description = "OpenTelemetry Collector Exporters" optional = true -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["main"] markers = "extra == \"opentracing-otlp\" or extra == \"opentelemetry-log-handler\" or extra == \"all\"" -files = [] -develop = false +files = [ + {file = "opentelemetry_exporter_otlp-1.34.1-py3-none-any.whl", hash = "sha256:f4a453e9cde7f6362fd4a090d8acf7881d1dc585540c7b65cbd63e36644238d4"}, + {file = "opentelemetry_exporter_otlp-1.34.1.tar.gz", hash = "sha256:71c9ad342d665d9e4235898d205db17c5764cd7a69acb8a5dcd6d5e04c4c9988"}, +] [package.dependencies] -opentelemetry-exporter-otlp-proto-grpc = "1.33.0.dev" -opentelemetry-exporter-otlp-proto-http = "1.33.0.dev" - -[package.source] -type = "git" -url = "https://github.com/open-telemetry/opentelemetry-python" -reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -resolved_reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -subdirectory = "exporter/opentelemetry-exporter-otlp" +opentelemetry-exporter-otlp-proto-grpc = "1.34.1" +opentelemetry-exporter-otlp-proto-http = "1.34.1" [[package]] name = "opentelemetry-exporter-otlp-proto-common" -version = "1.33.0.dev0" +version = "1.34.1" description = "OpenTelemetry Protobuf encoding" optional = true -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["main"] markers = "extra == \"opentracing-otlp\" or extra == \"opentelemetry-log-handler\" or extra == \"all\"" -files = [] -develop = false +files = [ + {file = "opentelemetry_exporter_otlp_proto_common-1.34.1-py3-none-any.whl", hash = "sha256:8e2019284bf24d3deebbb6c59c71e6eef3307cd88eff8c633e061abba33f7e87"}, + {file = "opentelemetry_exporter_otlp_proto_common-1.34.1.tar.gz", hash = "sha256:b59a20a927facd5eac06edaf87a07e49f9e4a13db487b7d8a52b37cb87710f8b"}, +] [package.dependencies] -opentelemetry-proto = "1.33.0.dev" - -[package.source] -type = "git" -url = "https://github.com/open-telemetry/opentelemetry-python" -reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -resolved_reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -subdirectory = "exporter/opentelemetry-exporter-otlp-proto-common" +opentelemetry-proto = "1.34.1" [[package]] name = "opentelemetry-exporter-otlp-proto-grpc" -version = "1.33.0.dev0" +version = "1.34.1" description = "OpenTelemetry Collector Protobuf over gRPC Exporter" optional = true -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["main"] markers = "extra == \"opentracing-otlp\" or extra == \"opentelemetry-log-handler\" or extra == \"all\"" -files = [] -develop = false +files = [ + {file = "opentelemetry_exporter_otlp_proto_grpc-1.34.1-py3-none-any.whl", hash = "sha256:04bb8b732b02295be79f8a86a4ad28fae3d4ddb07307a98c7aa6f331de18cca6"}, + {file = "opentelemetry_exporter_otlp_proto_grpc-1.34.1.tar.gz", hash = "sha256:7c841b90caa3aafcfc4fee58487a6c71743c34c6dc1787089d8b0578bbd794dd"}, +] [package.dependencies] -deprecated = ">=1.2.6" googleapis-common-protos = ">=1.52,<2.0" grpcio = [ {version = ">=1.63.2,<2.0.0", markers = "python_version < \"3.13\""}, {version = ">=1.66.2,<2.0.0", markers = "python_version >= \"3.13\""}, ] opentelemetry-api = ">=1.15,<2.0" -opentelemetry-exporter-otlp-proto-common = "1.33.0.dev" -opentelemetry-proto = "1.33.0.dev" -opentelemetry-sdk = "==1.33.*" - -[package.source] -type = "git" -url = "https://github.com/open-telemetry/opentelemetry-python" -reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -resolved_reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -subdirectory = "exporter/opentelemetry-exporter-otlp-proto-grpc" +opentelemetry-exporter-otlp-proto-common = "1.34.1" +opentelemetry-proto = "1.34.1" +opentelemetry-sdk = ">=1.34.1,<1.35.0" +typing-extensions = ">=4.5.0" [[package]] name = "opentelemetry-exporter-otlp-proto-http" -version = "1.33.0.dev0" +version = "1.34.1" description = "OpenTelemetry Collector Protobuf over HTTP Exporter" optional = true -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["main"] markers = "extra == \"opentracing-otlp\" or extra == \"opentelemetry-log-handler\" or extra == \"all\"" -files = [] -develop = false +files = [ + {file = "opentelemetry_exporter_otlp_proto_http-1.34.1-py3-none-any.whl", hash = "sha256:5251f00ca85872ce50d871f6d3cc89fe203b94c3c14c964bbdc3883366c705d8"}, + {file = "opentelemetry_exporter_otlp_proto_http-1.34.1.tar.gz", hash = "sha256:aaac36fdce46a8191e604dcf632e1f9380c7d5b356b27b3e0edb5610d9be28ad"}, +] [package.dependencies] -deprecated = ">=1.2.6" googleapis-common-protos = ">=1.52,<2.0" opentelemetry-api = ">=1.15,<2.0" -opentelemetry-exporter-otlp-proto-common = "1.33.0.dev" -opentelemetry-proto = "1.33.0.dev" -opentelemetry-sdk = "==1.33.*" +opentelemetry-exporter-otlp-proto-common = "1.34.1" +opentelemetry-proto = "1.34.1" +opentelemetry-sdk = ">=1.34.1,<1.35.0" requests = ">=2.7,<3.0" - -[package.source] -type = "git" -url = "https://github.com/open-telemetry/opentelemetry-python" -reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -resolved_reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -subdirectory = "exporter/opentelemetry-exporter-otlp-proto-http" +typing-extensions = ">=4.5.0" [[package]] name = "opentelemetry-opentracing-shim" -version = "0.52b1" +version = "0.55b1" description = "OpenTracing Shim for OpenTelemetry" optional = true -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["main"] markers = "extra == \"opentracing-otlp\" or extra == \"all\"" files = [ - {file = "opentelemetry_opentracing_shim-0.52b1-py3-none-any.whl", hash = "sha256:60b20676dee90697c34da95cd04bd18f79f3a360268703de29e91da23b967baf"}, - {file = "opentelemetry_opentracing_shim-0.52b1.tar.gz", hash = "sha256:bf983fd738c44b816d7921c97b24cd8a0d4d482acb572d27f6b17cce7e27c7a6"}, + {file = "opentelemetry_opentracing_shim-0.55b1-py3-none-any.whl", hash = "sha256:f942e63357a42aa24d87c63632755ad565df8855b39049588f32a95ba4843268"}, + {file = "opentelemetry_opentracing_shim-0.55b1.tar.gz", hash = "sha256:efa33443b5ad5c1b7fed4134f2a474cd5cf7183db698104bf79de4df1cbc0c39"}, ] [package.dependencies] -deprecated = ">=1.2.6" opentelemetry-api = ">=1.3,<2.0" opentracing = ">=2.0,<3.0" +typing-extensions = ">=4.5.0" [[package]] name = "opentelemetry-proto" -version = "1.33.0.dev0" +version = "1.34.1" description = "OpenTelemetry Python Proto" optional = true -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["main"] markers = "extra == \"opentracing-otlp\" or extra == \"opentelemetry-log-handler\" or extra == \"all\"" -files = [] -develop = false +files = [ + {file = "opentelemetry_proto-1.34.1-py3-none-any.whl", hash = "sha256:eb4bb5ac27f2562df2d6857fc557b3a481b5e298bc04f94cc68041f00cebcbd2"}, + {file = "opentelemetry_proto-1.34.1.tar.gz", hash = "sha256:16286214e405c211fc774187f3e4bbb1351290b8dfb88e8948af209ce85b719e"}, +] [package.dependencies] protobuf = ">=5.0,<6.0" -[package.source] -type = "git" -url = "https://github.com/open-telemetry/opentelemetry-python" -reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -resolved_reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -subdirectory = "opentelemetry-proto" - [[package]] name = "opentelemetry-sdk" -version = "1.33.0.dev0" +version = "1.34.1" description = "OpenTelemetry Python SDK" optional = true -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["main"] markers = "extra == \"opentracing-otlp\" or extra == \"opentelemetry-log-handler\" or extra == \"all\"" -files = [] -develop = false +files = [ + {file = "opentelemetry_sdk-1.34.1-py3-none-any.whl", hash = "sha256:308effad4059562f1d92163c61c8141df649da24ce361827812c40abb2a1e96e"}, + {file = "opentelemetry_sdk-1.34.1.tar.gz", hash = "sha256:8091db0d763fcd6098d4781bbc80ff0971f94e260739aa6afe6fd379cdf3aa4d"}, +] [package.dependencies] -opentelemetry-api = "1.33.0.dev" -opentelemetry-semantic-conventions = "0.54b0.dev" -typing-extensions = ">=3.7.4" - -[package.source] -type = "git" -url = "https://github.com/open-telemetry/opentelemetry-python" -reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -resolved_reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -subdirectory = "opentelemetry-sdk" +opentelemetry-api = "1.34.1" +opentelemetry-semantic-conventions = "0.55b1" +typing-extensions = ">=4.5.0" [[package]] name = "opentelemetry-semantic-conventions" -version = "0.54b0.dev0" +version = "0.55b1" description = "OpenTelemetry Semantic Conventions" optional = true -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["main"] markers = "extra == \"opentracing-otlp\" or extra == \"opentelemetry-log-handler\" or extra == \"all\"" -files = [] -develop = false +files = [ + {file = "opentelemetry_semantic_conventions-0.55b1-py3-none-any.whl", hash = "sha256:5da81dfdf7d52e3d37f8fe88d5e771e191de924cfff5f550ab0b8f7b2409baed"}, + {file = "opentelemetry_semantic_conventions-0.55b1.tar.gz", hash = "sha256:ef95b1f009159c28d7a7849f5cbc71c4c34c845bb514d66adfdf1b3fff3598b3"}, +] [package.dependencies] -deprecated = ">=1.2.6" -opentelemetry-api = "1.33.0.dev" - -[package.source] -type = "git" -url = "https://github.com/open-telemetry/opentelemetry-python" -reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -resolved_reference = "742171e50c70f4a4540a01d2c6c3cbcf4882d810" -subdirectory = "opentelemetry-semantic-conventions" +opentelemetry-api = "1.34.1" +typing-extensions = ">=4.5.0" [[package]] name = "opentracing" @@ -3521,7 +3480,7 @@ version = "1.15.0" description = "Module for decorators, wrappers and monkey patching." optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" -groups = ["main", "dev"] +groups = ["dev"] files = [ {file = "wrapt-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ca1cccf838cd28d5a0883b342474c630ac48cac5df0ee6eacc9c7290f76b11c1"}, {file = "wrapt-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:e826aadda3cae59295b95343db8f3d965fb31059da7de01ee8d1c40a60398b29"}, @@ -3599,7 +3558,6 @@ files = [ {file = "wrapt-1.15.0-py3-none-any.whl", hash = "sha256:64b1df0f83706b4ef4cfb4fb0e4c2669100fd7ecacfb59e091fad300d4e04640"}, {file = "wrapt-1.15.0.tar.gz", hash = "sha256:d06730c6aed78cee4126234cf2d071e01b44b915e725a6cb439a879ec9754a3a"}, ] -markers = {main = "extra == \"opentracing-otlp\" or extra == \"opentelemetry-log-handler\" or extra == \"all\""} [[package]] name = "xmlschema" @@ -3735,14 +3693,14 @@ docs = ["Sphinx", "repoze.sphinx.autointerface"] test = ["zope.i18nmessageid", "zope.testing", "zope.testrunner"] [extras] -all = ["Pympler", "authlib", "hiredis", "jaeger-client", "lxml", "matrix-synapse-ldap3", "opentelemetry-api", "opentelemetry-exporter-otlp", "opentelemetry-exporter-otlp-proto-common", "opentelemetry-exporter-otlp-proto-grpc", "opentelemetry-exporter-otlp-proto-http", "opentelemetry-opentracing-shim", "opentelemetry-proto", "opentelemetry-sdk", "opentelemetry-semantic-conventions", "opentracing", "psycopg2", "psycopg2cffi", "psycopg2cffi-compat", "pyicu", "pysaml2", "sentry-sdk", "txredisapi"] +all = ["Pympler", "authlib", "hiredis", "jaeger-client", "lxml", "matrix-synapse-ldap3", "opentelemetry-api", "opentelemetry-exporter-otlp", "opentelemetry-opentracing-shim", "opentelemetry-sdk", "opentracing", "psycopg2", "psycopg2cffi", "psycopg2cffi-compat", "pyicu", "pysaml2", "sentry-sdk", "txredisapi"] cache-memory = ["Pympler"] jwt = ["authlib"] matrix-synapse-ldap3 = ["matrix-synapse-ldap3"] oidc = ["authlib"] -opentelemetry-log-handler = ["opentelemetry-api", "opentelemetry-exporter-otlp", "opentelemetry-exporter-otlp-proto-common", "opentelemetry-exporter-otlp-proto-grpc", "opentelemetry-exporter-otlp-proto-http", "opentelemetry-proto", "opentelemetry-sdk", "opentelemetry-semantic-conventions"] +opentelemetry-log-handler = ["opentelemetry-api", "opentelemetry-exporter-otlp", "opentelemetry-sdk"] opentracing-jaeger = ["jaeger-client", "opentracing"] -opentracing-otlp = ["opentelemetry-api", "opentelemetry-exporter-otlp", "opentelemetry-exporter-otlp-proto-common", "opentelemetry-exporter-otlp-proto-grpc", "opentelemetry-exporter-otlp-proto-http", "opentelemetry-opentracing-shim", "opentelemetry-proto", "opentelemetry-sdk", "opentelemetry-semantic-conventions", "opentracing"] +opentracing-otlp = ["opentelemetry-api", "opentelemetry-exporter-otlp", "opentelemetry-opentracing-shim", "opentelemetry-sdk", "opentracing"] postgres = ["psycopg2", "psycopg2cffi", "psycopg2cffi-compat"] redis = ["hiredis", "txredisapi"] saml2 = ["pysaml2"] @@ -3755,4 +3713,4 @@ user-search = ["pyicu"] [metadata] lock-version = "2.0" python-versions = "^3.9.0" -content-hash = "41edb614ba876855637e6a751863c321a224dc6eaf87d0d23d25acbcd1aa086c" +content-hash = "9cddb5bb28c92e68c591079ca798da49311deef8564311d10e214c74d39e2b58" diff --git a/pyproject.toml b/pyproject.toml index 83e6594626..ecb5f16248 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -251,17 +251,10 @@ Pympler = { version = "*", optional = true } parameterized = { version = ">=0.7.4", optional = true } idna = { version = ">=2.5", optional = true } pyicu = { version = ">=2.10.2", optional = true } -opentelemetry-api = { git = "https://github.com/open-telemetry/opentelemetry-python", rev = "742171e50c70f4a4540a01d2c6c3cbcf4882d810", subdirectory = "opentelemetry-api", optional = true } -opentelemetry-sdk = { git = "https://github.com/open-telemetry/opentelemetry-python", rev = "742171e50c70f4a4540a01d2c6c3cbcf4882d810", subdirectory = "opentelemetry-sdk", optional = true } -opentelemetry-opentracing-shim = { version = "^0.52b0", optional = true } -opentelemetry-exporter-otlp = { git = "https://github.com/open-telemetry/opentelemetry-python", rev = "742171e50c70f4a4540a01d2c6c3cbcf4882d810", subdirectory = "exporter/opentelemetry-exporter-otlp", optional = true } - -# The lines below and also the corresponding extra dependencies can be removed as soon as we switch to a released version of opentelemetry-python (1.32.0): -opentelemetry-exporter-otlp-proto-grpc = { git = "https://github.com/open-telemetry/opentelemetry-python", rev = "742171e50c70f4a4540a01d2c6c3cbcf4882d810", subdirectory = "exporter/opentelemetry-exporter-otlp-proto-grpc", optional = true } -opentelemetry-exporter-otlp-proto-http = { git = "https://github.com/open-telemetry/opentelemetry-python", rev = "742171e50c70f4a4540a01d2c6c3cbcf4882d810", subdirectory = "exporter/opentelemetry-exporter-otlp-proto-http", optional = true } -opentelemetry-exporter-otlp-proto-common = { git = "https://github.com/open-telemetry/opentelemetry-python", rev = "742171e50c70f4a4540a01d2c6c3cbcf4882d810", subdirectory = "exporter/opentelemetry-exporter-otlp-proto-common", optional = true } -opentelemetry-proto = { git = "https://github.com/open-telemetry/opentelemetry-python", rev = "742171e50c70f4a4540a01d2c6c3cbcf4882d810", subdirectory = "opentelemetry-proto", optional = true } -opentelemetry-semantic-conventions = { git = "https://github.com/open-telemetry/opentelemetry-python", rev = "742171e50c70f4a4540a01d2c6c3cbcf4882d810", subdirectory = "opentelemetry-semantic-conventions", optional = true } +opentelemetry-api = { version = "1.34.1", optional = true } +opentelemetry-sdk = { version = "1.34.1", optional = true } +opentelemetry-opentracing-shim = { version = "0.55b1", optional = true } +opentelemetry-exporter-otlp = { version = "1.34.1", optional = true } [tool.poetry.extras] # NB: Packages that should be part of `pip install matrix-synapse[all]` need to be specified @@ -276,8 +269,8 @@ oidc = ["authlib"] systemd = ["systemd-python"] url-preview = ["lxml"] sentry = ["sentry-sdk"] -opentracing-otlp = ["opentracing", "opentelemetry-api", "opentelemetry-sdk", "opentelemetry-opentracing-shim", "opentelemetry-exporter-otlp", "opentelemetry-exporter-otlp-proto-grpc", "opentelemetry-exporter-otlp-proto-http", "opentelemetry-exporter-otlp-proto-common", "opentelemetry-proto", "opentelemetry-semantic-conventions"] -opentelemetry-log-handler = ["opentelemetry-api", "opentelemetry-sdk", "opentelemetry-exporter-otlp", "opentelemetry-exporter-otlp-proto-grpc", "opentelemetry-exporter-otlp-proto-http", "opentelemetry-exporter-otlp-proto-common", "opentelemetry-proto", "opentelemetry-semantic-conventions"] +opentracing-otlp = ["opentracing", "opentelemetry-api", "opentelemetry-sdk", "opentelemetry-opentracing-shim", "opentelemetry-exporter-otlp"] +opentelemetry-log-handler = ["opentelemetry-api", "opentelemetry-sdk", "opentelemetry-exporter-otlp"] opentracing-jaeger = ["opentracing", "jaeger-client"] jwt = ["authlib"] # hiredis is not a *strict* dependency, but it makes things much faster. @@ -324,7 +317,7 @@ all = [ # improved user search "pyicu", # opentracing-otlp (superset of opentelemetry-log-handler) - "opentelemetry-api", "opentelemetry-sdk", "opentelemetry-opentracing-shim", "opentelemetry-exporter-otlp", "opentelemetry-exporter-otlp-proto-grpc", "opentelemetry-exporter-otlp-proto-http", "opentelemetry-exporter-otlp-proto-common", "opentelemetry-proto", "opentelemetry-semantic-conventions", + "opentelemetry-api", "opentelemetry-sdk", "opentelemetry-opentracing-shim", "opentelemetry-exporter-otlp", # omitted: # - test: it's useful to have this separate from dev deps in the olddeps job # - systemd: this is a system-based requirement