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.

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

Revert "chore(deps): upgrade pprof to v3.2.1 [security]" #884

Merged
merged 1 commit into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
"system-test": "c8 --no-clean mocha build/system-test/test-*.js --timeout=60000",
"samples-test": "echo 'no sample tests'",
"clean": "gts clean",
"compile": "tsc -p .",
"compile": "tsc -p . && cp -R protos build",
"fix": "gts fix",
"lint": "gts check",
"docs": "jsdoc -c .jsdoc.js",
"prelint": "cd samples; npm link ../; npm install",
"prepare": "npm run compile",
"pretest": "npm run compile",
"proto": "mkdir -p protos && pbjs -t static-module -w commonjs -o protos/profiler.js third_party/googleapis/google/devtools/cloudprofiler/v2/profiler.proto && pbts -o protos/profiler.d.ts protos/profiler.js",
"license-check": "jsgl --local .",
"docs-test": "linkinator docs",
"predocs-test": "npm run docs",
Expand All @@ -36,9 +37,9 @@
"extend": "^3.0.2",
"gcp-metadata": "^4.0.0",
"parse-duration": "^1.0.0",
"pprof": "3.2.1",
"pprof": "3.2.0",
"pretty-ms": "^7.0.0",
"protobufjs": "~7.2.4",
"protobufjs": "~7.2.0",
"semver": "^7.0.0",
"teeny-request": "^8.0.0"
},
Expand Down Expand Up @@ -68,10 +69,12 @@
},
"files": [
"build/src",
"build/third_party/cloud-debug-nodejs"
"build/third_party/cloud-debug-nodejs",
"build/protos"
],
"nyc": {
"exclude": [
"protos",
"build/test",
"build/system-test"
]
Expand Down
2 changes: 1 addition & 1 deletion src/profiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import {
DecorateRequestOptions,
} from '@google-cloud/common';
import {heap as heapProfiler, SourceMapper, time as timeProfiler} from 'pprof';
import {perftools} from 'pprof/proto/profile';
import * as msToStr from 'pretty-ms';
import {promisify} from 'util';
import * as zlib from 'zlib';
import * as r from 'teeny-request';

import {perftools} from '../protos/profile';
import {ProfilerConfig} from './config';
import {createLogger} from './logger';

Expand Down
2 changes: 1 addition & 1 deletion system-test/test-start.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import * as nock from 'nock';
import {promisify} from 'util';
import * as zlib from 'zlib';

import {perftools} from 'pprof/proto/profile';
import {perftools} from '../protos/profile';
import {RequestProfile} from '../src/profiler';

const API = 'https://cloudprofiler.googleapis.com/v2';
Expand Down
2 changes: 1 addition & 1 deletion test/profiles-for-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import * as path from 'path';
import {SourceMapGenerator} from 'source-map';
import * as tmp from 'tmp';

import {perftools} from 'pprof/proto/profile';
import {perftools} from '../protos/profile';
import {TimeProfile} from '../src/v8-types';

const timeLeaf1 = {
Expand Down
2 changes: 1 addition & 1 deletion test/test-profiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import * as sinon from 'sinon';
import {promisify} from 'util';
import * as zlib from 'zlib';

import {perftools} from 'pprof/proto/profile';
import {perftools} from '../protos/profile';
import {ProfilerConfig} from '../src/config';
import {
parseBackoffDuration,
Expand Down