mirror of
https://github.com/hanzoai/o11y.git
synced 2026-10-15 12:58:33 +00:00
* 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.
364 lines
12 KiB
Go
364 lines
12 KiB
Go
package agentConf
|
|
|
|
import (
|
|
"context"
|
|
"crypto/sha256"
|
|
"fmt"
|
|
"log/slog"
|
|
"strings"
|
|
"sync"
|
|
"sync/atomic"
|
|
|
|
"github.com/google/uuid"
|
|
yaml "gopkg.in/yaml.v3"
|
|
|
|
"github.com/hanzoai/o11y/pkg/errors"
|
|
"github.com/hanzoai/o11y/pkg/query-service/app/opamp"
|
|
filterprocessor "github.com/hanzoai/o11y/pkg/query-service/app/opamp/otelconfig/filterprocessor"
|
|
tsp "github.com/hanzoai/o11y/pkg/query-service/app/opamp/otelconfig/tailsampler"
|
|
"github.com/hanzoai/o11y/pkg/query-service/model"
|
|
"github.com/hanzoai/o11y/pkg/sqlstore"
|
|
"github.com/hanzoai/o11y/pkg/types/opamptypes"
|
|
"github.com/hanzoai/o11y/pkg/valuer"
|
|
)
|
|
|
|
var m *Manager
|
|
|
|
var (
|
|
CodeConfigVersionNoConfig = errors.MustNewCode("config_version_no_config")
|
|
)
|
|
|
|
func init() {
|
|
m = &Manager{}
|
|
}
|
|
|
|
type AgentFeatureType string
|
|
|
|
type Manager struct {
|
|
Repo
|
|
// lock to make sure only one update is sent to remote agents at a time
|
|
lock uint32
|
|
logger *slog.Logger
|
|
|
|
// For AgentConfigProvider implementation
|
|
agentFeatures []AgentFeature
|
|
configSubscribers map[string]func()
|
|
configSubscribersLock sync.Mutex
|
|
}
|
|
|
|
type ManagerOptions struct {
|
|
Store sqlstore.SQLStore
|
|
|
|
// When acting as opamp.AgentConfigProvider, agent conf recommendations are
|
|
// applied to the base conf in the order the features have been specified here.
|
|
AgentFeatures []AgentFeature
|
|
}
|
|
|
|
func Initiate(options *ManagerOptions) (*Manager, error) {
|
|
// featureType must be unqiue across registered AgentFeatures.
|
|
agentFeatureByType := map[AgentFeatureType]AgentFeature{}
|
|
for _, feature := range options.AgentFeatures {
|
|
featureType := feature.AgentFeatureType()
|
|
if agentFeatureByType[featureType] != nil {
|
|
panic(fmt.Sprintf(
|
|
"found multiple agent features with type: %s", featureType,
|
|
))
|
|
}
|
|
agentFeatureByType[featureType] = feature
|
|
}
|
|
|
|
m = &Manager{
|
|
Repo: Repo{options.Store},
|
|
logger: slog.Default(),
|
|
agentFeatures: options.AgentFeatures,
|
|
configSubscribers: map[string]func(){},
|
|
}
|
|
|
|
return m, nil
|
|
}
|
|
|
|
// Implements opamp.AgentConfigProvider
|
|
func (m *Manager) SubscribeToConfigUpdates(callback func()) (unsubscribe func()) {
|
|
m.configSubscribersLock.Lock()
|
|
defer m.configSubscribersLock.Unlock()
|
|
|
|
subscriberId := uuid.NewString()
|
|
m.configSubscribers[subscriberId] = callback
|
|
|
|
return func() {
|
|
delete(m.configSubscribers, subscriberId)
|
|
}
|
|
}
|
|
|
|
func (m *Manager) notifyConfigUpdateSubscribers() {
|
|
m.configSubscribersLock.Lock()
|
|
defer m.configSubscribersLock.Unlock()
|
|
for _, handler := range m.configSubscribers {
|
|
handler()
|
|
}
|
|
}
|
|
|
|
// Implements opamp.AgentConfigProvider
|
|
func (m *Manager) RecommendAgentConfig(orgId valuer.UUID, currentConfYaml []byte) (
|
|
recommendedConfYaml []byte,
|
|
// Opaque id of the recommended config, used for reporting deployment status updates
|
|
configId string,
|
|
err error,
|
|
) {
|
|
recommendation := currentConfYaml
|
|
settingVersionsUsed := []string{}
|
|
|
|
for _, feature := range m.agentFeatures {
|
|
featureType := opamptypes.NewElementType(string(feature.AgentFeatureType()))
|
|
latestConfig, err := GetLatestVersion(context.Background(), orgId, featureType)
|
|
if err != nil && !errors.Ast(err, errors.TypeNotFound) {
|
|
return nil, "", err
|
|
}
|
|
|
|
updatedConf, serializedSettingsUsed, err := feature.RecommendAgentConfig(orgId, recommendation, latestConfig)
|
|
if err != nil {
|
|
return nil, "", errors.WithAdditionalf(err, "agent config recommendation for %s failed", featureType)
|
|
}
|
|
recommendation = updatedConf
|
|
|
|
// It is possible for a feature to recommend collector config
|
|
// before any user created config versions exist.
|
|
//
|
|
// For example, log pipeline config for installed integrations will
|
|
// have to be recommended even if the user hasn't created any pipelines yet
|
|
configVersion := -1
|
|
if latestConfig != nil {
|
|
configVersion = latestConfig.Version
|
|
}
|
|
configId := fmt.Sprintf("%s:%d", featureType, configVersion)
|
|
|
|
settingVersionsUsed = append(settingVersionsUsed, configId)
|
|
|
|
_ = m.updateDeployStatus(
|
|
context.Background(),
|
|
orgId,
|
|
featureType,
|
|
configVersion,
|
|
opamptypes.DeployInitiated.StringValue(),
|
|
"Deployment has started",
|
|
configId,
|
|
serializedSettingsUsed,
|
|
)
|
|
|
|
}
|
|
|
|
if len(settingVersionsUsed) > 0 {
|
|
configId = strings.Join(settingVersionsUsed, ",")
|
|
|
|
} else {
|
|
// Do not return an empty configId even if no recommendations were made
|
|
hash := sha256.New()
|
|
hash.Write(recommendation)
|
|
configId = string(hash.Sum(nil))
|
|
}
|
|
|
|
return recommendation, configId, nil
|
|
}
|
|
|
|
// Implements opamp.AgentConfigProvider
|
|
func (m *Manager) ReportConfigDeploymentStatus(
|
|
orgId valuer.UUID,
|
|
agentId string,
|
|
configId string,
|
|
err error,
|
|
) {
|
|
featureConfigIds := strings.Split(configId, ",")
|
|
for _, featureConfId := range featureConfigIds {
|
|
newStatus := opamptypes.Deployed.StringValue()
|
|
message := "Deployment was successful"
|
|
if err != nil {
|
|
newStatus = opamptypes.DeployFailed.StringValue()
|
|
message = fmt.Sprintf("%s: %s", agentId, err.Error())
|
|
}
|
|
_ = m.updateDeployStatusByHash(
|
|
context.Background(), orgId, featureConfId, newStatus, message,
|
|
)
|
|
}
|
|
}
|
|
|
|
// Implements model.AgentConfigProvider
|
|
func (m *Manager) GetDeployStatusByHash(ctx context.Context, orgId valuer.UUID, configHash string) (opamptypes.DeployStatus, error) {
|
|
return m.Repo.GetDeployStatusByHash(ctx, orgId, configHash)
|
|
}
|
|
|
|
func GetLatestVersion(
|
|
ctx context.Context, orgId valuer.UUID, elementType opamptypes.ElementType,
|
|
) (*opamptypes.AgentConfigVersion, error) {
|
|
return m.GetLatestVersion(ctx, orgId, elementType)
|
|
}
|
|
|
|
func GetConfigVersion(
|
|
ctx context.Context, orgId valuer.UUID, elementType opamptypes.ElementType, version int,
|
|
) (*opamptypes.AgentConfigVersion, error) {
|
|
return m.GetConfigVersion(ctx, orgId, elementType, version)
|
|
}
|
|
|
|
func GetConfigHistory(
|
|
ctx context.Context, orgId valuer.UUID, typ opamptypes.ElementType, limit int,
|
|
) ([]opamptypes.AgentConfigVersion, error) {
|
|
return m.GetConfigHistory(ctx, orgId, typ, limit)
|
|
}
|
|
|
|
// StartNewVersion launches a new config version for given set of elements
|
|
func StartNewVersion(
|
|
ctx context.Context, orgId valuer.UUID, userId valuer.UUID, eleType opamptypes.ElementType, elementIds []string,
|
|
) (*opamptypes.AgentConfigVersion, error) {
|
|
|
|
// create a new version
|
|
cfg := opamptypes.NewAgentConfigVersion(orgId, userId, eleType)
|
|
|
|
// insert new config and elements into database
|
|
err := m.insertConfig(ctx, orgId, userId, cfg, elementIds)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
m.notifyConfigUpdateSubscribers()
|
|
|
|
return cfg, nil
|
|
}
|
|
|
|
func NotifyConfigUpdate(ctx context.Context) {
|
|
m.notifyConfigUpdateSubscribers()
|
|
}
|
|
|
|
func Redeploy(ctx context.Context, orgId valuer.UUID, typ opamptypes.ElementType, version int) error {
|
|
configVersion, err := GetConfigVersion(ctx, orgId, typ, version)
|
|
if err != nil {
|
|
slog.ErrorContext(ctx, "failed to fetch config version during redeploy", errors.Attr(err))
|
|
return err
|
|
}
|
|
|
|
if configVersion == nil || (configVersion != nil && configVersion.Config == "") {
|
|
slog.DebugContext(ctx, "config version has no conf yaml", "config_version", configVersion)
|
|
return errors.NewInvalidInputf(CodeConfigVersionNoConfig, "the config version can not be redeployed")
|
|
}
|
|
switch typ {
|
|
case opamptypes.ElementTypeSamplingRules:
|
|
var config *tsp.Config
|
|
if err := yaml.Unmarshal([]byte(configVersion.Config), &config); err != nil {
|
|
slog.DebugContext(ctx, "failed to read last conf correctly", errors.Attr(err))
|
|
return model.BadRequest(fmt.Errorf("failed to read the stored config correctly"))
|
|
}
|
|
|
|
// merge current config with new filter params
|
|
processorConf := map[string]interface{}{
|
|
"o11y_tail_sampling": config,
|
|
}
|
|
|
|
opamp.AddToTracePipelineSpec("o11y_tail_sampling")
|
|
configHash, err := opamp.UpsertControlProcessors(ctx, "traces", processorConf, m.OnConfigUpdate)
|
|
if err != nil {
|
|
slog.ErrorContext(ctx, "failed to call agent config update for trace processor", errors.Attr(err))
|
|
return errors.WithAdditionalf(err, "failed to deploy the config")
|
|
}
|
|
|
|
m.updateDeployStatus(ctx, orgId, opamptypes.ElementTypeSamplingRules, version, opamptypes.DeployInitiated.StringValue(), "Deployment started", configHash, configVersion.Config)
|
|
case opamptypes.ElementTypeDropRules:
|
|
var filterConfig *filterprocessor.Config
|
|
if err := yaml.Unmarshal([]byte(configVersion.Config), &filterConfig); err != nil {
|
|
slog.ErrorContext(ctx, "failed to read last conf correctly", errors.Attr(err))
|
|
return model.InternalError(fmt.Errorf("failed to read the stored config correctly"))
|
|
}
|
|
processorConf := map[string]interface{}{
|
|
"filter": filterConfig,
|
|
}
|
|
|
|
opamp.AddToMetricsPipelineSpec("filter")
|
|
configHash, err := opamp.UpsertControlProcessors(ctx, "metrics", processorConf, m.OnConfigUpdate)
|
|
if err != nil {
|
|
slog.ErrorContext(ctx, "failed to call agent config update for trace processor", errors.Attr(err))
|
|
return err
|
|
}
|
|
|
|
m.updateDeployStatus(ctx, orgId, opamptypes.ElementTypeSamplingRules, version, opamptypes.DeployInitiated.StringValue(), "Deployment started", configHash, configVersion.Config)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// UpsertFilterProcessor updates the agent config with new filter processor params
|
|
func UpsertFilterProcessor(ctx context.Context, orgId valuer.UUID, version int, config *filterprocessor.Config) error {
|
|
if !atomic.CompareAndSwapUint32(&m.lock, 0, 1) {
|
|
return fmt.Errorf("agent updater is busy")
|
|
}
|
|
defer atomic.StoreUint32(&m.lock, 0)
|
|
|
|
// merge current config with new filter params
|
|
// merge current config with new filter params
|
|
processorConf := map[string]interface{}{
|
|
"filter": config,
|
|
}
|
|
|
|
opamp.AddToMetricsPipelineSpec("filter")
|
|
configHash, err := opamp.UpsertControlProcessors(ctx, "metrics", processorConf, m.OnConfigUpdate)
|
|
if err != nil {
|
|
slog.ErrorContext(ctx, "failed to call agent config update for trace processor", errors.Attr(err))
|
|
return err
|
|
}
|
|
|
|
processorConfYaml, yamlErr := yaml.Marshal(config)
|
|
if yamlErr != nil {
|
|
slog.WarnContext(ctx, "unexpected error while transforming processor config to yaml", errors.Attr(yamlErr))
|
|
}
|
|
|
|
m.updateDeployStatus(ctx, orgId, opamptypes.ElementTypeDropRules, version, opamptypes.DeployInitiated.StringValue(), "Deployment started", configHash, string(processorConfYaml))
|
|
return nil
|
|
}
|
|
|
|
// OnConfigUpdate is a callback function passed to opamp server.
|
|
// It receives a config hash with error status. We assume
|
|
// successful deployment if no error is received.
|
|
// this method is currently expected to be called only once in the lifecycle
|
|
// but can be improved in future to accept continuous request status updates from opamp
|
|
func (m *Manager) OnConfigUpdate(orgId valuer.UUID, agentId string, hash string, err error) {
|
|
|
|
status := opamptypes.Deployed.StringValue()
|
|
|
|
message := "Deployment was successful"
|
|
|
|
defer func() {
|
|
m.logger.Info(status, "agent_id", agentId, "agent_response", message)
|
|
}()
|
|
|
|
if err != nil {
|
|
status = opamptypes.DeployFailed.StringValue()
|
|
message = fmt.Sprintf("%s: %s", agentId, err.Error())
|
|
}
|
|
|
|
_ = m.updateDeployStatusByHash(context.Background(), orgId, hash, status, message)
|
|
}
|
|
|
|
// UpsertSamplingProcessor updates the agent config with new filter processor params
|
|
func UpsertSamplingProcessor(ctx context.Context, orgId valuer.UUID, version int, config *tsp.Config) error {
|
|
if !atomic.CompareAndSwapUint32(&m.lock, 0, 1) {
|
|
return fmt.Errorf("agent updater is busy")
|
|
}
|
|
defer atomic.StoreUint32(&m.lock, 0)
|
|
|
|
// merge current config with new filter params
|
|
processorConf := map[string]interface{}{
|
|
"o11y_tail_sampling": config,
|
|
}
|
|
|
|
opamp.AddToTracePipelineSpec("o11y_tail_sampling")
|
|
configHash, err := opamp.UpsertControlProcessors(ctx, "traces", processorConf, m.OnConfigUpdate)
|
|
if err != nil {
|
|
slog.ErrorContext(ctx, "failed to call agent config update for trace processor", errors.Attr(err))
|
|
return err
|
|
}
|
|
|
|
processorConfYaml, yamlErr := yaml.Marshal(config)
|
|
if yamlErr != nil {
|
|
slog.WarnContext(ctx, "unexpected error while transforming processor config to yaml", errors.Attr(yamlErr))
|
|
}
|
|
|
|
m.updateDeployStatus(ctx, orgId, opamptypes.ElementTypeSamplingRules, version, opamptypes.DeployInitiated.StringValue(), "Deployment started", configHash, string(processorConfYaml))
|
|
return nil
|
|
}
|