Aix config

cmd/opampsupervisor/main.go

@@ -9,6 +9,7 @@ import (
 	"log"
 	"os"
 	"os/signal"
+	"syscall"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/config"
@@ -46,7 +47,7 @@ func runInteractive() error {
 	}
 
 	interrupt := make(chan os.Signal, 1)
-	signal.Notify(interrupt, os.Interrupt)
+	signal.Notify(interrupt, os.Interrupt, syscall.SIGTERM)
 	<-interrupt
 	supervisor.Shutdown()
 

cmd/opampsupervisor/supervisor/commander/commander_aix.go

@@ -0,0 +1,20 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+//go:build aix
+
+package commander
+
+import (
+	"os"
+	"syscall"
+)
+
+func sendShutdownSignal(process *os.Process) error {
+	return process.Signal(syscall.SIGTERM)
+}
+
+func sysProcAttrs() *syscall.SysProcAttr {
+	// On non-windows systems, no extra attributes are needed.
+	return nil
+}

cmd/opampsupervisor/supervisor/commander/commander_others.go

@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-//go:build !windows
+//go:build !windows && !aix
 
 package commander
 

cmd/opampsupervisor/supervisor/templates/nooppipeline.yaml

@@ -8,3 +8,9 @@ service:
     traces:
       receivers: [nop]
       exporters: [nop]
+
+  telemetry:
+    # Disable agents own telemetry to avoid port binding collisions for port 8888. Bindplane
+    # will enable metrics and configure the port when a configuration is pushed to the agent.
+    metrics:
+      level: none

cmd/opampsupervisor/supervisor/templates/opampextension.yaml

@@ -13,3 +13,9 @@ extensions:
 
 service:
   extensions: [opamp]
+
+  telemetry:
+    # Disable agents own telemetry to avoid port binding collisions for port 8888. Bindplane
+    # will enable metrics and configure the port when a configuration is pushed to the agent.
+    metrics:
+      level: none