diff --git a/internal/messenger/httpapi/attachments.go b/internal/messenger/httpapi/attachments.go index 2e832d6..ad8d1df 100644 --- a/internal/messenger/httpapi/attachments.go +++ b/internal/messenger/httpapi/attachments.go @@ -6,7 +6,6 @@ import ( "mime" "net/http" "net/url" - "regexp" "strconv" "strings" "time" @@ -14,7 +13,9 @@ import ( "unicode/utf8" "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/metric" + "go.opentelemetry.io/otel/trace" "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/messenger/attachment" "gitea.privcloud.tech/dizi/mtusi2026lab6/internal/model" @@ -133,6 +134,9 @@ func (s *Server) attachmentContent(w http.ResponseWriter, r *http.Request) *apiE w.Header().Set("Content-Disposition", mime.FormatMediaType("inline", map[string]string{"filename": content.Attachment.Filename})) w.WriteHeader(http.StatusOK) if _, err := io.Copy(w, content.Body); err != nil { + span := trace.SpanFromContext(r.Context()) + span.RecordError(err) + span.SetStatus(codes.Error, "response body write failed") s.logger.WarnContext(r.Context(), "attachment download interrupted", "event", "attachment_download_interrupted", "attachment_id", content.Attachment.ID, "error", err) } return nil @@ -153,22 +157,6 @@ func attachmentVariant(query url.Values) (string, bool) { } } -var traceparentPattern = regexp.MustCompile(`^00-[0-9a-f]{32}-[0-9a-f]{16}-[0-9a-f]{2}$`) - -func traceparent(value string) string { - if traceparentPattern.MatchString(value) { - return value - } - return "" -} - -func tracestate(value string) string { - if len(value) <= 512 { - return value - } - return "" -} - func attachmentIDFromRequest(r *http.Request) (string, *apiError) { parts := strings.Split(strings.Trim(r.URL.Path, "/"), "/") attachmentID, valid := canonicalID(parts[3]) diff --git a/monitoring/grafana/provisioning/datasources/observability.yml b/monitoring/grafana/provisioning/datasources/observability.yml index 99af68b..741e6d2 100644 --- a/monitoring/grafana/provisioning/datasources/observability.yml +++ b/monitoring/grafana/provisioning/datasources/observability.yml @@ -32,9 +32,11 @@ datasources: maxLines: 1000 derivedFields: - name: TraceID - matcherRegex: 'trace_id[=:" ]+([0-9a-f]{32})' + matcherType: label + matcherRegex: trace_id datasourceUid: tempo url: '$${__value.raw}' + urlDisplayLabel: View trace - name: Tempo type: tempo