mirror of
https://github.com/hanzoai/o11y.git
synced 2026-10-15 12:58:33 +00:00
zeekayandGitHub
babbdec4b8
* debrand: signoz/SigNoz/SIGNOZ -> o11y/O11y/O11Y across the tree Rename all SigNoz *branding* to O11y in file contents, file/dir names, package names, env vars, config keys, comments, docs, SDK code, and the ClickHouse schema identifiers the querier reads. Collector dependency: - Repoint github.com/hanzoai/signoz-otel-collector -> github.com/hanzoai/otel-collector and bump v0.144.6 -> v0.144.7 (go.mod + go.sum reconciled via go mod tidy). Internal package paths also debranded upstream: signozschemamigrator -> o11yschemamigrator, signozlogspipelineprocessor -> o11ylogspipelineprocessor. - Fix: v0.144.7 dropped otelconst.DistributedFieldKeysTable from the collector's public constants; pin FieldKeysTable = "distributed_field_keys" locally in pkg/telemetrymetadata/tables.go. Package/dir renames (package decl + all importers): pkg/apiserver/signozapiserver -> o11yapiserver, plus signozalertmanager, signozauthzapi, signozglobal, signozquerier, signozruler, and pkg/signoz -> pkg/o11y. Schema (read plane): signoz_traces/metrics/logs/metadata/analytics/meter and signoz_index_v3/index_v2/error_index_v2/spans (+ distributed_*) -> o11y_*. Data-preserving cutover migration added: deploy/clickhouse/migrations/0001_rename_signoz_to_o11y.sql (metadata-only RENAME DATABASE/TABLE, no drop/recreate). Preserved (attribution / external / wire contracts): - LICENSE + NOTICE verbatim (incl. "software from SigNoz", "Copyright ... SigNoz Inc."). - Upstream github.com/SigNoz/* repo URLs + @SigNoz/* CODEOWNERS teams. - Billing resource-attribute regex "signoz.workspace.*" (external wire contract). go build ./pkg/... ./cmd/... = 0; gofmt clean; renamed+schema pkg tests pass. * o11y: bump collector to v0.144.8 (o11y_* physical schema writer) + lockstep deploy plan Collector v0.144.8's schema-migrator + exporters now CREATE/WRITE the same o11y_* physical databases/tables the querier reads and the RENAME migration (0001_rename_signoz_to_o11y.sql) targets. Cross-checked byte-identical: writer DB set == migration target DB set (6); writer prefixed-table set == migration target table set (8); o11y querier reads and cloud reads are subsets of that set. Zero table-name mismatches between writer, readers, and migration. Collector go.mod unchanged between v0.144.7 and v0.144.8 (identical go.mod hash) — pure source rename, no module-graph change. Adds deploy/clickhouse/DEPLOY_signoz_to_o11y_cutover.md: the lockstep order (collector v0.144.8 -> RENAME migration -> o11y+cloud readers) with a fresh/scratch-ClickHouse pre-flight (create via migrator, emit trace+metric, query back) and rollback. Ships together or telemetry blackholes. go build ./pkg/... ./cmd/community = 0.
107 lines
3.0 KiB
Go
107 lines
3.0 KiB
Go
package plugin
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"log/slog"
|
|
"net"
|
|
"net/http"
|
|
|
|
"github.com/gojek/heimdall/v7"
|
|
semconv "go.opentelemetry.io/otel/semconv/v1.27.0"
|
|
|
|
"github.com/hanzoai/o11y/pkg/errors"
|
|
)
|
|
|
|
type reqResLog struct {
|
|
logger *slog.Logger
|
|
}
|
|
|
|
func NewLog(logger *slog.Logger) heimdall.Plugin {
|
|
return &reqResLog{
|
|
logger: logger,
|
|
}
|
|
}
|
|
|
|
func (plugin *reqResLog) OnRequestStart(request *http.Request) {
|
|
host, port, _ := net.SplitHostPort(request.Host)
|
|
fields := []any{
|
|
string(semconv.HTTPRequestMethodKey), request.Method,
|
|
string(semconv.URLPathKey), request.URL.Path,
|
|
string(semconv.URLSchemeKey), request.URL.Scheme,
|
|
string(semconv.UserAgentOriginalKey), request.UserAgent(),
|
|
string(semconv.ServerAddressKey), host,
|
|
string(semconv.ServerPortKey), port,
|
|
string(semconv.HTTPRequestSizeKey), request.ContentLength,
|
|
}
|
|
|
|
// only include all the headers if we are at debug level
|
|
if plugin.logger.Handler().Enabled(request.Context(), slog.LevelDebug) {
|
|
fields = append(fields, "http.request.headers", request.Header)
|
|
} else {
|
|
fields = append(fields, "http.request.headers", redactSensitiveHeaders(request.Header))
|
|
}
|
|
|
|
plugin.logger.InfoContext(request.Context(), "::SENT-REQUEST::", fields...)
|
|
}
|
|
|
|
func (plugin *reqResLog) OnRequestEnd(request *http.Request, response *http.Response) {
|
|
fields := []any{
|
|
string(semconv.HTTPResponseStatusCodeKey), response.StatusCode,
|
|
string(semconv.HTTPResponseBodySizeKey), response.ContentLength,
|
|
}
|
|
|
|
bodybytes, err := io.ReadAll(response.Body)
|
|
if err != nil {
|
|
plugin.logger.DebugContext(request.Context(), "::UNABLE-TO-LOG-RESPONSE-BODY::", errors.Attr(err))
|
|
} else {
|
|
_ = response.Body.Close()
|
|
response.Body = io.NopCloser(bytes.NewBuffer(bodybytes))
|
|
|
|
if len(bodybytes) > 0 {
|
|
fields = append(fields, "http.response.body", string(bodybytes))
|
|
} else {
|
|
fields = append(fields, "http.response.body", "(empty)")
|
|
}
|
|
}
|
|
|
|
plugin.logger.InfoContext(request.Context(), "::RECEIVED-RESPONSE::", fields...)
|
|
}
|
|
|
|
func (plugin *reqResLog) OnError(request *http.Request, err error) {
|
|
host, port, _ := net.SplitHostPort(request.Host)
|
|
fields := []any{
|
|
errors.Attr(err),
|
|
string(semconv.HTTPRequestMethodKey), request.Method,
|
|
string(semconv.URLPathKey), request.URL.Path,
|
|
string(semconv.URLSchemeKey), request.URL.Scheme,
|
|
string(semconv.UserAgentOriginalKey), request.UserAgent(),
|
|
string(semconv.ServerAddressKey), host,
|
|
string(semconv.ServerPortKey), port,
|
|
string(semconv.HTTPRequestSizeKey), request.ContentLength,
|
|
}
|
|
|
|
plugin.logger.ErrorContext(request.Context(), "::UNABLE-TO-SEND-REQUEST::", fields...)
|
|
}
|
|
|
|
func redactSensitiveHeaders(headers http.Header) http.Header {
|
|
// maintained list of headers to redact
|
|
sensitiveHeaders := map[string]bool{
|
|
"Authorization": true,
|
|
"Cookie": true,
|
|
"X-O11y-Cloud-Api-Key": true,
|
|
}
|
|
|
|
safeHeaders := make(http.Header)
|
|
|
|
for header, value := range headers {
|
|
if sensitiveHeaders[header] {
|
|
safeHeaders[header] = []string{"REDACTED"}
|
|
} else {
|
|
safeHeaders[header] = value
|
|
}
|
|
}
|
|
|
|
return safeHeaders
|
|
}
|