splunk_logger: move environment hook to splunk_logger pt2

for reusability also in image-builder
osbuild · Aug 14, 2024 · 13737f9 · 13737f9
1 parent 0239db5
commit 13737f9
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 37 deletions.
diff --git a/cmd/osbuild-composer/main.go b/cmd/osbuild-composer/main.go
@@ -85,7 +85,7 @@ func main() {
 	}
 
 	if config.DeploymentChannel != "" {
-		logrus.AddHook(&common.EnvironmentHook{Channel: config.DeploymentChannel})
+		logrus.AddHook(&slogger.EnvironmentHook{Channel: config.DeploymentChannel})
 	}
 
 	if config.SplunkHost != "" {

diff --git a/go.mod b/go.mod
@@ -39,7 +39,7 @@ require (
 	github.com/openshift-online/ocm-sdk-go v0.1.432
 	github.com/oracle/oci-go-sdk/v54 v54.0.0
 	github.com/osbuild/images v0.77.0
-	github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20231117174845-e969a9dc3cd1
+	github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d
 	github.com/osbuild/pulp-client v0.1.0
 	github.com/prometheus/client_golang v1.19.1
 	github.com/segmentio/ksuid v1.0.4

diff --git a/go.sum b/go.sum
@@ -470,8 +470,8 @@ github.com/oracle/oci-go-sdk/v54 v54.0.0 h1:CDLjeSejv2aDpElAJrhKpi6zvT/zhZCZuXch
 github.com/oracle/oci-go-sdk/v54 v54.0.0/go.mod h1:+t+yvcFGVp+3ZnztnyxqXfQDsMlq8U25faBLa+mqCMc=
 github.com/osbuild/images v0.77.0 h1:O0Nv07M7b3YuY+c83/NFjWFachO+aH714zu7r+QkdsU=
 github.com/osbuild/images v0.77.0/go.mod h1:14LZWLSsQ02C/vZ+EzBkp+OcdjebnWDJ8moz8o/a0J4=
-github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20231117174845-e969a9dc3cd1 h1:UFEJIcPa46W8gtWgOYzriRKYyy1t6SWL0BI7fPTuVvc=
-github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20231117174845-e969a9dc3cd1/go.mod h1:z+WA+dX6qMwc7fqY5jCzESDIlg4WR2sBQezxsoXv9Ik=
+github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d h1:r9BFPDv0uuA9k1947Jybcxs36c/pTywWS1gjeizvtcQ=
+github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d/go.mod h1:zR1iu/hOuf+OQNJlk70tju9IqzzM4ycq0ectkFBm94U=
 github.com/osbuild/pulp-client v0.1.0 h1:L0C4ezBJGTamN3BKdv+rKLuq/WxXJbsFwz/Hj7aEmJ8=
 github.com/osbuild/pulp-client v0.1.0/go.mod h1:rd/MLdfwwO2cQI1s056h8z32zAi3Bo90XhlAAryIvWc=
 github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f h1:/UDgs8FGMqwnHagNDPGOlts35QkhAZ8by3DR7nMih7M=

diff --git a/internal/common/environment_hook_test.go b/internal/common/environment_hook_test.go
diff --git a/internal/common/environment_hook.go → ...ser/pkg/splunk_logger/environment_hook.go b/internal/common/environment_hook.go → ...ser/pkg/splunk_logger/environment_hook.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -906,8 +906,8 @@ github.com/osbuild/images/pkg/rhsm
 github.com/osbuild/images/pkg/rhsm/facts
 github.com/osbuild/images/pkg/rpmmd
 github.com/osbuild/images/pkg/runner
-# github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20231117174845-e969a9dc3cd1
-## explicit; go 1.19
+# github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d
+## explicit; go 1.21
 github.com/osbuild/osbuild-composer/pkg/splunk_logger
 # github.com/osbuild/pulp-client v0.1.0
 ## explicit; go 1.19