Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 11 additions & 9 deletions cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ func startServer(cmd *cobra.Command, args []string) error {
// Enable AI integration + embedded AgentSpan by default for the local dev server.
// Passed as command-line args (Spring Boot's highest-precedence source) so this holds
// regardless of the downloaded jar's baked default; agentspan.embedded resolves from it.
javaArgs = append(javaArgs, aiIntegrationArgs()...)
javaArgs = append(javaArgs, localServerArgs()...)

serverTypeDisplay := "OSS"
if serverType == serverTypeOrkes {
Expand Down Expand Up @@ -894,16 +894,18 @@ func updateServer(cmd *cobra.Command, args []string) error {
return nil
}

// aiIntegrationArgs returns the Spring Boot command-line args that turn on the AI
// integration and the embedded AgentSpan runtime for the local server. These are enabled
// by default so agentic workflows work out of the box with `conductor server start`.
// Command-line args are Spring Boot's highest-precedence property source, so this holds
// even if the downloaded jar was built with the feature off; agentspan.embedded resolves
// from conductor.integrations.ai.enabled.
func aiIntegrationArgs() []string {
// localServerArgs returns the Spring Boot command-line args that every local server start
// passes. They turn on the AI integration with the embedded AgentSpan runtime, and the
// workflow message queue, so agentic workflows and workflow messaging work out of the box
// with `conductor server start`.
//
// Command-line args are Spring Boot's highest-precedence property source, so these hold
// regardless of the downloaded jar's baked defaults.
func localServerArgs() []string {
return []string{
"--conductor.integrations.ai.enabled=true",
"--agentspan.embedded=true",
"--conductor.workflow-message-queue.enabled=true",
}
}

Expand Down Expand Up @@ -978,7 +980,7 @@ func startLocalServer(port int) error {
}

// Enable AI integration + embedded AgentSpan by default (see startServer for rationale).
javaArgs = append(javaArgs, aiIntegrationArgs()...)
javaArgs = append(javaArgs, localServerArgs()...)

fmt.Printf("Starting OSS Conductor server (version: %s) on port %d...\n", version, port)

Expand Down
23 changes: 23 additions & 0 deletions cmd/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -468,3 +468,26 @@ func TestWritePidCreatesFile(t *testing.T) {
t.Errorf("got pid %d, want 42", pid)
}
}

func TestLocalServerArgs(t *testing.T) {
args := localServerArgs()

want := []string{
"--conductor.integrations.ai.enabled=true",
"--agentspan.embedded=true",
"--conductor.workflow-message-queue.enabled=true",
}

for _, w := range want {
found := false
for _, got := range args {
if got == w {
found = true
break
}
}
if !found {
t.Errorf("missing arg %q in %v", w, args)
}
}
}
Loading