From 16d17f75531ea6aabe9a61c33a27ae185bacc0d2 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Tue, 2 Aug 2022 20:09:22 -0500 Subject: Fix table missing column --- docs/usage/configuration/config_documentation.md | 5 ++++- synapse/storage/schema/__init__.py | 4 ++-- .../72/04rename_opentelemtetry_tracing_context.sql | 18 ++++++++++++++++++ .../73/01rename_opentelemtetry_tracing_context.sql | 17 ----------------- 4 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 synapse/storage/schema/main/delta/72/04rename_opentelemtetry_tracing_context.sql delete mode 100644 synapse/storage/schema/main/delta/73/01rename_opentelemtetry_tracing_context.sql diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md index ab408814d0..100f95776b 100644 --- a/docs/usage/configuration/config_documentation.md +++ b/docs/usage/configuration/config_documentation.md @@ -3604,7 +3604,10 @@ tracing: jaeger_exporter_config: agent_host_name: localhost agent_port: 6831 - collector_endpoint: "http://localhost:14268/api/traces?format=jaeger.thrift" + # Split UDP packets so they fit within the limit (UDP_PACKET_MAX_LENGTH is set to 65k in OpenTelemetry) + udp_split_oversized_batches: true + # If you define a collector, it will communicate directly to the collector, bypassing the agent + #collector_endpoint: "http://localhost:14268/api/traces?format=jaeger.thrift" ``` --- ## Workers ## diff --git a/synapse/storage/schema/__init__.py b/synapse/storage/schema/__init__.py index d1c462a30f..dd187f7422 100644 --- a/synapse/storage/schema/__init__.py +++ b/synapse/storage/schema/__init__.py @@ -75,8 +75,8 @@ Changes in SCHEMA_VERSION = 71: Changes in SCHEMA_VERSION = 72: - event_edges.(room_id, is_state) are no longer written to. - Tables related to groups are dropped. - - Rename column in `device_lists_outbound_pokes` from `opentracing_context` to - generalized `tracing_context`. + - Rename column in `device_lists_outbound_pokes` and `device_lists_changes_in_room` + from `opentracing_context` to generalized `tracing_context`. """ diff --git a/synapse/storage/schema/main/delta/72/04rename_opentelemtetry_tracing_context.sql b/synapse/storage/schema/main/delta/72/04rename_opentelemtetry_tracing_context.sql new file mode 100644 index 0000000000..ae904863f8 --- /dev/null +++ b/synapse/storage/schema/main/delta/72/04rename_opentelemtetry_tracing_context.sql @@ -0,0 +1,18 @@ +/* Copyright 2021 The Matrix.org Foundation C.I.C + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +-- Rename to generalized `tracing_context` since we're moving from opentracing to opentelemetry +ALTER TABLE device_lists_outbound_pokes RENAME COLUMN opentracing_context TO tracing_context; +ALTER TABLE device_lists_changes_in_room RENAME COLUMN opentracing_context TO tracing_context; diff --git a/synapse/storage/schema/main/delta/73/01rename_opentelemtetry_tracing_context.sql b/synapse/storage/schema/main/delta/73/01rename_opentelemtetry_tracing_context.sql deleted file mode 100644 index f8c333011d..0000000000 --- a/synapse/storage/schema/main/delta/73/01rename_opentelemtetry_tracing_context.sql +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 The Matrix.org Foundation C.I.C - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --- Rename to generalized `tracing_context` since we're moving from opentracing to opentelemetry -ALTER TABLE device_lists_outbound_pokes RENAME COLUMN opentracing_context TO tracing_context; -- cgit 1.5.1