From 93b95c3b930ce6d394685d0c904ca4389da4c32c Mon Sep 17 00:00:00 2001 From: Mahad Zaryab Date: Mon, 16 Dec 2024 19:57:31 -0500 Subject: [PATCH 1/3] Get xconfighttp Package Signed-off-by: Mahad Zaryab --- go.mod | 7 ++++--- go.sum | 10 ++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index c9dab8c2d47..1a82add6701 100644 --- a/go.mod +++ b/go.mod @@ -50,6 +50,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.116.0 go.opentelemetry.io/collector/config/configgrpc v0.116.0 go.opentelemetry.io/collector/config/confighttp v0.116.0 + go.opentelemetry.io/collector/config/confighttp/xconfighttp v0.116.0 go.opentelemetry.io/collector/config/configretry v1.22.0 go.opentelemetry.io/collector/config/configtls v1.22.0 go.opentelemetry.io/collector/confmap v1.22.0 @@ -208,7 +209,7 @@ require ( github.com/openzipkin/zipkin-go v0.4.3 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect - github.com/pierrec/lz4/v4 v4.1.21 // indirect + github.com/pierrec/lz4/v4 v4.1.22 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect @@ -239,7 +240,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.22.0 // indirect go.opentelemetry.io/collector/config/confignet v1.22.0 go.opentelemetry.io/collector/config/configopaque v1.22.0 - go.opentelemetry.io/collector/config/configtelemetry v0.116.0 + go.opentelemetry.io/collector/config/configtelemetry v0.116.0 // indirect go.opentelemetry.io/collector/config/internal v0.116.0 // indirect go.opentelemetry.io/collector/exporter/debugexporter v0.116.0 go.opentelemetry.io/collector/extension/auth v0.116.0 // indirect @@ -268,7 +269,7 @@ require ( golang.org/x/text v0.21.0 // indirect gonum.org/v1/gonum v0.15.1 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index b5ca2831cff..db7668dded6 100644 --- a/go.sum +++ b/go.sum @@ -474,8 +474,8 @@ github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= -github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU= +github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -608,6 +608,8 @@ go.opentelemetry.io/collector/config/configgrpc v0.116.0 h1:O8Y1X9wDH5dDdqDJ9kqo go.opentelemetry.io/collector/config/configgrpc v0.116.0/go.mod h1:RPrSQrr6xhIaAK2DdcECi142NjSo0npQfVQB3nommSo= go.opentelemetry.io/collector/config/confighttp v0.116.0 h1:MLI88LmGzlN5D4pH6nFMg5hU3UCeTZb72iVx1lWb0c8= go.opentelemetry.io/collector/config/confighttp v0.116.0/go.mod h1:iJzNYVOiE1V3lpOIZIkR3JJk3aX/RGp9+SEssJMJ/bY= +go.opentelemetry.io/collector/config/confighttp/xconfighttp v0.116.0 h1:0s7Z7cHx50M6OJdWt9PgXklImUkAF2MVmWiClnj/zB8= +go.opentelemetry.io/collector/config/confighttp/xconfighttp v0.116.0/go.mod h1:FYunjrmzqrTQ53Z3VGbZ9xcR3ewbRWEupp8151T1CQI= go.opentelemetry.io/collector/config/confignet v1.22.0 h1:SBEMHJZWD8J4qgFw1O+BEkXW9AWldDi6Fz5YeDeoU58= go.opentelemetry.io/collector/config/confignet v1.22.0/go.mod h1:ZppUH1hgUJOubawEsxsQ9MzEYFytqo2GnVSS7d4CVxc= go.opentelemetry.io/collector/config/configopaque v1.22.0 h1:CJgsm/Ynr2JE5Y66hYJBdybjHs20ywHtBHiV1jlI4yE= @@ -917,8 +919,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q= google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 h1:Z7FRVJPSMaHQxD0uXU8WdgFh8PseLM8Q8NzhnpMrBhQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= From 37a551fac0f93c5c9092b029a14bed509dae99ae Mon Sep 17 00:00:00 2001 From: Mahad Zaryab Date: Mon, 16 Dec 2024 20:04:42 -0500 Subject: [PATCH 2/3] Add Filter For Static UI Assets Signed-off-by: Mahad Zaryab --- cmd/query/app/server.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmd/query/app/server.go b/cmd/query/app/server.go index 1047355acfd..17f405f5f26 100644 --- a/cmd/query/app/server.go +++ b/cmd/query/app/server.go @@ -10,6 +10,7 @@ import ( "io" "net" "net/http" + "regexp" "strings" "sync" @@ -17,6 +18,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componentstatus" "go.opentelemetry.io/collector/config/configgrpc" + "go.opentelemetry.io/collector/config/confighttp/xconfighttp" + "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/health" @@ -219,6 +222,12 @@ func createHTTPServer( MeterProvider: telset.MeterProvider, }, handler, + xconfighttp.WithOtelHTTPOptions( + otelhttp.WithFilter(func(r *http.Request) bool { + ignorePaths := regexp.MustCompile(`^/static/.*`) + return !ignorePaths.MatchString(r.URL.Path) + }), + ), ) if err != nil { return nil, errors.Join(err, staticHandlerCloser.Close()) From c26dc80d2b1cad92ace9d13e49e2286273cbd67c Mon Sep 17 00:00:00 2001 From: Mahad Zaryab Date: Tue, 17 Dec 2024 21:38:04 -0500 Subject: [PATCH 3/3] Account For Base Path Signed-off-by: Mahad Zaryab --- cmd/query/app/server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/query/app/server.go b/cmd/query/app/server.go index 17f405f5f26..5880dd83596 100644 --- a/cmd/query/app/server.go +++ b/cmd/query/app/server.go @@ -10,7 +10,7 @@ import ( "io" "net" "net/http" - "regexp" + "path" "strings" "sync" @@ -224,8 +224,8 @@ func createHTTPServer( handler, xconfighttp.WithOtelHTTPOptions( otelhttp.WithFilter(func(r *http.Request) bool { - ignorePaths := regexp.MustCompile(`^/static/.*`) - return !ignorePaths.MatchString(r.URL.Path) + ignorePath := path.Join("/", queryOpts.BasePath, "static") + return !strings.HasPrefix(r.URL.Path, ignorePath) }), ), )