Merge branch 'main' into ruby_instrumentation

newrelic · May 22, 2024 · 05d7209 · 05d7209
2 parents d96fc07 + 40325e1
commit 05d7209
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 58 deletions.
diff --git a/src/nodejs/.dockerignore b/src/nodejs/.dockerignore
@@ -1,2 +1 @@
-build
-node_modules
+node_modules
diff --git a/src/nodejs/Dockerfile b/src/nodejs/Dockerfile
@@ -4,12 +4,15 @@
 #   update the `NODE_OPTIONS` environment variable accordingly.
 #   In the first stage, install all the required packages in one custom directory.
 #   Then in the second stage, copy the directory to `/instrumentation`.
-# - Ensure you have `newrelic`, `@newrelic/aws-sdk`, `@newrelic/koa`, `@newrelic/superagent`, and `@newrelic/native-metrics`
+# - Ensure you have `newrelic`, and`@newrelic/native-metrics`.
 # - Grant the necessary access to `/instrumentation` directory. `chmod -R go+r /instrumentation`
-FROM node:20.12 AS build
+ARG NODE_RUNTIME_VERSION=20
+ARG NEWRELIC_NODE_AGENT_VERSION=latest
+
+FROM node:${NODE_RUNTIME_VERSION} AS build
 WORKDIR /operator-build
 COPY . .
-RUN npm install
+RUN npm install newrelic@${NEWRELIC_NODE_AGENT_VERSION}
 
 FROM busybox
 COPY --from=build /operator-build/build/workspace /instrumentation

diff --git a/src/nodejs/newrelicinstrumentation.js b/src/nodejs/newrelicinstrumentation.js
@@ -0,0 +1 @@
+require('newrelic')
diff --git a/src/nodejs/package.json b/src/nodejs/package.json
diff --git a/src/nodejs/src/newrelicinstrumentation.ts b/src/nodejs/src/newrelicinstrumentation.ts
diff --git a/src/nodejs/tsconfig.json b/src/nodejs/tsconfig.json