Full adopt default collectd config directory

Ryan Fitzpatrick · Ryan Fitzpatrick · commit 90579e8ff59a · 2021-04-13T16:29:23.000Z
diff --git a/cmd/otelcol/Dockerfile b/cmd/otelcol/Dockerfile
@@ -25,7 +25,7 @@ RUN mkdir -p "$(dirname "/usr/lib/splunk-otel-collector/agent-bundle")" && \
 
 FROM scratch
 ENV SPLUNK_BUNDLE_DIR=/usr/lib/splunk-otel-collector/agent-bundle
-ENV SPLUNK_COLLECTD_DIR=$SIGNALFX_BUNDLE_DIR/run/collectd
+ENV SPLUNK_COLLECTD_DIR=${SPLUNK_BUNDLE_DIR}/run/collectd
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=otelcol /otelcol /
 # Maintaining interpreter location as required.
diff --git a/internal/extension/smartagentextension/factory.go b/internal/extension/smartagentextension/factory.go
@@ -73,6 +73,8 @@ func createDefaultConfig() config.Extension {
 	}
 	cfg.BundleDir = bundleDir
 	cfg.Collectd.BundleDir = bundleDir
+	cfg.Collectd.ConfigDir = filepath.Join(bundleDir, "run", "collectd")
+
 	return &Config{
 		ExtensionSettings: config.ExtensionSettings{
 			TypeVal: typeStr,
diff --git a/internal/receiver/smartagentreceiver/receiver_test.go b/internal/receiver/smartagentreceiver/receiver_test.go
@@ -327,7 +327,7 @@ func TestSmartAgentConfigProviderOverrides(t *testing.T) {
 		IntervalSeconds:      10,
 		WriteServerIPAddr:    "127.9.8.7",
 		WriteServerPort:      0,
-		ConfigDir:            "/etc/",
+		ConfigDir:            "/opt/run/collectd",
 		BundleDir:            "/opt/",
 		HasGenericJMXMonitor: false,
 		InstanceName:         "",
diff --git a/internal/receiver/smartagentreceiver/testdata/extension_config.yaml b/internal/receiver/smartagentreceiver/testdata/extension_config.yaml
@@ -6,15 +6,13 @@ extensions:
       readThreads: 1
       writeThreads: 4
       writeQueueLimitHigh: 5
-      configDir: /etc/
   smartagent/extra:
     bundleDir: /opt/
     collectd:
       timeout: 10
       readThreads: 1
       writeThreads: 4
       writeQueueLimitHigh: 5
-      configDir: /etc/
 
 receivers:
   nop:

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,8 @@ func createDefaultConfig() config.Extension {`
`73`	`73`	`}`
`74`	`74`	`cfg.BundleDir = bundleDir`
`75`	`75`	`cfg.Collectd.BundleDir = bundleDir`
	`76`	`+ cfg.Collectd.ConfigDir = filepath.Join(bundleDir, "run", "collectd")`
	`77`	`+`
`76`	`78`	`return &Config{`
`77`	`79`	`ExtensionSettings: config.ExtensionSettings{`
`78`	`80`	`TypeVal: typeStr,`