Upgrade pyroscope-nodejs to v0.2.9 (#3032)

* Fix memory collection for express-pull example * Upgrade pyroscope-nodejs to v0.2.9 * Remove unused dependencies after pr review
grafana · Feb 29, 2024 · a0cfe0f · a0cfe0f
1 parent 2a03044
commit a0cfe0f
Show file tree

Hide file tree

Showing 13 changed files with 1,047 additions and 592 deletions.
diff --git a/examples/language-sdk-instrumentation/nodejs/express-pull/Dockerfile b/examples/language-sdk-instrumentation/nodejs/express-pull/Dockerfile
@@ -2,8 +2,8 @@ FROM node:latest
 
 WORKDIR /app
 
-COPY package.json .
-RUN npm install
+COPY package.json yarn.lock .
+RUN yarn install
 COPY index.js .
 
 ENV DEBUG=pyroscope

diff --git a/examples/language-sdk-instrumentation/nodejs/express-pull/agent.config.river b/examples/language-sdk-instrumentation/nodejs/express-pull/agent.config.river
@@ -26,4 +26,9 @@ pyroscope.scrape "default" {
     {"__address__" = "ap-south:5000", "service_name"="nodejs"},
   ]
   forward_to = [pyroscope.write.example.receiver]
+  profiling_config {
+    profile.memory { // disable memory, use godeltaprof_memory instead
+      path = "/debug/pprof/heap"
+    }
+  }
 }
diff --git a/examples/language-sdk-instrumentation/nodejs/express-pull/docker-compose.yml b/examples/language-sdk-instrumentation/nodejs/express-pull/docker-compose.yml
@@ -8,7 +8,7 @@ services:
   agent:
     image: grafana/agent:latest
     volumes:
-      - ./agent.config.river:/etc/agent-config/config.river
+      - ./agent.config.river:/etc/agent-config/config.river:ro
     command:
       - run
       - /etc/agent-config/config.river

diff --git a/examples/language-sdk-instrumentation/nodejs/express-pull/package.json b/examples/language-sdk-instrumentation/nodejs/express-pull/package.json
@@ -11,8 +11,7 @@
   "dependencies": {
     "@pyroscope/nodejs": "^0.2.x",
     "express": "^4.17.3",
-    "morgan": "^1.10.0",
-    "pprof": "^3.2.0"
+    "morgan": "^1.10.0"
   },
   "resolutions": {
     "protobufjs": "^7.2.4"

diff --git a/examples/language-sdk-instrumentation/nodejs/express-pull/yarn.lock b/examples/language-sdk-instrumentation/nodejs/express-pull/yarn.lock
diff --git a/examples/language-sdk-instrumentation/nodejs/express-ts/Dockerfile b/examples/language-sdk-instrumentation/nodejs/express-ts/Dockerfile
@@ -2,7 +2,7 @@ FROM node:latest
 
 WORKDIR /app
 
-COPY package.json .
+COPY package.json yarn.lock .
 COPY tsconfig.json .
 RUN yarn 
 COPY *.ts .

diff --git a/examples/language-sdk-instrumentation/nodejs/express-ts/package.json b/examples/language-sdk-instrumentation/nodejs/express-ts/package.json
@@ -11,10 +11,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@pyroscope/nodejs": "^0.2.x",
-    "axios": "^0.26.1",
     "express": "^4.17.3",
     "morgan": "^1.10.0",
-    "pprof": "^3.2.0",
     "typescript": "^4.6.2"
   },
   "devDependencies": {

diff --git a/examples/language-sdk-instrumentation/nodejs/express-ts/yarn.lock b/examples/language-sdk-instrumentation/nodejs/express-ts/yarn.lock
diff --git a/examples/language-sdk-instrumentation/nodejs/express/Dockerfile b/examples/language-sdk-instrumentation/nodejs/express/Dockerfile
@@ -2,8 +2,8 @@ FROM node:latest
 
 WORKDIR /app
 
-COPY package.json .
-RUN npm install
+COPY package.json yarn.lock .
+RUN yarn install
 COPY index.js .
 
 ENV DEBUG=pyroscope

diff --git a/examples/language-sdk-instrumentation/nodejs/express/package.json b/examples/language-sdk-instrumentation/nodejs/express/package.json
@@ -11,8 +11,7 @@
   "dependencies": {
     "@pyroscope/nodejs": "^0.2.x",
     "express": "^4.17.3",
-    "morgan": "^1.10.0",
-    "pprof": "^3.2.0"
+    "morgan": "^1.10.0"
   },
   "resolutions": {
     "protobufjs": "^7.2.4"