Include default /etc/splunk/zeroconfig_node.conf in deb/rpm packages

signalfx · Aug 28, 2023 · c9c53da · c9c53da
1 parent 6859631
commit c9c53da
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/instrumentation/packaging/fpm/common.sh b/instrumentation/packaging/fpm/common.sh
@@ -29,6 +29,8 @@ LIBSPLUNK_INSTALL_PATH="${INSTALL_DIR}/libsplunk.so"
 JAVA_AGENT_INSTALL_PATH="${INSTALL_DIR}/splunk-otel-javaagent.jar"
 JAVA_CONFIG_REPO_PATH="${FPM_DIR}/zeroconfig_java.conf"
 JAVA_CONFIG_INSTALL_PATH="/etc/splunk/zeroconfig_java.conf"
+NODE_CONFIG_REPO_PATH="${FPM_DIR}/zeroconfig_node.conf"
+NODE_CONFIG_INSTALL_PATH="/etc/splunk/zeroconfig_node.conf"
 EXAMPLES_INSTALL_DIR="${INSTALL_DIR}/examples"
 EXAMPLES_DIR="${FPM_DIR}/examples"
 
@@ -102,6 +104,10 @@ setup_files_and_permissions() {
     cp -f "$JAVA_CONFIG_REPO_PATH" "$buildroot/$JAVA_CONFIG_INSTALL_PATH"
     sudo chmod 644 "$buildroot/$JAVA_CONFIG_INSTALL_PATH"
 
+    mkdir -p  "$buildroot/$(dirname $NODE_CONFIG_INSTALL_PATH)"
+    cp -f "$NODE_CONFIG_REPO_PATH" "$buildroot/$NODE_CONFIG_INSTALL_PATH"
+    sudo chmod 644 "$buildroot/$NODE_CONFIG_INSTALL_PATH"
+
     mkdir -p "$buildroot/$INSTALL_DIR"
     cp -rf "$EXAMPLES_DIR" "$buildroot/$INSTALL_DIR/"
     sudo chmod -R 644 "$buildroot/$EXAMPLES_INSTALL_DIR"

diff --git a/instrumentation/packaging/fpm/deb/build.sh b/instrumentation/packaging/fpm/deb/build.sh
@@ -48,6 +48,7 @@ sudo fpm -s dir -t deb -n "$PKG_NAME" -v "$VERSION" -f -p "$OUTPUT_DIR" \
     --depends sed \
     --depends grep \
     --config-files "$JAVA_CONFIG_INSTALL_PATH" \
+    --config-files "$NODE_CONFIG_INSTALL_PATH" \
     "$buildroot/"=/
 
 dpkg -c "${OUTPUT_DIR}/${PKG_NAME}_${VERSION}_${ARCH}.deb"
diff --git a/instrumentation/packaging/fpm/rpm/build.sh b/instrumentation/packaging/fpm/rpm/build.sh
@@ -57,6 +57,7 @@ sudo fpm -s dir -t rpm -n "$PKG_NAME" -v "$VERSION" -f -p "$OUTPUT_DIR" \
     --depends sed \
     --depends grep \
     --config-files "$JAVA_CONFIG_INSTALL_PATH" \
+    --config-files "$NODE_CONFIG_INSTALL_PATH" \
     "$buildroot/"=/
 
 rpm -qpli "${OUTPUT_DIR}/${PKG_NAME}-${VERSION}-1.${ARCH}.rpm"
diff --git a/instrumentation/packaging/fpm/zeroconfig_node.conf b/instrumentation/packaging/fpm/zeroconfig_node.conf
@@ -0,0 +1 @@
+NODE_OPTIONS=-r @splunk/otel/instrument
diff --git a/internal/buildscripts/packaging/tests/instrumentation/instrumentation_test.py b/internal/buildscripts/packaging/tests/instrumentation/instrumentation_test.py
@@ -48,6 +48,7 @@
 LIBSPLUNK_PATH = "/usr/lib/splunk-instrumentation/libsplunk.so"
 JAVA_CONFIG_PATH = "/etc/splunk/zeroconfig_java.conf"
 CUSTOM_JAVA_CONFIG_PATH = TESTS_DIR / "instrumentation" / "libsplunk-java-test.conf"
+NODE_CONFIG_PATH = "/etc/splunk/zeroconfig_node.conf"
 SAMPLE_JAVA_SYSTEMD_CONF_PATH = "/usr/lib/splunk-instrumentation/examples/systemd/00-splunk-otel-javaagent.conf"
 SAMPLE_NODE_SYSTEMD_CONF_PATH = "/usr/lib/splunk-instrumentation/examples/systemd/00-splunk-otel-js.conf"
 CUSTOM_SYSTEMD_CONF_PATH = TESTS_DIR / "instrumentation" / "systemd-test.conf"
@@ -59,6 +60,7 @@
     NODEJS_AGENT_PATH,
     LIBSPLUNK_PATH,
     JAVA_CONFIG_PATH,
+    NODE_CONFIG_PATH,
     SAMPLE_JAVA_SYSTEMD_CONF_PATH,
     SAMPLE_NODE_SYSTEMD_CONF_PATH,
 ]