Skip to content

Commit 6475dda

Browse files
Update splunk-otel-js to v2.6.0 (#4064)
* Update splunk-otel-js to v2.6.0 * update changelog
1 parent ed7a8b2 commit 6475dda

File tree

3 files changed

+5
-21
lines changed

3 files changed

+5
-21
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
### 💡 Enhancements 💡
6+
7+
- (Splunk) Update splunk-otel-js to [v2.6.0](https://github.com/signalfx/splunk-otel-js/releases/tag/v2.6.0) ([#4064](https://github.com/signalfx/splunk-otel-collector/pull/4064))
8+
59
## v0.91.0
610

711
This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.91.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.91.0) and the [opentelemetry-collector-contrib v0.91.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.91.0) releases where appropriate.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2.5.1
1+
v2.6.0

internal/buildscripts/packaging/tests/instrumentation/instrumentation_test.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -302,11 +302,6 @@ def test_express_instrumentation(distro, arch):
302302

303303
# minimum supported node version required for profiling
304304
node_version = 16
305-
if arch == "arm64" and distro in ("centos-7", "oraclelinux-7"):
306-
# g++ for these distros is too old to install splunk-otel-js with node v16:
307-
# g++: error: unrecognized command line option '-std=gnu++14'
308-
# use the minimum supported node version without profiling instead
309-
node_version = 14
310305

311306
buildargs = {"NODE_VERSION": f"v{node_version}"}
312307

@@ -318,21 +313,6 @@ def test_express_instrumentation(distro, arch):
318313

319314
install_package(container, distro, f"/test/{pkg_base}")
320315

321-
if arch == "arm64":
322-
# dev packages and libs required to build splunk-otel-js
323-
if "opensuse" in distro:
324-
run_container_cmd(container, "zypper -n install -t pattern devel_basis")
325-
run_container_cmd(container, "zypper -n install -t pattern devel_C_C++")
326-
elif distro in RPM_DISTROS:
327-
run_container_cmd(container, "yum groupinstall -y 'Development Tools'")
328-
else:
329-
run_container_cmd(container, "apt-get install -y build-essential")
330-
331-
if distro in ("debian-stretch", "ubuntu-xenial"):
332-
# npm installed with node v16 only supports python 3.6+, but these distros only provide python 3.5
333-
# downgrade npm to support python 3.5
334-
run_container_cmd(container, "bash -l -c 'npm install --global npm@^6'")
335-
336316
# install splunk-otel-js to /usr/lib/splunk-instrumentation/splunk-otel-js
337317
run_container_cmd(container, f"mkdir -p {LIB_DIR}/splunk-otel-js")
338318
run_container_cmd(container, f"bash -l -c 'cd {LIB_DIR}/splunk-otel-js && npm install {NODE_AGENT_PATH}'")

0 commit comments

Comments
 (0)