Skip to content

Commit 8d0d371

Browse files
committed
feat(query): inject metricsStorage into UI capabilities
Signed-off-by: hharshhsaini <sainiharsh3311@gmail.com>
1 parent 34cc220 commit 8d0d371

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

cmd/jaeger/internal/extension/jaegerquery/internal/server.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,9 @@ func initRouter(
191191
http.Error(w, "404 page not found", http.StatusNotFound)
192192
})
193193

194-
staticHandlerCloser := RegisterStaticHandler(r, telset.Logger, queryOpts, querySvc.GetCapabilities())
194+
caps := querySvc.GetCapabilities()
195+
caps.MetricsStorage = metricsQuerySvc != nil
196+
staticHandlerCloser := RegisterStaticHandler(r, telset.Logger, queryOpts, caps)
195197

196198
var handler http.Handler = r
197199
if queryOpts.BearerTokenPropagation {

cmd/jaeger/internal/extension/jaegerquery/internal/static_handler_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func TestRegisterStaticHandler(t *testing.T) {
7676
logAccess: true,
7777
UIConfigPath: "",
7878
expectedUIConfig: "JAEGER_CONFIG=DEFAULT_CONFIG;",
79-
expectedStorageCapabilities: `JAEGER_STORAGE_CAPABILITIES = {"archiveStorage":false};`,
79+
expectedStorageCapabilities: `JAEGER_STORAGE_CAPABILITIES = {"archiveStorage":false,"metricsStorage":false};`,
8080
},
8181
{
8282
basePath: "/",
@@ -85,7 +85,7 @@ func TestRegisterStaticHandler(t *testing.T) {
8585
expectedBaseHTML: `<base href="/"`,
8686
UIConfigPath: "fixture/ui-config.json",
8787
expectedUIConfig: `JAEGER_CONFIG = {"x":"y"};`,
88-
expectedStorageCapabilities: `JAEGER_STORAGE_CAPABILITIES = {"archiveStorage":false};`,
88+
expectedStorageCapabilities: `JAEGER_STORAGE_CAPABILITIES = {"archiveStorage":false,"metricsStorage":false};`,
8989
},
9090
{
9191
basePath: "/jaeger",
@@ -95,7 +95,7 @@ func TestRegisterStaticHandler(t *testing.T) {
9595
archiveStorage: true,
9696
UIConfigPath: "fixture/ui-config.js",
9797
expectedUIConfig: "function UIConfig(){",
98-
expectedStorageCapabilities: `JAEGER_STORAGE_CAPABILITIES = {"archiveStorage":true};`,
98+
expectedStorageCapabilities: `JAEGER_STORAGE_CAPABILITIES = {"archiveStorage":true,"metricsStorage":false};`,
9999
},
100100
}
101101
httpClient = &http.Client{

cmd/jaeger/internal/extension/jaegerquery/querysvc/service.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ type QueryServiceOptions struct {
3838
// StorageCapabilities is a feature flag for query service
3939
type StorageCapabilities struct {
4040
ArchiveStorage bool `json:"archiveStorage"`
41+
MetricsStorage bool `json:"metricsStorage"`
4142
// TODO: Maybe add metrics Storage here
4243
// SupportRegex bool
4344
// SupportTagFilter bool

0 commit comments

Comments
 (0)