Skip to content

Fix no active span when trying to log tracing error on startup #18959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MadLittleMods merged 3 commits into from
Sep 24, 2025
Merged

Fix no active span when trying to log tracing error on startup #18959

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a6dd66
Fix `no active span when trying to log` error on startup
MadLittleMods Sep 23, 2025
d7b86b4
Merge branch 'develop' into madlittlemods/fix-no-active-span-on-error…
MadLittleMods Sep 23, 2025
8636c95
Add changelog
MadLittleMods Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions synapse/app/_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
from synapse.handlers.auth import load_legacy_password_auth_providers
from synapse.http.site import SynapseSite
from synapse.logging.context import LoggingContext, PreserveLoggingContext
from synapse.logging.opentracing import init_tracer
from synapse.metrics import install_gc_manager, register_threadpool
from synapse.metrics.background_process_metrics import run_as_background_process
from synapse.metrics.jemalloc import setup_jemalloc_stats
Expand Down Expand Up @@ -574,9 +573,6 @@ def run_sighup(*args: Any, **kwargs: Any) -> None:
# Load the certificate from disk.
refresh_certificate(hs)

# Start the tracer
init_tracer(hs) # noqa

# Instantiate the modules so they can register their web resources to the module API
# before we start the listeners.
module_api = hs.get_module_api()
Expand Down
4 changes: 4 additions & 0 deletions synapse/app/generic_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
from synapse.federation.transport.server import TransportLayerServer
from synapse.http.server import JsonResource, OptionsResource
from synapse.logging.context import LoggingContext
from synapse.logging.opentracing import init_tracer
from synapse.metrics import METRICS_PREFIX, MetricsResource, RegistryProxy
from synapse.replication.http import REPLICATION_PREFIX, ReplicationRestResource
from synapse.rest import ClientRestResource, admin
Expand Down Expand Up @@ -359,6 +360,9 @@ def start(config: HomeServerConfig) -> None:

setup_logging(hs, config, use_worker_options=True)

# Start the tracer
init_tracer(hs) # noqa
Comment on lines +363 to +364
Copy link
Copy Markdown
Contributor Author

@MadLittleMods MadLittleMods Sep 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We setup tracing next to setup_logging which I think makes sense (early on)


try:
hs.setup()

Expand Down
8 changes: 6 additions & 2 deletions synapse/app/homeserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
from twisted.web.server import GzipEncoderFactory

import synapse
import synapse.config.logger
from synapse import events
from synapse.api.urls import (
CLIENT_API_PREFIX,
Expand All @@ -50,6 +49,7 @@
)
from synapse.config._base import ConfigError, format_config_error
from synapse.config.homeserver import HomeServerConfig
from synapse.config.logger import setup_logging
from synapse.config.server import ListenerConfig, TCPListenerConfig
from synapse.federation.transport.server import TransportLayerServer
from synapse.http.additional_resource import AdditionalResource
Expand All @@ -60,6 +60,7 @@
StaticResource,
)
from synapse.logging.context import LoggingContext
from synapse.logging.opentracing import init_tracer
from synapse.metrics import METRICS_PREFIX, MetricsResource, RegistryProxy
from synapse.replication.http import REPLICATION_PREFIX, ReplicationRestResource
from synapse.rest import ClientRestResource, admin
Expand Down Expand Up @@ -385,7 +386,10 @@ def setup(config: HomeServerConfig) -> SynapseHomeServer:
version_string=f"Synapse/{VERSION}",
)

synapse.config.logger.setup_logging(hs, config, use_worker_options=False)
setup_logging(hs, config, use_worker_options=False)

# Start the tracer
init_tracer(hs) # noqa

logger.info("Setting up server")

Expand Down
Loading
⚡