From 56abf2103053f11483ad1e515c097c9c8e86f2d8 Mon Sep 17 00:00:00 2001 From: "James Hughes (Splunk)" Date: Thu, 6 Feb 2025 13:51:29 -0800 Subject: [PATCH] Release/technical addon/v1.4.0 (#5872) * Updates TA to splunk-otel-collector v and marks TA as v1.4.0 * update test to 118 --- packaging/technical-addon/Makefile | 2 +- packaging/technical-addon/Splunk_TA_otel/default/app.conf | 4 ++-- .../packaging-scripts/cicd-tests/happypath-test.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/technical-addon/Makefile b/packaging/technical-addon/Makefile index afa397fdc2..540977952a 100644 --- a/packaging/technical-addon/Makefile +++ b/packaging/technical-addon/Makefile @@ -1,7 +1,7 @@ # Used for building SOURCE_DIR?=$(dir $(abspath $(lastword $(MAKEFILE_LIST)))) BUILD_DIR?=$(realpath .)/build -OTEL_COLLECTOR_VERSION?=0.111.0 +OTEL_COLLECTOR_VERSION?=0.118.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/default/app.conf b/packaging/technical-addon/Splunk_TA_otel/default/app.conf index 6850039f6e..44dff18e86 100644 --- 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.3.3 +version = 1.4.0 [package] id = Splunk_TA_otel [id] name = Splunk_TA_otel -version = 1.3.3 +version = 1.4.0 diff --git a/packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh b/packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh index 1610704768..2f37f2a536 100755 --- a/packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh +++ b/packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh @@ -121,7 +121,7 @@ fi # For release, ensure version is as expected. TODO move this to another test and compare against tag 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" != "v0.111.0" ]] && echo "Test failed -- invalid version" && exit 1 +[[ "$actual_version" != "v0.118.0" ]] && echo "Test failed -- invalid version" && exit 1 # clean up orca container splunk_orca --cloud ${ORCA_CLOUD} destroy "${deployment_id}"