From dfbc5355d5d27e8e3d453f56bae37d02960430b6 Mon Sep 17 00:00:00 2001
From: Jose Riguera <jriguera@gmail.com>
Date: Wed, 28 Aug 2024 17:36:07 +0200
Subject: [PATCH] Use latest release

---
 packages/otelcollector-linux-amd64/packaging | 6 +++---
 packages/otelcollector-linux-amd64/spec      | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/otelcollector-linux-amd64/packaging b/packages/otelcollector-linux-amd64/packaging
index 458ca61..e27e847 100644
--- a/packages/otelcollector-linux-amd64/packaging
+++ b/packages/otelcollector-linux-amd64/packaging
@@ -2,8 +2,8 @@
 set -e -x
 
 BOSH_PACKAGES_DIR=${BOSH_PACKAGES_DIR:-/var/vcap/packages}
-OTELCOL_VERSION=$(ls -vr otelcollector-linux-amd64/otelcol-contrib_*_linux_amd64* | sed 's/.*\/otelcol-contrib_\(.*\)_linux_amd64.*$/\1/' | head -1)
-FILE=$(ls -vr  "otelcollector-linux-amd64/otelcol-contrib_${OTELCOL_VERSION}_linux_amd64"* | head -1)
+OTELCOL_VERSION=$(ls -vr otelcollector-linux-amd64/otelcol-*_linux_amd64* | sed 's/.*\/otelcol-\(.*\)_\(.*\)_linux_amd64.*$/\2/' | head -1)
+FILE=$(ls -vr otelcollector-linux-amd64/otelcol-*_${OTELCOL_VERSION}_linux_amd64* | head -1)
 
 mkdir -p ${BOSH_INSTALL_TARGET}/bin
 case "${FILE##*.}" in
@@ -14,7 +14,7 @@ case "${FILE##*.}" in
     tgz)
         echo "Extracting otel collector version ${OTELCOL_VERSION} ... "
         tar xzf ${FILE} -C ${BOSH_INSTALL_TARGET}
-        mv ${BOSH_INSTALL_TARGET}/otelcol-contrib ${BOSH_INSTALL_TARGET}/bin/otelcollector
+        mv ${BOSH_INSTALL_TARGET}/otelcol-* ${BOSH_INSTALL_TARGET}/bin/otelcollector
         ;;
     *)  
         echo "Unknown file extension, valid types are bin and tgz"
diff --git a/packages/otelcollector-linux-amd64/spec b/packages/otelcollector-linux-amd64/spec
index 0b6dff1..343eb27 100644
--- a/packages/otelcollector-linux-amd64/spec
+++ b/packages/otelcollector-linux-amd64/spec
@@ -4,6 +4,7 @@ name: otelcollector-linux-amd64
 dependencies: []
 
 files:
-- otelcollector-linux-amd64/otelcol-contrib_0.107.0_linux_amd64.bin  # https://github.com/springernature/o11y-otel-contextprocessor/releases/download/v0.107.0-cfgardenobserver0/otelcol-dev.bin
-# - otelcollector-linux-amd64/otelcol-contrib_0.100.0_linux_amd64.tgz  # https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.100.0/otelcol-contrib_0.100.0_linux_amd64.tar.gz
-- bosh-helpers/**/*
+ - bosh-helpers/**/*
+ - otelcollector-linux-amd64/otelcol_contrib_0.107.0_linux_amd64.bin  # https://github.com/springernature/o11y-otel-contextprocessor/releases/download/v0.107.0-sn/otelcol-custom_0.107.0-sn_linux_amd64.bin
+#- otelcollector-linux-amd64/otelcol-contrib_0.100.0_linux_amd64.tgz  # https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.100.0/otelcol-contrib_0.100.0_linux_amd64.tar.gz
+