Merge pull request #23682 from vespa-engine/revert-23676-arnej/use-go-logfmtv8.36.11

Revert "Arnej/use go logfmt"

5 files changed, 20 insertions, 36 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8972fada5bf..4fbc756236d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,21 +51,15 @@ add_subdirectory(ann_benchmark)
 add_subdirectory(application-model)
 add_subdirectory(application-preprocessor)
 add_subdirectory(athenz-identity-provider-service)
-add_subdirectory(client)
-add_subdirectory(cloud-tenant-cd)
-add_subdirectory(clustercontroller-apps)
-add_subdirectory(clustercontroller-core)
-add_subdirectory(clustercontroller-reindexer)
-add_subdirectory(clustercontroller-utils)
-add_subdirectory(config)
 add_subdirectory(config-bundle)
-add_subdirectory(configd)
-add_subdirectory(configdefinitions)
 add_subdirectory(config-model)
 add_subdirectory(config-model-api)
-add_subdirectory(config-model-fat)
 add_subdirectory(config-provisioning)
 add_subdirectory(config-proxy)
+add_subdirectory(config)
+add_subdirectory(config-model-fat)
+add_subdirectory(configd)
+add_subdirectory(configdefinitions)
 add_subdirectory(configserver)
 add_subdirectory(configserver-flags)
 add_subdirectory(configutil)
@@ -74,9 +68,14 @@ add_subdirectory(container-core)
 add_subdirectory(container-disc)
 add_subdirectory(container-messagebus)
 add_subdirectory(container-search)
-add_subdirectory(container-search-and-docproc)
 add_subdirectory(container-search-gui)
+add_subdirectory(container-search-and-docproc)
 add_subdirectory(container-spifly)
+add_subdirectory(cloud-tenant-cd)
+add_subdirectory(clustercontroller-apps)
+add_subdirectory(clustercontroller-core)
+add_subdirectory(clustercontroller-reindexer)
+add_subdirectory(clustercontroller-utils)
 add_subdirectory(defaults)
 add_subdirectory(docproc)
 add_subdirectory(docprocs)
@@ -99,8 +98,8 @@ add_subdirectory(jrt_test)
 add_subdirectory(linguistics)
 add_subdirectory(linguistics-components)
 add_subdirectory(logd)
-add_subdirectory(logforwarder)
 add_subdirectory(logserver)
+add_subdirectory(logforwarder)
 add_subdirectory(lowercasing_test)
 add_subdirectory(messagebus)
 add_subdirectory(messagebus_test)
@@ -128,22 +127,22 @@ add_subdirectory(tenant-cd-api)
 add_subdirectory(vbench)
 add_subdirectory(vdslib)
 add_subdirectory(vdstestlib)
-add_subdirectory(vespa-3party-bundles)
 add_subdirectory(vespa-athenz)
+add_subdirectory(vespa-feed-client)
+add_subdirectory(vespa-feed-client-cli)
+add_subdirectory(vespa-osgi-testrunner)
+add_subdirectory(vespa-testrunner-components)
+add_subdirectory(vespa_feed_perf)
+add_subdirectory(vespa-3party-bundles)
 add_subdirectory(vespabase)
 add_subdirectory(vespaclient)
-add_subdirectory(vespaclient-container-plugin)
 add_subdirectory(vespaclient-core)
+add_subdirectory(vespaclient-container-plugin)
 add_subdirectory(vespaclient-java)
-add_subdirectory(vespa-feed-client)
-add_subdirectory(vespa-feed-client-cli)
-add_subdirectory(vespa_feed_perf)
 add_subdirectory(vespajlib)
 add_subdirectory(vespalib)
 add_subdirectory(vespalog)
 add_subdirectory(vespamalloc)
-add_subdirectory(vespa-osgi-testrunner)
-add_subdirectory(vespa-testrunner-components)
 add_subdirectory(zkfacade)
 add_subdirectory(zookeeper-command-line-client)
 add_subdirectory(zookeeper-server)
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
deleted file mode 100644
index 1ca6d2b4e60..00000000000
--- a/client/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-set(GODIR ${CMAKE_CURRENT_SOURCE_DIR}/go)
-
-file(GLOB_RECURSE GOSRCFILES ${GODIR}/*.go)
-
-add_custom_command(OUTPUT ${GODIR}/bin/vespa-logfmt
-                   COMMAND make
-                   DEPENDS ${GODIR}/Makefile ${GOSRCFILES}
-                   WORKING_DIRECTORY ${GODIR})
-
-add_custom_target(vespalog_logfmt ALL DEPENDS ${GODIR}/bin/vespa-logfmt)
-
-install(PROGRAMS ${GODIR}/bin/vespa-logfmt DESTINATION bin)
diff --git a/client/go/.gitignore b/client/go/.gitignore
index baab7c638c6..8933bc220cb 100644
--- a/client/go/.gitignore
+++ b/client/go/.gitignore
@@ -6,4 +6,3 @@ share/
 !target/
 mytestapp/
 mytestapp-cache/
-mytmp/
diff --git a/client/go/Makefile b/client/go/Makefile
index 8a07f880c24..78adf299f0e 100644
--- a/client/go/Makefile
+++ b/client/go/Makefile
@@ -131,8 +131,7 @@ clean:
 	rmdir -p $(BIN) $(SHARE)/man/man1 > /dev/null 2>&1 || true
 
 test: ci
-	mkdir -p mytmp
-	TMPDIR=`pwd`/mytmp go test ./...
+	go test ./...
 
 checkfmt:
 	@bash -c "diff --line-format='%L' <(echo -n) <(gofmt -l .)" || { echo "one or more files need to be formatted: try make fmt to fix this automatically"; exit 1; }
diff --git a/vespalog/CMakeLists.txt b/vespalog/CMakeLists.txt
index cc419681445..45410a1d29d 100644
--- a/vespalog/CMakeLists.txt
+++ b/vespalog/CMakeLists.txt
@@ -17,5 +17,6 @@ vespa_define_module(
     src/test/threads
 )
 
+vespa_install_script(src/vespa-logfmt/vespa-logfmt.pl vespa-logfmt bin)
 install(FILES src/vespa-logfmt/vespa-logfmt.1 DESTINATION man/man1)
 install(DIRECTORY DESTINATION var/db/vespa/logcontrol)