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.
87 lines
2.3 KiB
Go
87 lines
2.3 KiB
Go
package cmd
|
|
|
|
import (
|
|
"context"
|
|
"log/slog"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestNewO11yConfig_NoConfigFiles(t *testing.T) {
|
|
logger := slog.New(slog.DiscardHandler)
|
|
config, err := NewO11yConfig(context.Background(), logger, nil)
|
|
require.NoError(t, err)
|
|
assert.NotZero(t, config)
|
|
}
|
|
|
|
func TestNewO11yConfig_SingleConfigFile(t *testing.T) {
|
|
dir := t.TempDir()
|
|
configPath := filepath.Join(dir, "config.yaml")
|
|
err := os.WriteFile(configPath, []byte(`
|
|
cache:
|
|
provider: "redis"
|
|
`), 0644)
|
|
require.NoError(t, err)
|
|
|
|
logger := slog.New(slog.DiscardHandler)
|
|
config, err := NewO11yConfig(context.Background(), logger, []string{configPath})
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "redis", config.Cache.Provider)
|
|
}
|
|
|
|
func TestNewO11yConfig_MultipleConfigFiles_LaterOverridesEarlier(t *testing.T) {
|
|
dir := t.TempDir()
|
|
|
|
basePath := filepath.Join(dir, "base.yaml")
|
|
err := os.WriteFile(basePath, []byte(`
|
|
cache:
|
|
provider: "memory"
|
|
sqlstore:
|
|
provider: "sqlite"
|
|
`), 0644)
|
|
require.NoError(t, err)
|
|
|
|
overridePath := filepath.Join(dir, "override.yaml")
|
|
err = os.WriteFile(overridePath, []byte(`
|
|
cache:
|
|
provider: "redis"
|
|
`), 0644)
|
|
require.NoError(t, err)
|
|
|
|
logger := slog.New(slog.DiscardHandler)
|
|
config, err := NewO11yConfig(context.Background(), logger, []string{basePath, overridePath})
|
|
require.NoError(t, err)
|
|
// Later file overrides earlier
|
|
assert.Equal(t, "redis", config.Cache.Provider)
|
|
// Value from base file that wasn't overridden persists
|
|
assert.Equal(t, "sqlite", config.SQLStore.Provider)
|
|
}
|
|
|
|
func TestNewO11yConfig_EnvOverridesConfigFile(t *testing.T) {
|
|
dir := t.TempDir()
|
|
configPath := filepath.Join(dir, "config.yaml")
|
|
err := os.WriteFile(configPath, []byte(`
|
|
cache:
|
|
provider: "fromfile"
|
|
`), 0644)
|
|
require.NoError(t, err)
|
|
|
|
t.Setenv("O11Y_CACHE_PROVIDER", "fromenv")
|
|
|
|
logger := slog.New(slog.DiscardHandler)
|
|
config, err := NewO11yConfig(context.Background(), logger, []string{configPath})
|
|
require.NoError(t, err)
|
|
// Env should override file
|
|
assert.Equal(t, "fromenv", config.Cache.Provider)
|
|
}
|
|
|
|
func TestNewO11yConfig_NonexistentFile(t *testing.T) {
|
|
logger := slog.New(slog.DiscardHandler)
|
|
_, err := NewO11yConfig(context.Background(), logger, []string{"/nonexistent/config.yaml"})
|
|
assert.Error(t, err)
|
|
}
|