Skip to content

Commit

Permalink
Add tests for express instrumentation (#3566)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeffreyc-splunk
jeffreyc-splunk committed Oct 16, 2023
1 parent 92fca28 commit ba12020
Show file tree
Hide file tree
Showing 23 changed files with 377 additions and 83 deletions.
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/deb/Dockerfile.debian-bullseye
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

RUN systemctl set-default multi-user.target
ENV init /lib/systemd/systemd

Expand Down
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/deb/Dockerfile.debian-buster
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

RUN systemctl set-default multi-user.target
ENV init /lib/systemd/systemd

Expand Down
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/deb/Dockerfile.debian-stretch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v14
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

RUN systemctl set-default multi-user.target
ENV init /lib/systemd/systemd

Expand Down
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-bionic
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

RUN systemctl set-default multi-user.target
ENV init /lib/systemd/systemd

Expand Down
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-focal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

RUN systemctl set-default multi-user.target
ENV init /lib/systemd/systemd

Expand Down
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-jammy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

RUN systemctl set-default multi-user.target
ENV init /lib/systemd/systemd

Expand Down
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/deb/Dockerfile.ubuntu-xenial
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

RUN systemctl set-default multi-user.target
ENV init /lib/systemd/systemd

Expand Down
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/rpm/Dockerfile.amazonlinux-2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

VOLUME [ "/sys/fs/cgroup" ]

CMD ["/usr/sbin/init"]
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/rpm/Dockerfile.amazonlinux-2023
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

VOLUME [ "/sys/fs/cgroup" ]

CMD ["/usr/sbin/init"]
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-7
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v14
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

VOLUME [ "/sys/fs/cgroup" ]

CMD ["/usr/sbin/init"]
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

VOLUME [ "/sys/fs/cgroup" ]

CMD ["/usr/sbin/init"]
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/rpm/Dockerfile.centos-9
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

VOLUME [ "/sys/fs/cgroup" ]

CMD ["/usr/sbin/init"]
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-12
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

VOLUME [ "/sys/fs/cgroup" ]

CMD ["/sbin/init"]
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-15
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

VOLUME [ "/sys/fs/cgroup" ]

CMD ["/sbin/init"]
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-7
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v14
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

VOLUME [ "/sys/fs/cgroup" ]

CMD ["/usr/sbin/init"]
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

VOLUME [ "/sys/fs/cgroup" ]

CMD ["/usr/sbin/init"]
5 changes: 5 additions & 0 deletions internal/buildscripts/packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-9
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ COPY --from=tomcat /opt/java /opt/java
COPY instrumentation/setup-tomcat.sh /opt/
RUN bash /opt/setup-tomcat.sh

ARG NODE_VERSION=v16
ENV NODE_PATH=/opt/express/node_modules
COPY instrumentation/setup-express.sh /opt
RUN bash /opt/setup-express.sh

VOLUME [ "/sys/fs/cgroup" ]

CMD ["/usr/sbin/init"]
Loading

0 comments on commit ba12020

Please sign in to comment.