Skip to content

[KYUUBI #6615] Make Jetty sending server version in response configurable #6685

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

Closed
wants to merge 1 commit into from
+15 −2
Closed

[KYUUBI #6615] Make Jetty sending server version in response configurable #6685

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions kyuubi-metrics/src/main/scala/org/apache/kyuubi/metrics/PrometheusReporterService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ import com.codahale.metrics.MetricRegistry
import io.prometheus.client.CollectorRegistry
import io.prometheus.client.dropwizard.DropwizardExports
import io.prometheus.client.exporter.MetricsServlet
import org.eclipse.jetty.server.Server
import org.eclipse.jetty.server.{HttpConfiguration, HttpConnectionFactory, Server, ServerConnector}
import org.eclipse.jetty.servlet.{ServletContextHandler, ServletHolder}

import org.apache.kyuubi.KyuubiException
import org.apache.kyuubi.config.KyuubiConf
import org.apache.kyuubi.config.KyuubiConf.FRONTEND_JETTY_SEND_VERSION_ENABLED
import org.apache.kyuubi.service.AbstractService

class PrometheusReporterService(registry: MetricRegistry)
Expand All @@ -35,12 +36,21 @@ class PrometheusReporterService(registry: MetricRegistry)

// VisibleForTesting
private[metrics] var httpServer: Server = _
private[metrics] var httpServerConnector: ServerConnector = _
@volatile protected var isStarted = false

override def initialize(conf: KyuubiConf): Unit = {
val port = conf.get(MetricsConf.METRICS_PROMETHEUS_PORT)
val contextPath = conf.get(MetricsConf.METRICS_PROMETHEUS_PATH)
httpServer = new Server(port)
val jettyVersionEnabled = conf.get(FRONTEND_JETTY_SEND_VERSION_ENABLED)

val httpConf = new HttpConfiguration()
httpConf.setSendServerVersion(jettyVersionEnabled)
httpServer = new Server()
httpServerConnector = new ServerConnector(httpServer, new HttpConnectionFactory(httpConf))
httpServerConnector.setPort(port)
httpServer.addConnector(httpServerConnector)

val context = new ServletContextHandler
context.setContextPath("/")
httpServer.setHandler(context)
Expand All @@ -56,6 +66,7 @@ class PrometheusReporterService(registry: MetricRegistry)
if (!isStarted) {
try {
httpServer.start()
httpServerConnector.start()
info(s"Prometheus metrics HTTP server has started at ${httpServer.getURI}.")
} catch {
case rethrow: Exception =>
Expand All @@ -78,12 +89,14 @@ class PrometheusReporterService(registry: MetricRegistry)
private def stopHttpServer(): Unit = {
if (httpServer != null) {
try {
httpServerConnector.stop()
httpServer.stop()
info("Prometheus metrics HTTP server has stopped.")
} catch {
case err: Exception => error("Cannot safely stop prometheus metrics HTTP server", err)
} finally {
httpServer = null
httpServerConnector = null
}
}
}
Expand Down
Loading