Skip to content

Fix config apply #480

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

Merged
merged 4 commits into from
Sep 20, 2023
Merged

Fix config apply #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24e369f
fix config apply
oliveromahony Sep 20, 2023
1352d87
format
oliveromahony Sep 20, 2023
1088f78
missed a test
oliveromahony Sep 20, 2023
1975952
fix performance tests
dhurley Sep 20, 2023
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
2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func main() {

binary := core.NewNginxBinary(env, loadedConfig)

corePlugins, extensionPlugins := plugins.LoadPlugins(commander, binary, env, reporter, loadedConfig)
corePlugins, extensionPlugins := plugins.LoadPlugins(commander, binary, env, reporter, loadedConfig, eventMeta)

pipe := core.InitializePipe(ctx, corePlugins, extensionPlugins, agent_config.DefaultPluginSize)

Expand Down
7 changes: 4 additions & 3 deletions src/plugins/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ import (
log "github.com/sirupsen/logrus"

agent_config "github.com/nginx/agent/sdk/v2/agent/config"
"github.com/nginx/agent/sdk/v2/agent/events"

sdkGRPC "github.com/nginx/agent/sdk/v2/grpc"

"github.com/google/uuid"
)

func LoadPlugins(commander client.Commander, binary core.NginxBinary, env core.Environment, reporter client.MetricReporter, loadedConfig *config.Config) ([]core.Plugin, []core.ExtensionPlugin) {
func LoadPlugins(commander client.Commander, binary core.NginxBinary, env core.Environment, reporter client.MetricReporter, loadedConfig *config.Config, agentEventsMeta *events.AgentEventMeta) ([]core.Plugin, []core.ExtensionPlugin) {
var corePlugins []core.Plugin
var extensionPlugins []core.ExtensionPlugin

Expand All @@ -41,7 +42,7 @@ func LoadPlugins(commander client.Commander, binary core.NginxBinary, env core.E
NewConfigReader(loadedConfig),
NewNginx(commander, binary, env, loadedConfig),
NewExtensions(loadedConfig, env),
NewFeatures(commander, loadedConfig, env, binary, loadedConfig.Version),
NewFeatures(commander, loadedConfig, env, binary, loadedConfig.Version, agentEventsMeta),
)

if loadedConfig.IsFeatureEnabled(agent_config.FeatureRegistration) {
Expand All @@ -66,7 +67,7 @@ func LoadPlugins(commander client.Commander, binary core.NginxBinary, env core.E
}

if loadedConfig.IsFeatureEnabled(agent_config.FeatureActivityEvents) {
corePlugins = append(corePlugins, NewEvents(loadedConfig, env, sdkGRPC.NewMessageMeta(uuid.NewString()), binary))
corePlugins = append(corePlugins, NewEvents(loadedConfig, env, sdkGRPC.NewMessageMeta(uuid.NewString()), binary, agentEventsMeta))
}

if loadedConfig.AgentAPI.Port != 0 && loadedConfig.IsFeatureEnabled(agent_config.FeatureAgentAPI) {
Expand Down
13 changes: 12 additions & 1 deletion src/plugins/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"testing"

sdk "github.com/nginx/agent/sdk/v2/agent/config"
"github.com/nginx/agent/sdk/v2/agent/events"
"github.com/nginx/agent/v2/src/core/config"
tutils "github.com/nginx/agent/v2/test/utils"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -57,7 +58,17 @@ func TestLoadPlugins(t *testing.T) {

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
corePlugins, extensionPlugins := LoadPlugins(cmdr, binary, env, reporter, tt.loadedConfig)
corePlugins, extensionPlugins := LoadPlugins(cmdr, binary, env,
reporter,
tt.loadedConfig,
events.NewAgentEventMeta(
"NGINX-AGENT",
"v0.0.1",
"75231",
"test-host",
"12345678",
"group-a",
[]string{"tag-a", "tag-b"}))

assert.NotNil(t, corePlugins)
assert.Len(t, corePlugins, tt.expectedPluginSize)
Expand Down
12 changes: 6 additions & 6 deletions src/plugins/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,13 @@ type Events struct {
agentEventsMeta *events.AgentEventMeta
}

func NewEvents(conf *config.Config, env core.Environment, meta *proto.Metadata, nginxBinary core.NginxBinary) *Events {
func NewEvents(conf *config.Config, env core.Environment, meta *proto.Metadata, nginxBinary core.NginxBinary, agentEventsMeta *events.AgentEventMeta) *Events {
return &Events{
conf: conf,
env: env,
meta: meta,
nginxBinary: nginxBinary,
conf: conf,
env: env,
meta: meta,
nginxBinary: nginxBinary,
agentEventsMeta: agentEventsMeta,
}
}

Expand Down Expand Up @@ -119,7 +120,6 @@ func (a *Events) sendAgentStartedEvent(msg *core.Message) {

log.Debugf("Created event: %v", event)
a.pipeline.Process(core.NewMessage(core.Events, event))
a.agentEventsMeta = agentEventMeta
}

func (a *Events) sendNingxFoundEvent(msg *core.Message) {
Expand Down
15 changes: 14 additions & 1 deletion src/plugins/events_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,20 @@ func TestActivityEvents_Process(t *testing.T) {
},
}

pluginUnderTest := NewEvents(config, env, grpc.NewMessageMeta(uuid.New().String()), core.NewNginxBinary(env, config))
pluginUnderTest := NewEvents(
config,
env,
grpc.NewMessageMeta(uuid.New().String()),
core.NewNginxBinary(env, config),
events.NewAgentEventMeta(
"test-agent",
"v0.0.1",
"75231",
"test-host",
"12345678",
"group-a",
[]string{"tag-a", "tag-b"},
))
messagePipe := core.SetupMockMessagePipe(t, ctx, []core.Plugin{pluginUnderTest}, []core.ExtensionPlugin{})

if test.name != "test AgentStart message" {
Expand Down
31 changes: 17 additions & 14 deletions src/plugins/features.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ package plugins

import (
agent_config "github.com/nginx/agent/sdk/v2/agent/config"
"github.com/nginx/agent/sdk/v2/agent/events"
"github.com/nginx/agent/sdk/v2/client"
sdkGRPC "github.com/nginx/agent/sdk/v2/grpc"
"github.com/nginx/agent/v2/src/core"
Expand All @@ -19,22 +20,24 @@ import (
)

type Features struct {
commander client.Commander
pipeline core.MessagePipeInterface
conf *config.Config
env core.Environment
binary core.NginxBinary
version string
featureMap map[string]func(data string) []core.Plugin
commander client.Commander
pipeline core.MessagePipeInterface
conf *config.Config
env core.Environment
binary core.NginxBinary
version string
featureMap map[string]func(data string) []core.Plugin
agentEventsMeta *events.AgentEventMeta
}

func NewFeatures(commander client.Commander, conf *config.Config, env core.Environment, binary core.NginxBinary, version string) *Features {
func NewFeatures(commander client.Commander, conf *config.Config, env core.Environment, binary core.NginxBinary, version string, agentEventsMeta *events.AgentEventMeta) *Features {
return &Features{
commander: commander,
conf: conf,
env: env,
binary: binary,
version: version,
commander: commander,
conf: conf,
env: env,
binary: binary,
version: version,
agentEventsMeta: agentEventsMeta,
}
}

Expand Down Expand Up @@ -255,7 +258,7 @@ func (f *Features) enableActivityEventsFeature(data string) []core.Plugin {
}
f.conf = conf

events := NewEvents(f.conf, f.env, sdkGRPC.NewMessageMeta(uuid.NewString()), f.binary)
events := NewEvents(f.conf, f.env, sdkGRPC.NewMessageMeta(uuid.NewString()), f.binary, f.agentEventsMeta)

return []core.Plugin{events}
}
Expand Down
11 changes: 10 additions & 1 deletion src/plugins/features_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"time"

agent_config "github.com/nginx/agent/sdk/v2/agent/config"
"github.com/nginx/agent/sdk/v2/agent/events"
"github.com/nginx/agent/sdk/v2/proto"
"github.com/nginx/agent/v2/src/core"
"github.com/nginx/agent/v2/src/core/config"
Expand Down Expand Up @@ -96,7 +97,15 @@ func TestFeatures_Process(t *testing.T) {

configuration, _ := config.GetConfig("1234")

pluginUnderTest := NewFeatures(cmdr, configuration, env, binary, "agentVersion")
pluginUnderTest := NewFeatures(cmdr, configuration, env, binary, "agentVersion", events.NewAgentEventMeta(
config.MODULE,
"v0.0.1",
"75231",
"test-host",
"12345678",
"group-a",
[]string{"tag-a", "tag-b"},
))

for _, tc := range testCases {
messagePipe := core.SetupMockMessagePipe(t, ctx, []core.Plugin{pluginUnderTest}, []core.ExtensionPlugin{})
Expand Down
13 changes: 12 additions & 1 deletion test/performance/plugins_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"time"

sdk "github.com/nginx/agent/sdk/v2/agent/config"
"github.com/nginx/agent/sdk/v2/agent/events"
"github.com/nginx/agent/sdk/v2/proto"
"github.com/nginx/agent/v2/src/core"
"github.com/nginx/agent/v2/src/core/config"
Expand Down Expand Up @@ -170,7 +171,17 @@ func BenchmarkFeaturesExtensionsAndPlugins(b *testing.B) {
for i := 0; i < b.N; i++ {
b.ResetTimer()
controller, cmdr, reporter := core.CreateGrpcClients(ctx, tt.loadedConfig)
corePlugins, extensionPlugins = plugins.LoadPlugins(cmdr, binary, env, reporter, tt.loadedConfig)
corePlugins, extensionPlugins = plugins.LoadPlugins(cmdr, binary, env, reporter, tt.loadedConfig,
events.NewAgentEventMeta(
"NGINX-AGENT",
"v0.0.1",
"75231",
"test-host",
"12345678",
"group-a",
[]string{"tag-a", "tag-b"},
),
)
pipe = core.InitializePipe(ctx, corePlugins, extensionPlugins, 20)
core.HandleSignals(ctx, cmdr, tt.loadedConfig, env, pipe, cancel, controller)
}
Expand Down
7 changes: 4 additions & 3 deletions test/performance/vendor/github.com/nginx/agent/v2/src/plugins/common.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions test/performance/vendor/github.com/nginx/agent/v2/src/plugins/events.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 17 additions & 14 deletions test/performance/vendor/github.com/nginx/agent/v2/src/plugins/features.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.