[chore] Updates TA to splunk-otel-collector v0.142.0 and marks TA as v1.10.0 (#7054)

dloucasfx · web-flow · commit 1a49b36e1ba7 · 2026-01-09T15:34:18.000-05:00
* [chore] Updates TA to splunk-otel-collector v0.142.0 and marks TA as v1.10.0

* [chore] fix lint errors

Signed-off-by: Dani Louca &lt;dlouca@splunk.com&gt;

---------

Signed-off-by: Dani Louca &lt;dlouca@splunk.com&gt;
diff --git a/packaging/technical-addon/Makefile b/packaging/technical-addon/Makefile
@@ -3,7 +3,7 @@ THIS_MAKEFILE_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
 include $(abspath $(THIS_MAKEFILE_DIR)/../../Makefile.Common)
 
 # Used for packaging
-OTEL_COLLECTOR_VERSION?=0.141.0
+OTEL_COLLECTOR_VERSION?=0.142.0
 SPLUNK_OTELCOL_DOWNLOAD_BASE?=https://github.com/signalfx/splunk-otel-collector/releases/download
 PLATFORM?=linux
 ARCH?=amd64
diff --git a/packaging/technical-addon/Splunk_TA_otel/CHANGELOG.md b/packaging/technical-addon/Splunk_TA_otel/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v1.10.0
+
+- Updates addon to use collector version v0.142.0
+
 ## v1.9.0
 
 - Updates addon to use collector version v0.141.0
diff --git a/packaging/technical-addon/Splunk_TA_otel/default/app.conf b/packaging/technical-addon/Splunk_TA_otel/default/app.conf
@@ -18,11 +18,11 @@ label = Splunk Add-on for OpenTelemetry Agent
 [launcher]
 author = Splunk, Inc.
 description = Splunk Add-on for OpenTelemetry is used to easily deploy OpenTelemetry Agent alongside Splunk Universal Forwarder to collect traces and metrics
-version = 1.9.0
+version = 1.10.0
 
 [package]
 id = Splunk_TA_otel
 
 [id]
 name = Splunk_TA_otel
-version = 1.9.0
+version = 1.10.0
diff --git a/packaging/technical-addon/cmd/modinput_config_generator/generator_test.go b/packaging/technical-addon/cmd/modinput_config_generator/generator_test.go
@@ -90,18 +90,18 @@ func TestRunner(t *testing.T) {
 
 	// Check Schema
 	code, output, err := tc.Exec(ctx, []string{"sudo", "/opt/splunk/bin/splunk", "btool", "check", "--debug"})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.LessOrEqual(t, code, 1)    // Other stanzas may be missing and thus have this be 0 or 1
 	assert.GreaterOrEqual(t, code, 0) // bound to [0,1]
 	read, err := io.ReadAll(output)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.NotContains(t, string(read), "Invalid Key in Stanza")
 
 	// check log output
 	_, output, err = tc.Exec(ctx, []string{"sudo", "cat", "/opt/splunk/var/log/splunk/Sample_Addon.log"})
 	require.NoError(t, err)
 	read, err = io.ReadAll(output)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	expectedJSON := `{"Flags":["--test-flag","/opt/splunk/etc/apps/Sample_Addon/local/access_token","--test-flag"],"EnvVars":["EVERYTHING_SET=/opt/splunk/etc/apps/Sample_Addon/local/access_token","UNARY_FLAG_WITH_EVERYTHING_SET=/opt/splunk/etc/apps/Sample_Addon/local/access_token"], "SplunkHome":"/opt/splunk/etc", "TaHome":"/opt/splunk/etc/apps/Sample_Addon", "PlatformHome":"/opt/splunk/etc/apps/Sample_Addon/linux_x86_64", "EverythingSet":"/opt/splunk/etc/apps/Sample_Addon/local/access_token", "MinimalSet":"", "MinimalSetRequired":"", "UnaryFlagWithEverythingSet":"/opt/splunk/etc/apps/Sample_Addon/local/access_token","Platform":"linux"}`
 	i := bytes.Index(read, []byte("Sample output:"))
 	line := read[i+len("Sample output:"):]
@@ -112,7 +112,7 @@ func TestRunner(t *testing.T) {
 	require.NoError(t, dec.Decode(unmarshalled))
 	expected := &ExampleOutput{}
 	require.NoError(t, json.Unmarshal([]byte(expectedJSON), expected))
-	assert.EqualValues(t, expected, unmarshalled)
+	assert.Equal(t, expected, unmarshalled)
 }
 
 func TestRunnerConfigGeneration(t *testing.T) {
@@ -135,9 +135,9 @@ func TestRunnerConfigGeneration(t *testing.T) {
 	for _, tc := range tests {
 		t.Run(tc.testSchemaName, func(tt *testing.T) {
 			config, err := loadYaml(tc.sampleYamlPath, tc.testSchemaName)
-			assert.NoError(tt, err)
+			require.NoError(tt, err)
 			err = generateModinputConfig(config, tc.outDir)
-			assert.NoError(tt, err)
+			require.NoError(tt, err)
 			assert.FileExists(tt, filepath.Join(filepath.Dir(tc.sampleYamlPath), "modinput_config.go"))
 		})
 	}
@@ -166,9 +166,9 @@ func TestInputsConfGeneration(t *testing.T) {
 	for _, tc := range tests {
 		t.Run(tc.testSchemaName, func(tt *testing.T) {
 			config, err := loadYaml(tc.sampleYamlPath, tc.testSchemaName)
-			assert.NoError(tt, err)
+			require.NoError(tt, err)
 			err = generateTaModInputConfs(config, tc.addonSourceDir, tc.outDir)
-			assert.NoError(tt, err)
+			require.NoError(tt, err)
 			testcommon.AssertFilesMatch(tt, filepath.Join("internal", "testdata", "pkg", "sample_addon", "expected", "inputs.conf"), filepath.Join(tc.outDir, tc.testSchemaName, "default", "inputs.conf"))
 			testcommon.AssertFilesMatch(tt, filepath.Join("internal", "testdata", "pkg", "sample_addon", "expected", "inputs.conf.spec"), filepath.Join(tc.outDir, tc.testSchemaName, "README", "inputs.conf.spec"))
 		})
diff --git a/packaging/technical-addon/internal/modularinput/inputs_processor.go b/packaging/technical-addon/internal/modularinput/inputs_processor.go
@@ -66,7 +66,7 @@ func (mip *ModinputProcessor) ProcessXML(modInput *XMLInput) error {
 	providedInputs := make(map[string]bool)
 
 	for _, stanza := range modInput.Configuration.Stanzas {
-		stanzaPrefix := fmt.Sprintf("%s://", mip.SchemaName)
+		stanzaPrefix := mip.SchemaName + "://"
 
 		if strings.HasPrefix(stanza.Name, stanzaPrefix) {
 			for _, param := range stanza.Params {
@@ -96,7 +96,7 @@ func (mip *ModinputProcessor) GetFlags() []string {
 	for _, modinputName := range keys {
 		modularInput := mip.ModularInputs[modinputName]
 		if modularInput.Config.Flag.Name != "" {
-			flags = append(flags, fmt.Sprintf("--%s", modularInput.Config.Flag.Name))
+			flags = append(flags, "--"+modularInput.Config.Flag.Name)
 			if !modularInput.Config.Flag.IsUnary {
 				flags = append(flags, modularInput.Value)
 			}
diff --git a/packaging/technical-addon/internal/modularinput/spec_test.go b/packaging/technical-addon/internal/modularinput/spec_test.go
@@ -25,7 +25,7 @@ import (
 func TestLoadConfig(t *testing.T) {
 	actual, err := LoadConfig("./testdata/sample-modular-inputs.yaml")
 	require.NoError(t, err)
-	require.EqualValues(t,
+	require.Equal(t,
 		&TemplateData{
 			ModularInputs: map[string]ModInputConfig{
 				"everything_set":                 {Description: "SET ALL THE THINGS", Default: "$SPLUNK_OTEL_TA_HOME/local/access_token", Flag: Flag{Name: "test-flag", IsUnary: false}, Required: false, PassthroughEnvVar: true, ReplaceableEnvVar: true},
diff --git a/packaging/technical-addon/internal/packaging/paths.go b/packaging/technical-addon/internal/packaging/paths.go
@@ -15,6 +15,7 @@
 package packaging
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -56,7 +57,7 @@ func findGitRoot(startDir string) (string, error) {
 
 		parentDir := filepath.Dir(dir)
 		if parentDir == dir {
-			return "", fmt.Errorf("no git repository found")
+			return "", errors.New("no git repository found")
 		}
 		dir = parentDir
 	}
@@ -69,7 +70,7 @@ func GetSourceDir() (string, error) {
 		fmt.Println("ADDONS_SOURCE_DIR not set, searching for make root")
 		sourceDir, err = findSourceRoot(".")
 		if err != nil || sourceDir == "" {
-			return "", fmt.Errorf("could not makefile to use as ADDONS_SOURCE_DIR and ADDONS_SOURCE_DIR was not specified as an env var")
+			return "", errors.New("could not makefile to use as ADDONS_SOURCE_DIR and ADDONS_SOURCE_DIR was not specified as an env var")
 		}
 	}
 	return sourceDir, nil
@@ -92,7 +93,7 @@ func findSourceRoot(startDir string) (string, error) {
 
 		parentDir := filepath.Dir(dir)
 		if parentDir == dir {
-			return "", fmt.Errorf("no Makefile found")
+			return "", errors.New("no Makefile found")
 		}
 		dir = parentDir
 	}
diff --git a/packaging/technical-addon/internal/packaging/targz_test.go b/packaging/technical-addon/internal/packaging/targz_test.go
@@ -39,7 +39,7 @@ func TestPackaging(t *testing.T) {
 	paths, err := getFilesFromTarGz(actualPath)
 	require.NoError(t, err)
 	expectedPaths := mapset.NewSet[string]("Sample_Addon/default/inputs.conf", "Sample_Addon/README/inputs.conf.spec", "Sample_Addon/linux_x86_64/bin/helloworld.sh")
-	assert.EqualValues(t, expectedPaths, paths, "expected paths to match, missing: %v ; extra: %v", expectedPaths.Difference(paths), paths.Difference(expectedPaths))
+	assert.Equal(t, expectedPaths, paths, "expected paths to match, missing: %v ; extra: %v", expectedPaths.Difference(paths), paths.Difference(expectedPaths))
 }
 
 func getFilesFromTarGz(tarGzPath string) (mapset.Set[string], error) {
diff --git a/packaging/technical-addon/internal/testaddon/splunk.go b/packaging/technical-addon/internal/testaddon/splunk.go
@@ -16,7 +16,6 @@ package testaddon
 
 import (
 	"context"
-	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
@@ -139,7 +138,7 @@ func PackAddon(t *testing.T, defaultModInputs *modularinput.GenericModularInput,
 	err = repackFunc(t, packedDir)
 	require.NoError(t, err)
 
-	addonPath := filepath.Join(t.TempDir(), fmt.Sprintf("%s.tgz", defaultModInputs.SchemaName))
+	addonPath := filepath.Join(t.TempDir(), defaultModInputs.SchemaName+".tgz")
 	err = packaging.PackageAddon(packedDir, addonPath)
 	require.NoError(t, err)
 
diff --git a/packaging/technical-addon/internal/testcommon/utils.go b/packaging/technical-addon/internal/testcommon/utils.go
@@ -22,20 +22,20 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func AssertFilesMatch(tt *testing.T, expectedPath, actualPath string) {
-	require.FileExists(tt, actualPath)
-	require.FileExists(tt, expectedPath)
+func AssertFilesMatch(t *testing.T, expectedPath, actualPath string) {
+	require.FileExists(t, actualPath)
+	require.FileExists(t, expectedPath)
 	expected, err := os.ReadFile(expectedPath)
 	if err != nil {
-		tt.Fatalf("Failed to read expected file: %v", err)
+		t.Fatalf("Failed to read expected file: %v", err)
 	}
 
 	actual, err := os.ReadFile(actualPath)
 	if err != nil {
-		tt.Fatalf("Failed to read actual file: %v", err)
+		t.Fatalf("Failed to read actual file: %v", err)
 	}
 
 	if diff := cmp.Diff(string(expected), string(actual)); diff != "" {
-		tt.Errorf("File contents mismatch (-expected +actual)\npaths: (%s, %s):\n%s", expectedPath, actualPath, diff)
+		t.Errorf("File contents mismatch (-expected +actual)\npaths: (%s, %s):\n%s", expectedPath, actualPath, diff)
 	}
 }
diff --git a/packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh b/packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh
@@ -69,7 +69,7 @@ if [ $ATTEMPT -gt $MAX_ATTEMPTS ]; then
 fi
 
 # For release, ensure version is as expected.  TODO move this to another test and compare against tag
-EXPECTED_ADDON_VERSION=v0.141.0
+EXPECTED_ADDON_VERSION=v0.142.0
 actual_version="$(grep "Version" "$TEST_FOLDER/splunk/otel.log" | head -1 | awk -F 'Version": "' '{print $2}' | awk -F '", "' '{print $1}')"
 echo "actual version: $actual_version"
 [[ "$actual_version" != "$EXPECTED_ADDON_VERSION" ]] && echo "Test failed -- invalid version" && exit 1
diff --git a/packaging/technical-addon/pkg/splunk_ta_otel_linux_autoinstrumentation/runner/javazeroconfig.go b/packaging/technical-addon/pkg/splunk_ta_otel_linux_autoinstrumentation/runner/javazeroconfig.go
@@ -83,7 +83,7 @@ func CreateZeroConfigJava(modInputs *SplunkTAOtelLinuxAutoinstrumentationModular
 		log.Printf("Not instrumenting java, as %q was not set", modInputs.AutoinstrumentationPath.Name)
 		return nil
 	}
-	resourceAttributes := fmt.Sprintf("splunk.zc.method=splunk-otel-auto-instrumentation-%s", strings.TrimSpace(javaVersion))
+	resourceAttributes := "splunk.zc.method=splunk-otel-auto-instrumentation-" + strings.TrimSpace(javaVersion)
 
 	if modInputs.DeploymentEnvironment.Value != "" {
 		resourceAttributes = fmt.Sprintf("%s,deployment.environment=%s", resourceAttributes, modInputs.DeploymentEnvironment.Value)
diff --git a/packaging/technical-addon/pkg/splunk_ta_otel_linux_autoinstrumentation/runner/javazeroconfig_test.go b/packaging/technical-addon/pkg/splunk_ta_otel_linux_autoinstrumentation/runner/javazeroconfig_test.go
@@ -20,7 +20,6 @@ import (
 	"io"
 	"os"
 	"path/filepath"
-	"regexp"
 	"strings"
 	"testing"
 	"time"
@@ -161,46 +160,46 @@ func TestHappyPath(t *testing.T) {
 	// Check Schema
 	ctx := context.Background()
 	code, output, err := tc.Exec(ctx, []string{"sudo", "/opt/splunk/bin/splunk", "btool", "check", "--debug"})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.LessOrEqual(t, code, 1)    // Other stanzas may be missing and thus have this be 0 or 1
 	assert.GreaterOrEqual(t, code, 0) // bound to [0,1]
 	read, err := io.ReadAll(output)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.NotContains(t, string(read), "Invalid Key in Stanza")
 
 	// check log output
 	_, output, err = tc.Exec(ctx, []string{"sudo", "cat", "/opt/splunk/var/log/splunk/Splunk_TA_otel_linux_autoinstrumentation.log"})
 	require.NoError(t, err)
 	read, err = io.ReadAll(output)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Contains(t, string(read), "Successfully generated java autoinstrumentation config at \"/etc/splunk/zeroconfig/java.conf\"")
 
 	// Check zeroconfig value
 	_, output, err = tc.Exec(ctx, []string{"sudo", "cat", "/etc/splunk/zeroconfig/java.conf"}, tcexec.Multiplexed())
 	require.NoError(t, err)
 	read, err = io.ReadAll(output)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, fmt.Sprintf("JAVA_TOOL_OPTIONS=-javaagent:/opt/splunk/etc/apps/Splunk_TA_otel_linux_autoinstrumentation/linux_x86_64/bin/splunk-otel-javaagent.jar\nOTEL_RESOURCE_ATTRIBUTES=splunk.zc.method=splunk-otel-auto-instrumentation-%s\nSPLUNK_PROFILER_ENABLED=false\nSPLUNK_PROFILER_MEMORY_ENABLED=false\nSPLUNK_METRICS_ENABLED=false", strings.TrimSpace(javaVersion)), strings.TrimSpace(string(read)))
 
 	// Check preload config
 	_, output, err = tc.Exec(ctx, []string{"sudo", "cat", "/etc/ld.so.preload"}, tcexec.Multiplexed())
 	require.NoError(t, err)
 	read, err = io.ReadAll(output)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.NotEmpty(t, read)
 	assert.Equal(t, "/opt/splunk/etc/apps/Splunk_TA_otel_linux_autoinstrumentation/linux_x86_64/bin/libsplunk_amd64.so", strings.TrimSpace(string(read)))
 
 	// check jar
 	_, output, err = tc.Exec(ctx, []string{"sudo", "sha256sum", "/opt/splunk/etc/apps/Splunk_TA_otel_linux_autoinstrumentation/linux_x86_64/bin/splunk-otel-javaagent.jar"}, tcexec.Multiplexed())
 	require.NoError(t, err)
 	read, err = io.ReadAll(output)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Contains(t, string(read), strings.TrimSpace(javaAgent256Sum))
 
 	// check for errors
 	_, output, err = tc.Exec(ctx, []string{"sudo", "cat", "/opt/splunk/var/log/splunk/Splunk_TA_otel_linux_autoinstrumentation.log"})
 	require.NoError(t, err)
 	read, err = io.ReadAll(output)
-	assert.NoError(t, err)
-	assert.NotRegexp(t, regexp.MustCompile(`(?i).*error.*`), string(read))
+	require.NoError(t, err)
+	assert.NotRegexp(t, `(?i).*error.*`, string(read))
 }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`package packaging`
`16`	`16`
`17`	`17`	`import (`
	`18`	`+ "errors"`
`18`	`19`	`"fmt"`
`19`	`20`	`"os"`
`20`	`21`	`"path/filepath"`
`@@ -56,7 +57,7 @@ func findGitRoot(startDir string) (string, error) {`
`56`	`57`
`57`	`58`	`parentDir := filepath.Dir(dir)`
`58`	`59`	`if parentDir == dir {`
`59`		`- return "", fmt.Errorf("no git repository found")`
	`60`	`+ return "", errors.New("no git repository found")`
`60`	`61`	`}`
`61`	`62`	`dir = parentDir`
`62`	`63`	`}`
`@@ -69,7 +70,7 @@ func GetSourceDir() (string, error) {`
`69`	`70`	`fmt.Println("ADDONS_SOURCE_DIR not set, searching for make root")`
`70`	`71`	`sourceDir, err = findSourceRoot(".")`
`71`	`72`	`if err != nil \|\| sourceDir == "" {`
`72`		`- return "", fmt.Errorf("could not makefile to use as ADDONS_SOURCE_DIR and ADDONS_SOURCE_DIR was not specified as an env var")`
	`73`	`+ return "", errors.New("could not makefile to use as ADDONS_SOURCE_DIR and ADDONS_SOURCE_DIR was not specified as an env var")`
`73`	`74`	`}`
`74`	`75`	`}`
`75`	`76`	`return sourceDir, nil`
`@@ -92,7 +93,7 @@ func findSourceRoot(startDir string) (string, error) {`
`92`	`93`
`93`	`94`	`parentDir := filepath.Dir(dir)`
`94`	`95`	`if parentDir == dir {`
`95`		`- return "", fmt.Errorf("no Makefile found")`
	`96`	`+ return "", errors.New("no Makefile found")`
`96`	`97`	`}`
`97`	`98`	`dir = parentDir`
`98`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func TestPackaging(t *testing.T) {`
`39`	`39`	`paths, err := getFilesFromTarGz(actualPath)`
`40`	`40`	`require.NoError(t, err)`
`41`	`41`	`expectedPaths := mapset.NewSet[string]("Sample_Addon/default/inputs.conf", "Sample_Addon/README/inputs.conf.spec", "Sample_Addon/linux_x86_64/bin/helloworld.sh")`
`42`		`- assert.EqualValues(t, expectedPaths, paths, "expected paths to match, missing: %v ; extra: %v", expectedPaths.Difference(paths), paths.Difference(expectedPaths))`
	`42`	`+ assert.Equal(t, expectedPaths, paths, "expected paths to match, missing: %v ; extra: %v", expectedPaths.Difference(paths), paths.Difference(expectedPaths))`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`func getFilesFromTarGz(tarGzPath string) (mapset.Set[string], error) {`
Original file line number	Diff line number	Diff line change
`@@ -22,20 +22,20 @@ import (`
`22`	`22`	`"github.com/stretchr/testify/require"`
`23`	`23`	`)`
`24`	`24`
`25`		`-func AssertFilesMatch(tt *testing.T, expectedPath, actualPath string) {`
`26`		`- require.FileExists(tt, actualPath)`
`27`		`- require.FileExists(tt, expectedPath)`
	`25`	`+func AssertFilesMatch(t *testing.T, expectedPath, actualPath string) {`
	`26`	`+ require.FileExists(t, actualPath)`
	`27`	`+ require.FileExists(t, expectedPath)`
`28`	`28`	`expected, err := os.ReadFile(expectedPath)`
`29`	`29`	`if err != nil {`
`30`		`- tt.Fatalf("Failed to read expected file: %v", err)`
	`30`	`+ t.Fatalf("Failed to read expected file: %v", err)`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`actual, err := os.ReadFile(actualPath)`
`34`	`34`	`if err != nil {`
`35`		`- tt.Fatalf("Failed to read actual file: %v", err)`
	`35`	`+ t.Fatalf("Failed to read actual file: %v", err)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`if diff := cmp.Diff(string(expected), string(actual)); diff != "" {`
`39`		`- tt.Errorf("File contents mismatch (-expected +actual)\npaths: (%s, %s):\n%s", expectedPath, actualPath, diff)`
	`39`	`+ t.Errorf("File contents mismatch (-expected +actual)\npaths: (%s, %s):\n%s", expectedPath, actualPath, diff)`
`40`	`40`	`}`
`41`	`41`	`}`