diff --git a/instrumentation/packaging/nodejs-agent-release.txt b/instrumentation/packaging/nodejs-agent-release.txt index f855fc0f82..d95827c3d9 100644 --- a/instrumentation/packaging/nodejs-agent-release.txt +++ b/instrumentation/packaging/nodejs-agent-release.txt @@ -1 +1 @@ -v2.15.0 +v3.1.2 diff --git a/packaging/tests/deployments/salt/images/Dockerfile.deb b/packaging/tests/deployments/salt/images/Dockerfile.deb index efc22b2cc9..61cd883614 100644 --- a/packaging/tests/deployments/salt/images/Dockerfile.deb +++ b/packaging/tests/deployments/salt/images/Dockerfile.deb @@ -4,7 +4,7 @@ FROM ${DISTRO_IMAGE} ARG DISTRO_IMAGE ENV DEBIAN_FRONTEND=noninteractive ENV SALT_VERSION=latest -ENV NODE_VERSION=16.20.2 +ENV NODE_VERSION=18.20.8 RUN apt-get update && apt-get upgrade -y -o DPkg::Options::=--force-confold RUN apt-get install -y software-properties-common ca-certificates wget curl apt-transport-https python3-pip vim systemd procps diff --git a/packaging/tests/deployments/salt/images/Dockerfile.rpm b/packaging/tests/deployments/salt/images/Dockerfile.rpm index 7f13bc0f95..38c3ad7edc 100644 --- a/packaging/tests/deployments/salt/images/Dockerfile.rpm +++ b/packaging/tests/deployments/salt/images/Dockerfile.rpm @@ -7,7 +7,7 @@ ARG DISTRO_IMAGE ARG PKG_MGR=dnf ENV DEBIAN_FRONTEND=noninteractive ENV SALT_VERSION=latest -ENV NODE_VERSION=16.20.2 +ENV NODE_VERSION=18.20.8 ENV container=docker # config for centos diff --git a/packaging/tests/images/deb/Dockerfile.ubuntu-bionic b/packaging/tests/images/deb/Dockerfile.ubuntu-bionic deleted file mode 100644 index b43d11088a..0000000000 --- a/packaging/tests/images/deb/Dockerfile.ubuntu-bionic +++ /dev/null @@ -1,24 +0,0 @@ -# A ubuntu image with systemd enabled. Must be run with: -# `-d --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro` flags -FROM ubuntu:bionic - -ENV DEBIAN_FRONTEND noninteractive - -RUN apt-get update &&\ - apt-get install -yq ca-certificates curl procps systemd wget - -ENV container docker -RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i = \ - "systemd-tmpfiles-setup.service" ] || rm -f $i; done); \ - rm -f /lib/systemd/system/multi-user.target.wants/*;\ - rm -f /lib/systemd/system/local-fs.target.wants/*; \ - rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ - rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ - rm -f /lib/systemd/system/anaconda.target.wants/*; - -RUN systemctl set-default multi-user.target -ENV init /lib/systemd/systemd - -VOLUME [ "/sys/fs/cgroup" ] - -ENTRYPOINT ["/lib/systemd/systemd"] diff --git a/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bookworm b/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bookworm index 9e3a9b609b..d19f859b64 100644 --- a/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bookworm +++ b/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bookworm @@ -25,7 +25,7 @@ COPY --from=tomcat /opt/java /opt/java COPY instrumentation/setup-tomcat.sh /opt/ RUN bash /opt/setup-tomcat.sh -ARG NODE_VERSION=v16 +ARG NODE_VERSION=v18 COPY instrumentation/setup-express.sh /opt RUN bash /opt/setup-express.sh diff --git a/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bullseye b/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bullseye index 26717239f6..b4c3887ddc 100644 --- a/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bullseye +++ b/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bullseye @@ -25,7 +25,7 @@ COPY --from=tomcat /opt/java /opt/java COPY instrumentation/setup-tomcat.sh /opt/ RUN bash /opt/setup-tomcat.sh -ARG NODE_VERSION=v16 +ARG NODE_VERSION=v18 COPY instrumentation/setup-express.sh /opt RUN bash /opt/setup-express.sh diff --git a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-bionic b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-bionic deleted file mode 100644 index 920bffed7c..0000000000 --- a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-bionic +++ /dev/null @@ -1,44 +0,0 @@ -# A ubuntu image with systemd enabled. Must be run with: -# `-d --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro` flags -FROM tomcat:9-jre8 as tomcat - -FROM ubuntu:bionic - -ARG TARGETARCH - -ENV DEBIAN_FRONTEND noninteractive - -RUN apt-get update &&\ - apt-get install -yq ca-certificates curl procps python3 systemd wget - -ENV container docker -RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i = \ - "systemd-tmpfiles-setup.service" ] || rm -f $i; done); \ - rm -f /lib/systemd/system/multi-user.target.wants/*;\ - rm -f /lib/systemd/system/local-fs.target.wants/*; \ - rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ - rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ - rm -f /lib/systemd/system/anaconda.target.wants/*; - -COPY --from=tomcat /usr/local/tomcat /usr/local/tomcat -COPY --from=tomcat /opt/java /opt/java -COPY instrumentation/setup-tomcat.sh /opt/ -RUN bash /opt/setup-tomcat.sh - -ARG NODE_VERSION=v16 -COPY instrumentation/setup-express.sh /opt -RUN bash /opt/setup-express.sh - -COPY instrumentation/setup-dotnet.sh /opt -RUN if [ "$TARGETARCH" = "amd64" ]; then \ - apt-get update && \ - apt-get install -yq libicu60 && \ - bash /opt/setup-dotnet.sh; \ - fi - -RUN systemctl set-default multi-user.target -ENV init /lib/systemd/systemd - -VOLUME [ "/sys/fs/cgroup" ] - -ENTRYPOINT ["/lib/systemd/systemd"] diff --git a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-focal b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-focal index 3d73a5b364..9b61c55234 100644 --- a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-focal +++ b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-focal @@ -25,7 +25,7 @@ COPY --from=tomcat /opt/java /opt/java COPY instrumentation/setup-tomcat.sh /opt/ RUN bash /opt/setup-tomcat.sh -ARG NODE_VERSION=v16 +ARG NODE_VERSION=v18 COPY instrumentation/setup-express.sh /opt RUN bash /opt/setup-express.sh diff --git a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-jammy b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-jammy index 7782d5e009..6319e2cd5e 100644 --- a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-jammy +++ b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-jammy @@ -25,7 +25,7 @@ COPY --from=tomcat /opt/java /opt/java COPY instrumentation/setup-tomcat.sh /opt/ RUN bash /opt/setup-tomcat.sh -ARG NODE_VERSION=v16 +ARG NODE_VERSION=v18 COPY instrumentation/setup-express.sh /opt RUN bash /opt/setup-express.sh diff --git a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-noble b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-noble index 04bc038dbb..b7b8b0dd98 100644 --- a/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-noble +++ b/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-noble @@ -25,7 +25,7 @@ COPY --from=tomcat /opt/java /opt/java COPY instrumentation/setup-tomcat.sh /opt/ RUN bash /opt/setup-tomcat.sh -ARG NODE_VERSION=v16 +ARG NODE_VERSION=v18 COPY instrumentation/setup-express.sh /opt RUN bash /opt/setup-express.sh diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.amazonlinux-2023 b/packaging/tests/instrumentation/images/rpm/Dockerfile.amazonlinux-2023 index 8033fa6f12..399aacfa39 100644 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.amazonlinux-2023 +++ b/packaging/tests/instrumentation/images/rpm/Dockerfile.amazonlinux-2023 @@ -24,7 +24,7 @@ COPY --from=tomcat /opt/java /opt/java COPY instrumentation/setup-tomcat.sh /opt/ RUN bash /opt/setup-tomcat.sh -ARG NODE_VERSION=v16 +ARG NODE_VERSION=v18 COPY instrumentation/setup-express.sh /opt RUN bash /opt/setup-express.sh diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-8 b/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-8 index 2e16d42739..a9460113b6 100644 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-8 +++ b/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-8 @@ -27,7 +27,7 @@ COPY --from=tomcat /opt/java /opt/java COPY instrumentation/setup-tomcat.sh /opt/ RUN bash /opt/setup-tomcat.sh -ARG NODE_VERSION=v16 +ARG NODE_VERSION=v18 COPY instrumentation/setup-express.sh /opt RUN bash /opt/setup-express.sh diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-9 b/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-9 index b81ba14e7f..4a80496eaa 100644 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-9 +++ b/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-9 @@ -26,7 +26,7 @@ COPY --from=tomcat /opt/java /opt/java COPY instrumentation/setup-tomcat.sh /opt/ RUN bash /opt/setup-tomcat.sh -ARG NODE_VERSION=v16 +ARG NODE_VERSION=v18 COPY instrumentation/setup-express.sh /opt RUN bash /opt/setup-express.sh diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-15 b/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-15 index d995973669..773049eedd 100644 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-15 +++ b/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-15 @@ -25,7 +25,7 @@ COPY --from=tomcat /opt/java /opt/java COPY instrumentation/setup-tomcat.sh /opt/ RUN bash /opt/setup-tomcat.sh -ARG NODE_VERSION=v16 +ARG NODE_VERSION=v18 COPY instrumentation/setup-express.sh /opt RUN bash /opt/setup-express.sh diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-8 b/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-8 index 88274f3c01..294aabd988 100644 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-8 +++ b/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-8 @@ -24,7 +24,7 @@ COPY --from=tomcat /opt/java /opt/java COPY instrumentation/setup-tomcat.sh /opt/ RUN bash /opt/setup-tomcat.sh -ARG NODE_VERSION=v16 +ARG NODE_VERSION=v18 COPY instrumentation/setup-express.sh /opt RUN bash /opt/setup-express.sh diff --git a/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-9 b/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-9 index aad7947829..7a5fc5ba96 100644 --- a/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-9 +++ b/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-9 @@ -24,7 +24,7 @@ COPY --from=tomcat /opt/java /opt/java COPY instrumentation/setup-tomcat.sh /opt/ RUN bash /opt/setup-tomcat.sh -ARG NODE_VERSION=v16 +ARG NODE_VERSION=v18 COPY instrumentation/setup-express.sh /opt RUN bash /opt/setup-express.sh diff --git a/packaging/tests/instrumentation/instrumentation_test.py b/packaging/tests/instrumentation/instrumentation_test.py index 26139cb79b..d05c4f6cd5 100644 --- a/packaging/tests/instrumentation/instrumentation_test.py +++ b/packaging/tests/instrumentation/instrumentation_test.py @@ -329,8 +329,8 @@ def test_express_instrumentation(distro, arch): assert pkg_path, f"{PKG_NAME} package not found" pkg_base = os.path.basename(pkg_path) - # minimum supported node version required for profiling - node_version = 16 + # minimum supported node version + node_version = 18 buildargs = {"NODE_VERSION": f"v{node_version}"} diff --git a/packaging/tests/instrumentation/setup-express.sh b/packaging/tests/instrumentation/setup-express.sh index 77d7040118..685a982c46 100644 --- a/packaging/tests/instrumentation/setup-express.sh +++ b/packaging/tests/instrumentation/setup-express.sh @@ -11,9 +11,7 @@ HOME=$NVM_HOME bash -c 'curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0 NVM_DIR="$NVM_HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" -nvm install --default ${NODE_VERSION:-v16} - -npm config --global set user root +nvm install --default ${NODE_VERSION:-v18} --unsafe-perm NODE_PATH="$( npm root -g )"