summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-07-18 15:06:54 +0100
committerGitHub <noreply@github.com>2019-07-18 15:06:54 +0100
commit82345bc09a9980de58c13a18b489403237acf4bd (patch)
treeb254a761e4e9553899f7fe9afaf275b81e793e99 /changelog.d
parentSupport Prometheus_client 0.4.0+ (#5636) (diff)
downloadsynapse-82345bc09a9980de58c13a18b489403237acf4bd.tar.xz
Clean up opentracing configuration options (#5712)
Clean up config settings and dead code.

This is mostly about cleaning up the config format, to bring it into line with our conventions. In particular:
 * There should be a blank line after `## Section ##' headings
 * There should be a blank line between each config setting
 * There should be a `#`-only line between a comment and the setting it describes
 * We don't really do the `#  #` style commenting-out of whole sections if we can help it
 * rename `tracer_enabled` to `enabled`

While we're here, do more config parsing upfront, which makes it easier to use
later on.

Also removes redundant code from LogContextScopeManager.

Also changes the changelog fragment to a `feature` - it's exciting!
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/5544.feature2
-rw-r--r--changelog.d/5544.misc1
-rw-r--r--changelog.d/5712.feature2
3 files changed, 4 insertions, 1 deletions
diff --git a/changelog.d/5544.feature b/changelog.d/5544.feature
new file mode 100644
index 0000000000..7d3459129d
--- /dev/null
+++ b/changelog.d/5544.feature
@@ -0,0 +1,2 @@
+Add support for opentracing.
+
diff --git a/changelog.d/5544.misc b/changelog.d/5544.misc
deleted file mode 100644
index 81d6f74c31..0000000000
--- a/changelog.d/5544.misc
+++ /dev/null
@@ -1 +0,0 @@
-Added opentracing and configuration options.
diff --git a/changelog.d/5712.feature b/changelog.d/5712.feature
new file mode 100644
index 0000000000..7d3459129d
--- /dev/null
+++ b/changelog.d/5712.feature
@@ -0,0 +1,2 @@
+Add support for opentracing.
+