[cmd/opampsupervisor] remove common package (open-telemetry#43885)

The code in this package was used in a single location. Moving the code
where it is needed and removing unused func.

---------

Signed-off-by: alex boten <[email protected]>

Author: codeboten

.chloggen/codeboten_opampsupervisor-rm-common.yaml

@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
+component: cmd/opampsupervisor
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove common package, moving code where it is used instead.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [43885]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [api]

cmd/opampsupervisor/supervisor/commander/commander.go

@@ -18,7 +18,6 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/common"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor/config"
 )
 
@@ -77,7 +76,7 @@ func (c *Commander) Start(ctx context.Context) error {
 	args := slices.Concat(c.args, c.cfg.Arguments)
 
 	c.cmd = exec.CommandContext(ctx, c.cfg.Executable, args...) // #nosec G204
-	c.cmd.Env = common.EnvVarMapToEnvMapSlice(c.cfg.Env)
+	c.cmd.Env = envVarMapToEnvMapSlice(c.cfg.Env)
 	c.cmd.SysProcAttr = sysProcAttrs()
 
 	// PassthroughLogging changes how collector start up happens
@@ -209,7 +208,7 @@ func (c *Commander) StartOneShot() ([]byte, []byte, error) {
 	ctx := context.Background()
 
 	cmd := exec.CommandContext(ctx, c.cfg.Executable, c.args...) // #nosec G204
-	cmd.Env = common.EnvVarMapToEnvMapSlice(c.cfg.Env)
+	cmd.Env = envVarMapToEnvMapSlice(c.cfg.Env)
 	cmd.SysProcAttr = sysProcAttrs()
 	// grab cmd pipes
 	stdoutPipe, err := cmd.StdoutPipe()
@@ -376,3 +375,15 @@ func (c *Commander) Stop(ctx context.Context) error {
 
 	return innerErr
 }
+
+func envVarMapToEnvMapSlice(m map[string]string) []string {
+	// let the command initialize the env itself
+	if m == nil {
+		return nil
+	}
+	result := os.Environ()
+	for key, value := range m {
+		result = append(result, key+"="+value)
+	}
+	return result
+}