Use cfg.NewProvider() in run flags to respect enterprise provider factory (#4755)

* Use cfg.NewProvider() instead of cfg.NewDefaultProvider() in run flags

BuildRunnerConfig and configureMiddlewareAndOptions were loading app
config via cfg.NewDefaultProvider().GetConfig(), which always reads the
global singleton and bypasses any registered ProviderFactory. Enterprise
providers register a factory to merge OTEL config from an external
config-server; by skipping the factory, telemetry and usage-metrics
settings from that source were silently ignored on every `thv run`.

Switch both call sites to cfg.NewProvider().LoadOrCreateConfig(), which
checks registeredFactory first, then falls back to the default path for
non-enterprise deployments.

Add a unit test that exercises the LoadOrCreateConfig() path through a
PathProvider to document and guard the correct config-loading contract.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Address review: pass appConfig through, fix third NewDefaultProvider call

- Thread appConfig from BuildRunnerConfig into buildRunnerConfig and
  configureMiddlewareAndOptions so config is loaded exactly once per run
  instead of twice; eliminates the double I/O and the split-brain risk if
  the backing store returns different snapshots between calls
- Pass the factory-aware configProvider into setupRuntimeAndValidation so
  NewCLIEnvVarValidator also uses the provider from RegisterProviderFactory
  instead of constructing a NewDefaultProvider that bypasses it

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Fix line length lint violation in setupRuntimeAndValidation

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: reyortiz3

cmd/thv/app/run_flags.go

@@ -313,21 +313,25 @@ func BuildRunnerConfig(
 	}
 
 	// Load application config once for the entire build.
-	appConfig := cfg.NewDefaultProvider().GetConfig()
+	configProvider := cfg.NewProvider()
+	appConfig, err := configProvider.LoadOrCreateConfig()
+	if err != nil {
+		return nil, fmt.Errorf("failed to load application config: %w", err)
+	}
 
 	// Setup telemetry configuration
 	telemetryConfig := setupTelemetryConfiguration(cmd, runFlags, appConfig)
 
 	// Setup runtime and validation
-	rt, envVarValidator, err := setupRuntimeAndValidation(ctx)
+	rt, envVarValidator, err := setupRuntimeAndValidation(ctx, configProvider)
 	if err != nil {
 		return nil, err
 	}
 
 	if runFlags.RemoteURL != "" {
 		slog.Debug(fmt.Sprintf("Attempting to run remote MCP server: %s", runFlags.RemoteURL))
 		return buildRunnerConfig(ctx, runFlags, cmdArgs, debugMode, validatedHost, rt, runFlags.RemoteURL, nil,
-			nil, envVarValidator, oidcConfig, telemetryConfig)
+			nil, envVarValidator, oidcConfig, telemetryConfig, appConfig)
 	}
 
 	// Resolve image from registry without pulling (fast registry lookup only).
