Ensure we pass the open telemetry through bootstrap

If we don't pass the values through bootstrap, then we end up bouncing
the agent multiple times to get the right value.

cloudconfig/instancecfg/instancecfg.go

@@ -500,6 +500,10 @@ func (cfg *InstanceConfig) AgentConfig(
 		configParams.AgentLogfileMaxSizeMB = cfg.ControllerConfig.AgentLogfileMaxSizeMB()
 		configParams.QueryTracingEnabled = cfg.ControllerConfig.QueryTracingEnabled()
 		configParams.QueryTracingThreshold = cfg.ControllerConfig.QueryTracingThreshold()
+		configParams.OpenTelemetryEnabled = cfg.ControllerConfig.OpenTelemetryEnabled()
+		configParams.OpenTelemetryEndpoint = cfg.ControllerConfig.OpenTelemetryEndpoint()
+		configParams.OpenTelemetryInsecure = cfg.ControllerConfig.OpenTelemetryInsecure()
+		configParams.OpenTelemetryStackTraces = cfg.ControllerConfig.OpenTelemetryStackTraces()
 	}
 	if cfg.Bootstrap == nil {
 		return agent.NewAgentConfig(configParams)

cloudconfig/podcfg/podcfg.go

@@ -100,17 +100,21 @@ func (cfg *ControllerPodConfig) AgentConfig(tag names.Tag) (agent.ConfigSetterWr
 			LogDir:          cfg.LogDir,
 			MetricsSpoolDir: cfg.MetricsSpoolDir,
 		},
-		Tag:                   tag,
-		UpgradedToVersion:     cfg.JujuVersion,
-		Password:              cfg.APIInfo.Password,
-		APIAddresses:          cfg.APIHostAddrs(),
-		CACert:                cfg.APIInfo.CACert,
-		Values:                cfg.AgentEnvironment,
-		Controller:            cfg.ControllerTag,
-		Model:                 cfg.APIInfo.ModelTag,
-		MongoMemoryProfile:    mongo.MemoryProfile(cfg.Controller.MongoMemoryProfile()),
-		QueryTracingEnabled:   cfg.Controller.QueryTracingEnabled(),
-		QueryTracingThreshold: cfg.Controller.QueryTracingThreshold(),
+		Tag:                      tag,
+		UpgradedToVersion:        cfg.JujuVersion,
+		Password:                 cfg.APIInfo.Password,
+		APIAddresses:             cfg.APIHostAddrs(),
+		CACert:                   cfg.APIInfo.CACert,
+		Values:                   cfg.AgentEnvironment,
+		Controller:               cfg.ControllerTag,
+		Model:                    cfg.APIInfo.ModelTag,
+		MongoMemoryProfile:       mongo.MemoryProfile(cfg.Controller.MongoMemoryProfile()),
+		QueryTracingEnabled:      cfg.Controller.QueryTracingEnabled(),
+		QueryTracingThreshold:    cfg.Controller.QueryTracingThreshold(),
+		OpenTelemetryEnabled:     cfg.Controller.OpenTelemetryEnabled(),
+		OpenTelemetryEndpoint:    cfg.Controller.OpenTelemetryEndpoint(),
+		OpenTelemetryInsecure:    cfg.Controller.OpenTelemetryInsecure(),
+		OpenTelemetryStackTraces: cfg.Controller.OpenTelemetryStackTraces(),
 	}
 	return agent.NewStateMachineConfig(configParams, cfg.Bootstrap.StateServingInfo)
 }

cmd/jujud/agent/agenttest/agent.go

@@ -195,6 +195,11 @@ func (s *AgentSuite) PrimeAgentVersion(c *gc.C, tag names.Tag, password string,
 
 			QueryTracingEnabled:   controller.DefaultQueryTracingEnabled,
 			QueryTracingThreshold: controller.DefaultQueryTracingThreshold,
+
+			OpenTelemetryEnabled:     controller.DefaultOpenTelemetryEnabled,
+			OpenTelemetryEndpoint:    "",
+			OpenTelemetryInsecure:    controller.DefaultOpenTelemetryInsecure,
+			OpenTelemetryStackTraces: controller.DefaultOpenTelemetryStackTraces,
 		},
 	)
 	c.Assert(err, jc.ErrorIsNil)
@@ -266,6 +271,11 @@ func (s *AgentSuite) WriteStateAgentConfig(
 			MongoMemoryProfile:    controller.DefaultMongoMemoryProfile,
 			QueryTracingEnabled:   controller.DefaultQueryTracingEnabled,
 			QueryTracingThreshold: controller.DefaultQueryTracingThreshold,
+
+			OpenTelemetryEnabled:     controller.DefaultOpenTelemetryEnabled,
+			OpenTelemetryEndpoint:    "",
+			OpenTelemetryInsecure:    controller.DefaultOpenTelemetryInsecure,
+			OpenTelemetryStackTraces: controller.DefaultOpenTelemetryStackTraces,
 		},
 		controller.StateServingInfo{
 			Cert:         coretesting.ServerCert,

cmd/jujud/agent/bootstrap.go

@@ -303,6 +303,10 @@ func (c *BootstrapCommand) Run(ctx *cmd.Context) error {
 		agentConfig.SetJujuDBSnapChannel(args.ControllerConfig.JujuDBSnapChannel())
 		agentConfig.SetQueryTracingEnabled(args.ControllerConfig.QueryTracingEnabled())
 		agentConfig.SetQueryTracingThreshold(args.ControllerConfig.QueryTracingThreshold())
+		agentConfig.SetOpenTelemetryEnabled(args.ControllerConfig.OpenTelemetryEnabled())
+		agentConfig.SetOpenTelemetryEndpoint(args.ControllerConfig.OpenTelemetryEndpoint())
+		agentConfig.SetOpenTelemetryInsecure(args.ControllerConfig.OpenTelemetryInsecure())
+		agentConfig.SetOpenTelemetryStackTraces(args.ControllerConfig.OpenTelemetryStackTraces())
 		return nil
 	}); err != nil {
 		return fmt.Errorf("cannot write agent config: %v", err)

state/controller_test.go

@@ -70,6 +70,10 @@ func (s *ControllerSuite) TestControllerAndModelConfigInitialisation(c *gc.C) {
 		controller.ApplicationResourceDownloadLimit,
 		controller.QueryTracingEnabled,
 		controller.QueryTracingThreshold,
+		controller.OpenTelemetryEnabled,
+		controller.OpenTelemetryEndpoint,
+		controller.OpenTelemetryInsecure,
+		controller.OpenTelemetryStackTraces,
 	)
 	for _, controllerAttr := range controller.ControllerOnlyConfigAttributes {
 		v, ok := controllerSettings.Get(controllerAttr)