Olivierg/pr 220 followw up (#225)

* Rename `package hostprofilerrunner` to `runner`

* Rename FullHostProfilerSettings to Config

* Move cli_flags.go config.go helpers.go to a new package `config`

* Rename settings to config in sanityCheck

* rename hostprofilerrunner.go to runner.go

* Rename configpkg to config and config to `c`

Author: ogaca-dd

hostprofilerrunner/cli_flags.go config/cli_flags.gohostprofilerrunner/cli_flags.go renamed to config/cli_flags.go

@@ -1,7 +1,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2024 Datadog, Inc.
 
-package hostprofilerrunner
+package config
 
 import (
 	"context"
@@ -52,11 +52,11 @@ const (
 	// This is the X in 2^(n + x) where n is the default hardcoded map size value
 	defaultArgMapScaleFactor = 0
 	// 1TB of executable address space
-	maxArgMapScaleFactor = 8
+	MaxArgMapScaleFactor = 8
 )
 
 type Arguments struct {
-	FullHostProfilerSettings
+	Config
 	Copyright   bool
 	VerboseMode bool
 	cmd         *cli.Command
@@ -126,7 +126,7 @@ func parseCLIArgs(osArgs []string) (*Arguments, error) {
 				Usage: fmt.Sprintf("Scaling factor for eBPF map sizes. "+
 					"Every increase by 1 doubles the map size. Increase if you see eBPF map size errors. "+
 					"Default is %d corresponding to 4GB of executable address space, max is %d.",
-					defaultArgMapScaleFactor, maxArgMapScaleFactor),
+					defaultArgMapScaleFactor, MaxArgMapScaleFactor),
 				Destination: &args.MapScaleFactor,
 				Sources:     cli.EnvVars("DD_HOST_PROFILING_MAP_SCALE_FACTOR"),
 			},
@@ -397,10 +397,10 @@ func (args *Arguments) Dump() {
 	}
 }
 
-func CreateDefaultFullHostProfilerSettings() (*FullHostProfilerSettings, error) {
+func CreateConfig() (*Config, error) {
 	args, err := parseCLIArgs(nil)
 	if err != nil {
 		return nil, err
 	}
-	return &args.FullHostProfilerSettings, nil
+	return &args.Config, nil
 }

…ofilerrunner/fullhostprofilersettings.go config/config.gohostprofilerrunner/fullhostprofilersettings.go renamed to config/config.go hostprofilerrunner/fullhostprofilersettings.go renamed to config/config.go

@@ -1,7 +1,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2024 Datadog, Inc.
 
-package hostprofilerrunner
+package config
 
 import (
 	"encoding/json"
@@ -57,7 +57,7 @@ func (s *additionalSymbolEndpoints) Get() interface{} {
 	return s
 }
 
-type FullHostProfilerSettings struct {
+type Config struct {
 	BPFVerifierLogLevel           uint64
 	AgentURL                      string
 	MapScaleFactor                uint64

hostprofilerrunner/helpers.go config/helpers.gohostprofilerrunner/helpers.go renamed to config/helpers.go

@@ -7,7 +7,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2024 Datadog, Inc.
 
-package hostprofilerrunner
+package config
 
 import (
 	"fmt"
@@ -48,9 +48,9 @@ func ValidateTags(tags string) reporter.Tags {
 	return validatedTags
 }
 
-func addTagsFromArgs(tags *reporter.Tags, settings *FullHostProfilerSettings) {
-	if settings.Environment != "" {
-		*tags = append(*tags, reporter.MakeTag("env", settings.Environment))
+func AddTagsFromArgs(tags *reporter.Tags, config *Config) {
+	if config.Environment != "" {
+		*tags = append(*tags, reporter.MakeTag("env", config.Environment))
 	}
 }
 
@@ -80,13 +80,13 @@ func IsAPPKeyValid(key string) bool {
 	return true
 }
 
-func intakeURLForSite(site string) (string, error) {
+func IntakeURLForSite(site string) (string, error) {
 	u := fmt.Sprintf("https://intake.profile.%s/api/v2/profile", site)
 	_, err := url.Parse(u)
 	return u, err
 }
 
-func intakeURLForAgent(agentURL string) (string, error) {
+func IntakeURLForAgent(agentURL string) (string, error) {
 	const profilingEndPoint = "/profiling/v1/input"
 	return url.JoinPath(agentURL, profilingEndPoint)
 }

hostprofilerrunner/helpers_test.go config/helpers_test.gohostprofilerrunner/helpers_test.go renamed to config/helpers_test.go

@@ -1,7 +1,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2025 Datadog, Inc.
 
-package hostprofilerrunner
+package config
 
 import (
 	"reflect"

main.go

@@ -18,26 +18,27 @@ import (
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 
-	"github.com/DataDog/dd-otel-host-profiler/hostprofilerrunner"
+	"github.com/DataDog/dd-otel-host-profiler/config"
+	"github.com/DataDog/dd-otel-host-profiler/runner"
 )
 
 func main() {
 	os.Exit(int(mainWithExitCode()))
 }
 
-func mainWithExitCode() hostprofilerrunner.ExitCode {
-	args, err := hostprofilerrunner.ParseArgs()
+func mainWithExitCode() runner.ExitCode {
+	args, err := config.ParseArgs()
 	if err != nil {
-		return hostprofilerrunner.ParseError("Failure to parse arguments: %v", err)
+		return runner.ParseError("Failure to parse arguments: %v", err)
 	}
 
 	if args == nil {
-		return hostprofilerrunner.ExitSuccess
+		return runner.ExitSuccess
 	}
 
 	if args.Copyright {
-		fmt.Print(hostprofilerrunner.Copyright)
-		return hostprofilerrunner.ExitSuccess
+		fmt.Print(config.Copyright)
+		return runner.ExitSuccess
 	}
 
 	// Context to drive main goroutine and the Tracer monitors.
@@ -51,5 +52,5 @@ func mainWithExitCode() hostprofilerrunner.ExitCode {
 		args.Dump()
 	}
 
-	return hostprofilerrunner.RunHostProfiler(mainCtx, &args.FullHostProfilerSettings)
+	return runner.Run(mainCtx, &args.Config)
 }