Merge commit from fork

chore: merge 3.4 into 3.5

agent/addons/addons.go

@@ -4,12 +4,12 @@
 package addons
 
 import (
+	"path"
 	"runtime"
 
 	"github.com/juju/clock"
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
-	"github.com/juju/names/v5"
 	"github.com/juju/worker/v3"
 	"github.com/juju/worker/v3/dependency"
 	"github.com/prometheus/client_golang/prometheus"
@@ -22,17 +22,14 @@ import (
 
 var logger = loggo.GetLogger("juju.cmd.jujud.agent.addons")
 
-// DefaultIntrospectionSocketName returns the socket name to use for the
-// abstract domain socket that the introspection worker serves requests
-// over.
-func DefaultIntrospectionSocketName(entityTag names.Tag) string {
-	return "jujud-" + entityTag.String()
-}
+// IntrospectionSocketName is the name of the socket file inside
+// the agent's directory used for introspection calls.
+const IntrospectionSocketName = "introspection.socket"
 
 // IntrospectionConfig defines the various components that the introspection
 // worker reports on or needs to start up.
 type IntrospectionConfig struct {
-	AgentTag           names.Tag
+	AgentDir           string
 	Engine             *dependency.Engine
 	StatePoolReporter  introspection.Reporter
 	PubSubReporter     introspection.Reporter
@@ -43,8 +40,7 @@ type IntrospectionConfig struct {
 	LocalHub           introspection.SimpleHub
 	CentralHub         introspection.StructuredHub
 
-	NewSocketName func(names.Tag) string
-	WorkerFunc    func(config introspection.Config) (worker.Worker, error)
+	WorkerFunc func(config introspection.Config) (worker.Worker, error)
 }
 
 // StartIntrospection creates the introspection worker. It cannot and should
@@ -59,7 +55,7 @@ func StartIntrospection(cfg IntrospectionConfig) error {
 		return nil
 	}
 
-	socketName := cfg.NewSocketName(cfg.AgentTag)
+	socketName := path.Join(cfg.AgentDir, IntrospectionSocketName)
 	w, err := cfg.WorkerFunc(introspection.Config{
 		SocketName:         socketName,
 		DepEngine:          cfg.Engine,

agent/addons/addons_test.go

@@ -10,7 +10,6 @@ import (
 	"github.com/juju/clock"
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
-	"github.com/juju/names/v5"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/worker/v3"
@@ -55,8 +54,7 @@ func (s *introspectionSuite) TestStartError(c *gc.C) {
 	}
 
 	cfg := addons.IntrospectionConfig{
-		AgentTag:      names.NewMachineTag("42"),
-		NewSocketName: addons.DefaultIntrospectionSocketName,
+		AgentDir: c.MkDir(),
 		WorkerFunc: func(_ introspection.Config) (worker.Worker, error) {
 			return nil, errors.New("boom")
 		},
@@ -85,9 +83,8 @@ func (s *introspectionSuite) TestStartSuccess(c *gc.C) {
 	c.Assert(err, jc.ErrorIsNil)
 
 	cfg := addons.IntrospectionConfig{
-		AgentTag:      names.NewMachineTag("42"),
-		Engine:        engine,
-		NewSocketName: func(tag names.Tag) string { return "bananas" },
+		AgentDir: c.MkDir(),
+		Engine:   engine,
 		WorkerFunc: func(cfg introspection.Config) (worker.Worker, error) {
 			fake.config = cfg
 			return fake, nil
@@ -98,7 +95,7 @@ func (s *introspectionSuite) TestStartSuccess(c *gc.C) {
 	c.Assert(err, jc.ErrorIsNil)
 
 	c.Check(fake.config.DepEngine, gc.Equals, engine)
-	c.Check(fake.config.SocketName, gc.Equals, "bananas")
+	c.Check(fake.config.SocketName, jc.HasSuffix, "introspection.socket")
 
 	// Stopping the engine causes the introspection worker to stop.
 	engine.Kill()
@@ -110,11 +107,6 @@ func (s *introspectionSuite) TestStartSuccess(c *gc.C) {
 	}
 }
 
-func (s *introspectionSuite) TestDefaultIntrospectionSocketName(c *gc.C) {
-	name := addons.DefaultIntrospectionSocketName(names.NewMachineTag("42"))
-	c.Assert(name, gc.Equals, "jujud-machine-42")
-}
-
 type dummyWorker struct {
 	config introspection.Config
 	done   chan struct{}

cmd/containeragent/initialize/package_test.go

@@ -79,6 +79,7 @@ func (*importSuite) TestImports(c *gc.C) {
 		"environs/tags",
 		"feature",
 		"juju/osenv",
+		"juju/sockets",
 		"logfwd",
 		"logfwd/syslog",
 		"mongo",

cmd/containeragent/main_nix.go

@@ -181,7 +181,7 @@ func main() {
 			return cmd.Main(&run.RunCommand{MachineLock: lock}, ctx, args[1:])
 		},
 		jujuIntrospect: func(ctx *cmd.Context, args []string) int {
-			return cmd.Main(introspect.New(nil), ctx, args[1:])
+			return cmd.Main(introspect.New(), ctx, args[1:])
 		},
 		jujuDumpLogs: func(ctx *cmd.Context, args []string) int {
 			return cmd.Main(dumplogs.NewCommand(), ctx, args[1:])

cmd/containeragent/unit/agent.go

@@ -294,10 +294,9 @@ func (c *containerUnitAgent) workers(sigTermCh chan os.Signal) (worker.Worker, e
 		return nil, err
 	}
 	if err := addons.StartIntrospection(addons.IntrospectionConfig{
-		AgentTag:           c.CurrentConfig().Tag(),
+		AgentDir:           agentConfig.Dir(),
 		Engine:             eng,
 		MachineLock:        c.machineLock,
-		NewSocketName:      addons.DefaultIntrospectionSocketName,
 		PrometheusGatherer: c.prometheusRegistry,
 		WorkerFunc:         introspection.NewWorker,
 		Clock:              c.clk,

cmd/jujud-controller/agent/machine.go

@@ -271,7 +271,6 @@ func (a *machineAgentCmd) Info() *cmd.Info {
 func MachineAgentFactoryFn(
 	agentConfWriter agentconf.AgentConfigWriter,
 	bufferedLogger *logsender.BufferedLogWriter,
-	newIntrospectionSocketName func(names.Tag) string,
 	preUpgradeSteps upgrades.PreUpgradeStepsFunc,
 	rootDir string,
 ) machineAgentFactoryFnType {
@@ -287,7 +286,6 @@ func MachineAgentFactoryFn(
 				Logger:        logger,
 			}),
 			looputil.NewLoopDeviceManager(),
-			newIntrospectionSocketName,
 			preUpgradeSteps,
 			rootDir,
 			isCaasAgent,
@@ -302,7 +300,6 @@ func NewMachineAgent(
 	bufferedLogger *logsender.BufferedLogWriter,
 	runner *worker.Runner,
 	loopDeviceManager looputil.LoopDeviceManager,
-	newIntrospectionSocketName func(names.Tag) string,
 	preUpgradeSteps upgrades.PreUpgradeStepsFunc,
 	rootDir string,
 	isCaasAgent bool,
@@ -322,7 +319,6 @@ func NewMachineAgent(
 		rootDir:                     rootDir,
 		initialUpgradeCheckComplete: gate.NewLock(),
 		loopDeviceManager:           loopDeviceManager,
-		newIntrospectionSocketName:  newIntrospectionSocketName,
 		prometheusRegistry:          prometheusRegistry,
 		mongoTxnCollector:           mongometrics.NewTxnCollector(),
 		mongoDialCollector:          mongometrics.NewDialCollector(),
@@ -403,12 +399,11 @@ type MachineAgent struct {
 	mongoInitMutex   sync.Mutex
 	mongoInitialized bool
 
-	loopDeviceManager          looputil.LoopDeviceManager
-	newIntrospectionSocketName func(names.Tag) string
-	prometheusRegistry         *prometheus.Registry
-	mongoTxnCollector          *mongometrics.TxnCollector
-	mongoDialCollector         *mongometrics.DialCollector
-	preUpgradeSteps            upgrades.PreUpgradeStepsFunc
+	loopDeviceManager  looputil.LoopDeviceManager
+	prometheusRegistry *prometheus.Registry
+	mongoTxnCollector  *mongometrics.TxnCollector
+	mongoDialCollector *mongometrics.DialCollector
+	preUpgradeSteps    upgrades.PreUpgradeStepsFunc
 
 	centralHub    *pubsub.StructuredHub
 	pubsubMetrics *centralhub.PubsubMetrics
@@ -650,12 +645,11 @@ func (a *MachineAgent) makeEngineCreator(
 			return nil, err
 		}
 		if err := addons.StartIntrospection(addons.IntrospectionConfig{
-			AgentTag:           a.CurrentConfig().Tag(),
+			AgentDir:           a.CurrentConfig().Dir(),
 			Engine:             engine,
 			StatePoolReporter:  &statePoolReporter,
 			PubSubReporter:     pubsubReporter,
 			MachineLock:        a.machineLock,
-			NewSocketName:      a.newIntrospectionSocketName,
 			PrometheusGatherer: a.prometheusRegistry,
 			PresenceRecorder:   presenceRecorder,
 			WorkerFunc:         introspection.NewWorker,

cmd/jujud-controller/agent/util_test.go

@@ -190,7 +190,6 @@ func NewTestMachineAgentFactory(
 			rootDir:                     rootDir,
 			initialUpgradeCheckComplete: gate.NewLock(),
 			loopDeviceManager:           &mockLoopDeviceManager{},
-			newIntrospectionSocketName:  addons.DefaultIntrospectionSocketName,
 			prometheusRegistry:          prometheusRegistry,
 			mongoTxnCollector:           mongometrics.NewTxnCollector(),
 			mongoDialCollector:          mongometrics.NewDialCollector(),

cmd/jujud-controller/main.go

@@ -25,7 +25,6 @@ import (
 	"github.com/juju/utils/v3/exec"
 	"github.com/juju/version/v2"
 
-	"github.com/juju/juju/agent/addons"
 	k8sexec "github.com/juju/juju/caas/kubernetes/provider/exec"
 	jujucmd "github.com/juju/juju/cmd"
 	agentcmd "github.com/juju/juju/cmd/jujud-controller/agent"
@@ -267,7 +266,6 @@ func jujuDMain(args []string, ctx *cmd.Context) (code int, err error) {
 	machineAgentFactory := agentcmd.MachineAgentFactoryFn(
 		agentConf,
 		bufferedLogger,
-		addons.DefaultIntrospectionSocketName,
 		upgrades.PreUpgradeSteps,
 		"",
 	)
@@ -345,7 +343,6 @@ func jujuControllerMain(args []string, ctx *cmd.Context) (code int, err error) {
 	machineAgentFactory := agentcmd.MachineAgentFactoryFn(
 		agentConf,
 		bufferedLogger,
-		addons.DefaultIntrospectionSocketName,
 		upgrades.PreUpgradeSteps,
 		"",
 	)

cmd/jujud/agent/caasoperator.go

@@ -258,10 +258,9 @@ func (op *CaasOperatorAgent) Workers() (worker.Worker, error) {
 		return nil, err
 	}
 	if err := addons.StartIntrospection(addons.IntrospectionConfig{
-		AgentTag:           op.CurrentConfig().Tag(),
+		AgentDir:           agentConfig.Dir(),
 		Engine:             engine,
 		MachineLock:        op.machineLock,
-		NewSocketName:      addons.DefaultIntrospectionSocketName,
 		PrometheusGatherer: op.prometheusRegistry,
 		WorkerFunc:         introspection.NewWorker,
 		Clock:              clock.WallClock,

cmd/jujud/agent/machine.go

@@ -231,7 +231,6 @@ func (a *machineAgentCmd) Info() *cmd.Info {
 func MachineAgentFactoryFn(
 	agentConfWriter agentconf.AgentConfigWriter,
 	bufferedLogger *logsender.BufferedLogWriter,
-	newIntrospectionSocketName func(names.Tag) string,
 	preUpgradeSteps upgrades.PreUpgradeStepsFunc,
 	rootDir string,
 ) machineAgentFactoryFnType {
@@ -247,7 +246,6 @@ func MachineAgentFactoryFn(
 				Logger:        logger,
 			}),
 			looputil.NewLoopDeviceManager(),
-			newIntrospectionSocketName,
 			preUpgradeSteps,
 			rootDir,
 			isCaasAgent,
@@ -262,7 +260,6 @@ func NewMachineAgent(
 	bufferedLogger *logsender.BufferedLogWriter,
 	runner *worker.Runner,
 	loopDeviceManager looputil.LoopDeviceManager,
-	newIntrospectionSocketName func(names.Tag) string,
 	preUpgradeSteps upgrades.PreUpgradeStepsFunc,
 	rootDir string,
 	isCaasAgent bool,
@@ -282,7 +279,6 @@ func NewMachineAgent(
 		rootDir:                     rootDir,
 		initialUpgradeCheckComplete: gate.NewLock(),
 		loopDeviceManager:           loopDeviceManager,
-		newIntrospectionSocketName:  newIntrospectionSocketName,
 		prometheusRegistry:          prometheusRegistry,
 		preUpgradeSteps:             preUpgradeSteps,
 		isCaasAgent:                 isCaasAgent,
@@ -491,9 +487,10 @@ func (a *MachineAgent) makeEngineCreator(
 	agentName string, previousAgentVersion version.Number,
 ) func() (worker.Worker, error) {
 	return func() (worker.Worker, error) {
+		agentConfig := a.CurrentConfig()
 		engineConfigFunc := engine.DependencyEngineConfig
 		metrics := engine.NewMetrics()
-		controllerMetricsSink := metrics.ForModel(a.CurrentConfig().Model())
+		controllerMetricsSink := metrics.ForModel(agentConfig.Model())
 		engine, err := dependency.NewEngine(engineConfigFunc(controllerMetricsSink))
 		if err != nil {
 			return nil, err
@@ -568,11 +565,10 @@ func (a *MachineAgent) makeEngineCreator(
 			return nil, err
 		}
 		if err := addons.StartIntrospection(addons.IntrospectionConfig{
-			AgentTag:           a.CurrentConfig().Tag(),
+			AgentDir:           agentConfig.Dir(),
 			Engine:             engine,
 			StatePoolReporter:  &statePoolReporter,
 			MachineLock:        a.machineLock,
-			NewSocketName:      a.newIntrospectionSocketName,
 			PrometheusGatherer: a.prometheusRegistry,
 			WorkerFunc:         introspection.NewWorker,
 			Clock:              clock.WallClock,

cmd/jujud/agent/util_test.go

@@ -177,7 +177,6 @@ func NewTestMachineAgentFactory(
 			rootDir:                     rootDir,
 			initialUpgradeCheckComplete: gate.NewLock(),
 			loopDeviceManager:           &mockLoopDeviceManager{},
-			newIntrospectionSocketName:  addons.DefaultIntrospectionSocketName,
 			prometheusRegistry:          prometheusRegistry,
 			preUpgradeSteps:             preUpgradeSteps,
 			isCaasAgent:                 isCAAS,

cmd/jujud/introspect/introspect.go

@@ -10,6 +10,7 @@ import (
 	"net/http/httputil"
 	"net/url"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 
@@ -19,6 +20,7 @@ import (
 	"github.com/juju/names/v5"
 	"github.com/kr/pretty"
 
+	"github.com/juju/juju/agent"
 	"github.com/juju/juju/agent/addons"
 	apiagent "github.com/juju/juju/api/agent/agent"
 	jujucmd "github.com/juju/juju/cmd"
@@ -35,16 +37,11 @@ type IntrospectCommand struct {
 	verbose bool
 	post    bool
 	form    url.Values
-
-	// IntrospectionSocketName returns the socket name
-	// for a given tag. If IntrospectionSocketName is nil,
-	// agent.DefaultIntrospectionSocketName is used.
-	IntrospectionSocketName func(names.Tag) string
 }
 
 // New initializes IntrospectCommand.
-func New(sockNameGetter func(names.Tag) string) cmd.Command {
-	return &IntrospectCommand{IntrospectionSocketName: sockNameGetter}
+func New() cmd.Command {
+	return &IntrospectCommand{}
 }
 
 const introspectCommandDoc = `
@@ -127,11 +124,7 @@ func (c *IntrospectCommand) Run(ctx *cmd.Context) error {
 		return err
 	}
 
-	getSocketName := c.IntrospectionSocketName
-	if getSocketName == nil {
-		getSocketName = addons.DefaultIntrospectionSocketName
-	}
-	socketName := "@" + getSocketName(tag)
+	socketName := path.Join(agent.Dir(c.dataDir, tag), addons.IntrospectionSocketName)
 	if c.listen != "" {
 		listener, err := net.Listen("tcp", c.listen)
 		if err != nil {