Merge branch 'main' into better-error-message-for-failed-net-instr-downloads

Author: lachmatt

.github/workflows/build-and-test.yml

@@ -5,20 +5,6 @@ on:
     branches:
       - main
   pull_request:
-    paths:
-      - '.github/workflows/build-and-test.yml'
-      - '.golangci.yml'
-      - 'cmd/**'
-      - 'internal/**'
-      - 'packaging/bundle/**'
-      - 'pkg/**'
-      - 'tests/**'
-      - 'Makefile'
-      - 'Makefile.Common'
-      - 'go.mod'
-      - 'go.sum'
-      - '!**.md'
-      - '!packaging/**'
   workflow_dispatch: # Allows manual execution of the workflow
 
 concurrency:

.github/workflows/darwin-test.yml

@@ -5,18 +5,6 @@ on:
     branches:
       - main
   pull_request:
-    paths:
-      - '.github/workflows/darwin-test.yml'
-      - 'cmd/**'
-      - 'internal/**'
-      - 'pkg/**'
-      - 'tests/**'
-      - 'Makefile'
-      - 'Makefile.Common'
-      - 'go.mod'
-      - 'go.sum'
-      - '!**.md'
-      - '!packaging/**'
 
 env:
   GO_VERSION: 1.23.8

.github/workflows/integration-test.yml

@@ -5,22 +5,6 @@ on:
     branches:
       - main
   pull_request:
-    paths:
-      - '.github/workflows/integration-test.yml'
-      - 'cmd/**'
-      - 'docker/**'
-      - 'internal/**'
-      - 'packaging/bundle/**'
-      - 'instrumentation/packaging/**'
-      - 'pkg/**'
-      - 'tests/**'
-      - 'Makefile'
-      - 'Makefile.Common'
-      - 'go.mod'
-      - 'go.sum'
-      - 'packaging/jmx-metric-gatherer-release.txt'
-      - '!**.md'
-      - '!packaging/technical-addon/**'
 
 concurrency:
   group: integration-test-${{ github.event.pull_request.number || github.ref }}

.github/workflows/windows-test.yml

@@ -6,16 +6,6 @@ on:
       - main
   pull_request:
     paths:
-      - '.github/workflows/windows-test.yml'
-      - 'cmd/**'
-      - 'internal/**'
-      - 'pkg/**'
-      - 'tests/**'
-      - 'Makefile'
-      - 'go.mod'
-      - 'go.sum'
-      - '!**.md'
-      - '!packaging/**'
 
 env:
   GO_VERSION: 1.23.8

instrumentation/packaging/nodejs-agent-release.txt

@@ -1 +1 @@
-v2.15.0
+v3.1.2

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

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

packaging/tests/images/deb/Dockerfile.ubuntu-bionic

@@ -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
 

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