From 59a26db1f801f402ee70bcf37cc1169d2de84e7d Mon Sep 17 00:00:00 2001 From: Victor Lyuboslavsky Date: Mon, 28 Oct 2024 10:50:35 -0500 Subject: [PATCH] Limit OpenTelemetry span name length. (#23281) Minor tweak to OpenTelemetry SQL config. - [x] Manual testing --- server/datastore/mysql/mysql.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/server/datastore/mysql/mysql.go b/server/datastore/mysql/mysql.go index 928e661b60..31486e87d1 100644 --- a/server/datastore/mysql/mysql.go +++ b/server/datastore/mysql/mysql.go @@ -34,7 +34,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/jmoiron/sqlx" "github.com/ngrok/sqlmw" - semconv "go.opentelemetry.io/otel/semconv/v1.4.0" + semconv "go.opentelemetry.io/otel/semconv/v1.26.0" ) const ( @@ -418,7 +418,12 @@ func init() { return string(method) } // Append query with extra whitespaces removed - return string(method) + ": " + strings.Join(strings.Fields(query), " ") + query = strings.Join(strings.Fields(query), " ") + const maxQueryLen = 100 + if len(query) > maxQueryLen { + query = query[:maxQueryLen] + "..." + } + return string(method) + ": " + query }), ) if err != nil {