Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade pyroscope-nodejs to v0.2.9 #3032

Merged
merged 3 commits into from
Feb 29, 2024
Merged

Upgrade pyroscope-nodejs to v0.2.9 #3032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
776d5fe
Fix memory collection for express-pull example
simonswine Feb 28, 2024
78d2077
Upgrade pyroscope-nodejs to v0.2.9
simonswine Feb 27, 2024
c06de94
Remove unused dependencies after pr review
simonswine Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/language-sdk-instrumentation/nodejs/express-pull/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions examples/language-sdk-instrumentation/nodejs/express-pull/agent.config.river
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
2 changes: 1 addition & 1 deletion examples/language-sdk-instrumentation/nodejs/express-pull/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions examples/language-sdk-instrumentation/nodejs/express-pull/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
270 changes: 184 additions & 86 deletions examples/language-sdk-instrumentation/nodejs/express-pull/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/language-sdk-instrumentation/nodejs/express-ts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM node:latest

WORKDIR /app

COPY package.json .
COPY package.json yarn.lock .
COPY tsconfig.json .
RUN yarn
COPY *.ts .
Expand Down
2 changes: 0 additions & 2 deletions examples/language-sdk-instrumentation/nodejs/express-ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
669 changes: 423 additions & 246 deletions examples/language-sdk-instrumentation/nodejs/express-ts/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions examples/language-sdk-instrumentation/nodejs/express/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions examples/language-sdk-instrumentation/nodejs/express/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading
Loading