Skip to content
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

fix(xp-treatment): Add field tags to poller configs and make XP plugin pass poller configs #88

Merged
merged 9 commits into from
Jan 20, 2025
Merged

fix(xp-treatment): Add field tags to poller configs and make XP plugin pass poller configs #88

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7ee85ed
Add field tags to poller configs
deadlycoconuts Jan 16, 2025
c920104
Add poller config to plugin
deadlycoconuts Jan 16, 2025
c58eb82
Update message queue config with json tags
deadlycoconuts Jan 17, 2025
ee6a143
Update xp plugin to use message queue config from manager instead of …
deadlycoconuts Jan 17, 2025
20009ce
Reorder imports
deadlycoconuts Jan 17, 2025
3c43ebc
Change poller interval field to int
deadlycoconuts Jan 17, 2025
8fd757e
Reorder imports
deadlycoconuts Jan 17, 2025
1cf57ff
Reorder imports
deadlycoconuts Jan 17, 2025
a58a714
Refactor poller into a service
deadlycoconuts Jan 17, 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
17 changes: 9 additions & 8 deletions plugins/turing/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,15 @@ type TreatmentServicePluginConfig struct {
Port int `json:"port" default:"8080"`
PubSubTimeoutSeconds int `json:"pub_sub_timeout_seconds" validate:"required"`

AssignedTreatmentLogger config.AssignedTreatmentLoggerConfig `json:"assigned_treatment_logger"`
DebugConfig config.DebugConfig `json:"debug_config"`
DeploymentConfig config.DeploymentConfig `json:"deployment_config"`
ManagementService config.ManagementServiceConfig `json:"management_service"`
MonitoringConfig config.Monitoring `json:"monitoring_config"`
SwaggerConfig config.SwaggerConfig `json:"swagger_config"`
NewRelicConfig newrelic.Config `json:"new_relic_config"`
SentryConfig sentry.Config `json:"sentry_config"`
AssignedTreatmentLogger config.AssignedTreatmentLoggerConfig `json:"assigned_treatment_logger"`
DebugConfig config.DebugConfig `json:"debug_config"`
DeploymentConfig config.DeploymentConfig `json:"deployment_config"`
ManagementService config.ManagementServiceConfig `json:"management_service"`
MonitoringConfig config.Monitoring `json:"monitoring_config"`
SwaggerConfig config.SwaggerConfig `json:"swagger_config"`
NewRelicConfig newrelic.Config `json:"new_relic_config"`
SentryConfig sentry.Config `json:"sentry_config"`
ManagementServicePollerConfig config.ManagementServicePollerConfig `json:"management_service_poller_config"`
}

type Variable struct {
Expand Down
23 changes: 12 additions & 11 deletions plugins/turing/manager/experiment_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,17 +142,18 @@ func (em *experimentManager) MakeTreatmentServicePluginConfig(
projectID int,
) (*config.Config, error) {
pluginConfig := &config.Config{
Port: em.TreatmentServicePluginConfig.Port,
ProjectIds: []string{strconv.Itoa(projectID)},
AssignedTreatmentLogger: em.TreatmentServicePluginConfig.AssignedTreatmentLogger,
DebugConfig: em.TreatmentServicePluginConfig.DebugConfig,
DeploymentConfig: em.TreatmentServicePluginConfig.DeploymentConfig,
ManagementService: em.TreatmentServicePluginConfig.ManagementService,
MonitoringConfig: em.TreatmentServicePluginConfig.MonitoringConfig,
SwaggerConfig: em.TreatmentServicePluginConfig.SwaggerConfig,
NewRelicConfig: em.TreatmentServicePluginConfig.NewRelicConfig,
SentryConfig: em.TreatmentServicePluginConfig.SentryConfig,
SegmenterConfig: *treatmentServiceConfig.SegmenterConfig,
Port: em.TreatmentServicePluginConfig.Port,
ProjectIds: []string{strconv.Itoa(projectID)},
AssignedTreatmentLogger: em.TreatmentServicePluginConfig.AssignedTreatmentLogger,
DebugConfig: em.TreatmentServicePluginConfig.DebugConfig,
DeploymentConfig: em.TreatmentServicePluginConfig.DeploymentConfig,
ManagementService: em.TreatmentServicePluginConfig.ManagementService,
MonitoringConfig: em.TreatmentServicePluginConfig.MonitoringConfig,
SwaggerConfig: em.TreatmentServicePluginConfig.SwaggerConfig,
NewRelicConfig: em.TreatmentServicePluginConfig.NewRelicConfig,
SentryConfig: em.TreatmentServicePluginConfig.SentryConfig,
SegmenterConfig: *treatmentServiceConfig.SegmenterConfig,
ManagementServicePollerConfig: em.TreatmentServicePluginConfig.ManagementServicePollerConfig,
deadlycoconuts marked this conversation as resolved.
Show resolved Hide resolved
}
messageQueueKind := *treatmentServiceConfig.MessageQueueConfig.Kind
switch messageQueueKind {
Expand Down
4 changes: 2 additions & 2 deletions treatment-service/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ type ManagementServiceConfig struct {
}

type ManagementServicePollerConfig struct {
Enabled bool `default:"false"`
PollInterval time.Duration `default:"30s"`
Enabled bool `json:"enabled" default:"false"`
PollInterval time.Duration `json:"poll_interval" default:"30s"`
}

func (c *Config) GetProjectIds() []models.ProjectId {
Expand Down
Loading