STAC-21039 Submitting daily progress.

StackVista · Apr 25, 2024 · 055b2f1 · 055b2f1
1 parent 6c349a0
commit 055b2f1
Show file tree

Hide file tree

Showing 5 changed files with 239 additions and 174 deletions.
diff --git a/.gitlab-ci-agent.yml b/.gitlab-ci-agent.yml
@@ -183,7 +183,6 @@ deps_deb:
     - inv -e deps --verbose
     - go mod tidy
     - go mod vendor
-    - go mod tidy
     - inv agent.version --major-version $MAJOR_VERSION -u > version.txt
 #    - cd $GOPATH/pkg && tar czf $CI_PROJECT_DIR/go-pkg.tar.gz . || echo "No go-pkg"
 #    - cd $GOPATH/pkg && tar czf - . | split -b 800M - $CI_PROJECT_DIR/go-pkg.tar.gz.part. || echo "No go-pkg"
@@ -219,7 +218,6 @@ deps_rpm:
     - inv -e deps --verbose
     - go mod tidy
     - go mod vendor
-    - go mod tidy
     - inv agent.version --major-version $MAJOR_VERSION -u > version.txt
     - cd $GOPATH/pkg && tar czf $CI_PROJECT_DIR/go-pkg.tar.gz .
     - cd $GOPATH/bin && tar czf $CI_PROJECT_DIR/go-bin.tar.gz .
@@ -285,7 +283,6 @@ unit_tests:
     - inv -e deps --verbose
     - go mod tidy
     - go mod vendor
-    - go mod tidy
     # We run inv deps again because /go/bin is not cached and we need binaries like golint, misspell
     - inv deps
     - inv -e agent.build --race --major-version $MAJOR_VERSION --python-runtimes $PYTHON_RUNTIMES
@@ -317,7 +314,6 @@ filename_linting:
     - inv -e deps --verbose
     - go mod tidy
     - go mod vendor
-    - go mod tidy
     - inv -e lint-filenames
   rules:
     - when: on_success
@@ -354,7 +350,6 @@ build_binaries:
     - inv -e deps --verbose
     - go mod tidy
     - go mod vendor
-    - go mod tidy
     - inv -e dogstatsd.build --static --major-version $MAJOR_VERSION
     - inv -e rtloader.make
     - inv -e rtloader.install
@@ -381,7 +376,6 @@ build_cluster_agent:
     - inv -e deps --verbose
     - go mod tidy
     - go mod vendor
-    - go mod tidy
     - inv -e cluster-agent.build
     - ls -la $CI_PROJECT_DIR/bin/
   artifacts:
@@ -422,7 +416,6 @@ build_deb:
     - inv -e deps --verbose
     - go mod tidy
     - go mod vendor
-    - go mod tidy
     - inv agent.version --major-version $MAJOR_VERSION
     - cat version.txt || true
     - source ./.gitlab-scripts/setup_artifactory.sh

diff --git a/local.sh b/local.sh
@@ -5,7 +5,7 @@ SRC_PATH="/go/src/github.com/StackVista/stackstate-agent"
 WHAT=$1
 
 if [ -z "${WHAT}" ]; then
-	echo "Usage: $0 [all | prep | deps | build | ca_build]"
+	echo "Usage: $0 [all | prep | deps_deb | build_binaries | build_cluster_agent | build_deb]"
 	exit 1
 fi
 
@@ -18,7 +18,7 @@ if [ "${WHAT}" = "ALL" ] || [ "${WHAT}" = "PREP" ]; then
     ln -s "${CI_PROJECT_DIR}" /go/src/github.com/StackVista/stackstate-agent
 fi
 
-if [ "${WHAT}" = "ALL" ] || [ "${WHAT}" = "DEPS" ]; then
+if [ "${WHAT}" = "ALL" ] || [ "${WHAT}" = "DEPS_DEB" ]; then
     # shellcheck disable=SC2164
     go clean -modcache
 
@@ -35,7 +35,7 @@ if [ "${WHAT}" = "ALL" ] || [ "${WHAT}" = "DEPS" ]; then
     cat version.txt
 fi
 
-if [ "${WHAT}" = "ALL" ] || [ "${WHAT}" = "BUILD" ]; then
+if [ "${WHAT}" = "ALL" ] || [ "${WHAT}" = "BUILD_BINARIES" ]; then
     echo "          ---                      ---"
     echo "          --- Building agent       ---"
     echo "          ---                      ---"
@@ -53,9 +53,21 @@ if [ "${WHAT}" = "ALL" ] || [ "${WHAT}" = "BUILD" ]; then
     cd "$CI_PROJECT_DIR"
 fi
 
-if [ "${WHAT}" = "ALL" ] || [ "${WHAT}" = "CA_BUILD" ]; then
+if [ "${WHAT}" = "ALL" ] || [ "${WHAT}" = "BUILD_CLUSTER_AGENT" ]; then
     echo "          ---                        ---"
     echo "          --- Building cluster agent ---"
     echo "          ---                        ---"
     inv -e cluster-agent.build
 fi
+
+if [ "${WHAT}" = "ALL" ] || [ "${WHAT}" = "BUILD_DEB" ]; then
+    echo "          ---                      ---"
+    echo "          --- Building deb package  ---"
+    echo "          ---                      ---"
+    mv "${CI_PROJECT_DIR}"/.omnibus /omnibus || mkdir -p /omnibus
+    inv agent.version --major-version 3
+    cat version.txt || true
+    source ./.gitlab-scripts/setup_artifactory.sh
+    export OMNIBUS_BASE_DIR="/.omnibus"
+    inv -e agent.omnibus-build --gem-path $CI_PROJECT_DIR/.gems --base-dir $OMNIBUS_BASE_DIR --go-mod-cache $CI_PROJECT_DIR/vendor --skip-deps --skip-sign --major-version 3 --python-runtimes 3
+fi
diff --git a/pkg/trace/writer/trace.go b/pkg/trace/writer/trace.go
@@ -281,7 +281,7 @@ func (w *TraceWriter) flush() {
 	defer w.resetBuffer()
 
 	log.Debugf("Serializing %d tracer payloads.", len(w.tracerPayloads))
-	/* sts
+	/* sts */
 	p := pb.AgentPayload{
 		AgentVersion:       w.agentVersion,
 		HostName:           w.hostname,