@@ -353,7 +357,7 @@ func BuildRunnerConfig(
 
 	// Build the runner config
 	runConfig, err := buildRunnerConfig(ctx, runFlags, cmdArgs, debugMode, validatedHost, rt, imageURL, serverMetadata,
-		envVars, envVarValidator, oidcConfig, telemetryConfig,
+		envVars, envVarValidator, oidcConfig, telemetryConfig, appConfig,
 		runner.WithRegistrySourceURLs(regAPIURL, regURL),
 		runner.WithRegistryServerName(regServerName))
 	if err != nil {
@@ -406,8 +410,11 @@ func setupTelemetryConfiguration(cmd *cobra.Command, runFlags *RunFlags, appConf
 		finalTelemetry.OtelUseLegacyAttributes)
 }
 
-// setupRuntimeAndValidation creates container runtime and selects environment variable validator
-func setupRuntimeAndValidation(ctx context.Context) (runtime.Deployer, runner.EnvVarValidator, error) {
+// setupRuntimeAndValidation creates container runtime and selects environment variable validator.
+// The provided configProvider is reused so the factory-registered provider is not bypassed.
+func setupRuntimeAndValidation(
+	ctx context.Context, configProvider cfg.Provider,
+) (runtime.Deployer, runner.EnvVarValidator, error) {
 	rt, err := container.NewFactory().Create(ctx)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to create container runtime: %w", err)
@@ -417,8 +424,7 @@ func setupRuntimeAndValidation(ctx context.Context) (runtime.Deployer, runner.En
 	if process.IsDetached() || runtime.IsKubernetesRuntime() {
 		envVarValidator = &runner.DetachedEnvVarValidator{}
 	} else {
-		cfgProvider := cfg.NewDefaultProvider()
-		envVarValidator = runner.NewCLIEnvVarValidator(cfgProvider)
+		envVarValidator = runner.NewCLIEnvVarValidator(configProvider)
 	}
 
 	return rt, envVarValidator, nil
@@ -585,6 +591,7 @@ func buildRunnerConfig(
 	envVarValidator runner.EnvVarValidator,
 	oidcConfig *auth.TokenValidatorConfig,
 	telemetryConfig *telemetry.Config,
+	appConfig *cfg.Config,
 	extraOpts ...runner.RunConfigBuilderOption,
 ) (*runner.RunConfig, error) {
 	transportType := resolveTransportType(runFlags, serverMetadata)
@@ -666,7 +673,7 @@ func buildRunnerConfig(
 
 	// Configure middleware and additional options
 	additionalOpts, err := configureMiddlewareAndOptions(runFlags, serverMetadata, toolsOverride, oidcConfig,
-		telemetryConfig, serverName, transportType)
+		telemetryConfig, serverName, transportType, appConfig)
 	if err != nil {
 		return nil, err
 	}
@@ -684,13 +691,10 @@ func configureMiddlewareAndOptions(
 	telemetryConfig *telemetry.Config,
 	serverName string,
 	transportType string,
+	appConfig *cfg.Config,
 ) ([]runner.RunConfigBuilderOption, error) {
 	var opts []runner.RunConfigBuilderOption
 
-	// Load application config for global settings
-	configProvider := cfg.NewDefaultProvider()
-	appConfig := configProvider.GetConfig()
-
 	// Resolve the OTel service name from the workload name when not explicitly set
 	telemetry.ResolveServiceName(telemetryConfig, serverName)
 

cmd/thv/app/run_flags_test.go

@@ -650,6 +650,47 @@ func TestResolveTransportType(t *testing.T) {
 	}
 }
 
+func TestSetupTelemetryConfiguration_LoadOrCreateConfigPath(t *testing.T) {
+	// This test validates the bug fix: BuildRunnerConfig and configureMiddlewareAndOptions
+	// must call provider.LoadOrCreateConfig() (not provider.GetConfig()) so that
+	// enterprise providers can merge OTEL config from external sources (e.g. config-server).
+	// LoadOrCreateConfig reads from the provider's backing store; GetConfig on
+	// DefaultProvider reads only the cached global singleton, bypassing any registered
+	// ProviderFactory.
+	t.Parallel()
+	slog.SetDefault(logging.New(logging.WithOutput(os.Stdout), logging.WithLevel(slog.LevelDebug), logging.WithFormat(logging.FormatText)))
+
+	provider, cleanup := createTestConfigProvider(t, &config.Config{
+		OTEL: config.OpenTelemetryConfig{
+			Endpoint:     "https://provider-endpoint.example.com",
+			SamplingRate: 0.42,
+			EnvVars:      []string{"PROVIDER_VAR=provider_value"},
+		},
+	})
+	defer cleanup()
+
+	// Simulate the fixed code path: call LoadOrCreateConfig() on the provider.
+	// The old buggy code called GetConfig() on DefaultProvider, which reads a
+	// global singleton and bypasses factory-registered providers entirely.
+	appConfig, err := provider.LoadOrCreateConfig()
+	require.NoError(t, err)
+
+	cmd := &cobra.Command{}
+	AddRunFlags(cmd, &RunFlags{})
+
+	result := getTelemetryFromFlags(
+		cmd, appConfig,
+		"", 0.0, nil, false, false, false, true, true,
+	)
+
+	assert.Equal(t, "https://provider-endpoint.example.com", result.OtelEndpoint,
+		"OTEL endpoint from provider config should be applied when no CLI flag is set")
+	assert.Equal(t, 0.42, result.OtelSamplingRate,
+		"OTEL sampling rate from provider config should be applied when no CLI flag is set")
+	assert.Equal(t, []string{"PROVIDER_VAR=provider_value"}, result.OtelEnvironmentVariables,
+		"OTEL env vars from provider config should be applied when no CLI flag is set")
+}
+
 func TestResolveServerName(t *testing.T) {
 	t.Parallel()