Skip to content

Commit

Permalink
Update splunk-otel-js to v2.6.0 (#4064)
Browse files Browse the repository at this point in the history
* Update splunk-otel-js to v2.6.0

* update changelog
  • Loading branch information
jeffreyc-splunk authored Dec 12, 2023
1 parent ed7a8b2 commit 6475dda
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 21 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### 💡 Enhancements 💡

- (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))

## v0.91.0

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.
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/packaging/nodejs-agent-release.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.5.1
v2.6.0
Original file line number Diff line number Diff line change
Expand Up @@ -302,11 +302,6 @@ def test_express_instrumentation(distro, arch):

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

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

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

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

if arch == "arm64":
# dev packages and libs required to build splunk-otel-js
if "opensuse" in distro:
run_container_cmd(container, "zypper -n install -t pattern devel_basis")
run_container_cmd(container, "zypper -n install -t pattern devel_C_C++")
elif distro in RPM_DISTROS:
run_container_cmd(container, "yum groupinstall -y 'Development Tools'")
else:
run_container_cmd(container, "apt-get install -y build-essential")

if distro in ("debian-stretch", "ubuntu-xenial"):
# npm installed with node v16 only supports python 3.6+, but these distros only provide python 3.5
# downgrade npm to support python 3.5
run_container_cmd(container, "bash -l -c 'npm install --global npm@^6'")

# install splunk-otel-js to /usr/lib/splunk-instrumentation/splunk-otel-js
run_container_cmd(container, f"mkdir -p {LIB_DIR}/splunk-otel-js")
run_container_cmd(container, f"bash -l -c 'cd {LIB_DIR}/splunk-otel-js && npm install {NODE_AGENT_PATH}'")
Expand Down

0 comments on commit 6475dda

Please sign in to comment.