Skip to content

chore: support for orgId in opamp #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

chore: support for orgId in opamp #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c14bf1
chore: support for orgId in opamp
nityanandagohain Mar 26, 2025
2f98b1b
Merge branch 'main' into fix/issue_515
nityanandagohain Mar 26, 2025
edc4a0d
Merge remote-tracking branch 'origin/main' into fix/issue_515
nityanandagohain Mar 27, 2025
09dfa62
fix: use default orgID
nityanandagohain Mar 27, 2025
1117e8b
Merge remote-tracking branch 'origin/fix/issue_515' into fix/issue_515
nityanandagohain Mar 28, 2025
cd5ed40
Merge remote-tracking branch 'origin/main' into fix/issue_515
nityanandagohain May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions conf/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
server_endpoint: ws://127.0.0.1:4320/v1/opamp
org_id: 3135a17c-9f4a-441b-b726-e0c6174a3244
4 changes: 4 additions & 0 deletions opamp/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
type AgentManagerConfig struct {
ServerEndpoint string `yaml:"server_endpoint"`
ID string `yaml:"id,omitempty"`
OrgID string `yaml:"org_id,omitempty"`
}

func ParseAgentManagerConfig(configLocation string) (*AgentManagerConfig, error) {
Expand All @@ -32,6 +33,9 @@ func ParseAgentManagerConfig(configLocation string) (*AgentManagerConfig, error)
// generate ulid if not provided
config.ID = ulid.MustNew(ulid.Now(), nil).String()
}
if config.OrgID == "" {
config.OrgID = "SIGNOZ##DEFAULT##ORG##ID"
}

return &config, nil
}
3 changes: 3 additions & 0 deletions opamp/server_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ type serverClient struct {
configManager *agentConfigManager
managerConfig AgentManagerConfig
instanceId ulid.ULID
orgId string
receivedInitialConfig bool
mux sync.Mutex
}
Expand Down Expand Up @@ -65,6 +66,7 @@ func NewServerClient(args *NewServerClientOpts) (Client, error) {
configManager: configManager,
managerConfig: *args.Config,
mux: sync.Mutex{},
orgId: args.Config.OrgID,
}
svrClient.createInstanceId()

Expand Down Expand Up @@ -101,6 +103,7 @@ func (s *serverClient) createAgentDescription() *protobufs.AgentDescription {
IdentifyingAttributes: []*protobufs.KeyValue{
keyVal("service.name", "signoz-otel-collector"),
keyVal("service.version", constants.Version),
keyVal("orgId", s.orgId),
},
NonIdentifyingAttributes: []*protobufs.KeyValue{
keyVal("os.family", runtime.GOOS),
Expand Down
Loading