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

chore: url validation & README to prevent gRPC footguns. #2130

Merged
merged 15 commits into from
May 3, 2021
Merged

chore: url validation & README to prevent gRPC footguns. #2130

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3644ac4
extend README and url validation to avoid footguns.
lizthegrey Apr 20, 2021
7ebf326
deal with grpc(s) while here
lizthegrey Apr 20, 2021
e26cfed
fix tests by moving serverAddress checks earlier
lizthegrey Apr 20, 2021
d838c47
un-private so util can access
lizthegrey Apr 20, 2021
8d3d793
Update packages/opentelemetry-exporter-collector-grpc/src/CollectorEx…
lizthegrey Apr 21, 2021
368ff76
s#grpc#@grpc/grpc-js#
lizthegrey Apr 21, 2021
9ef56a0
address review feedback.
lizthegrey Apr 30, 2021
19a4bd3
fix lint and nullcheck
lizthegrey Apr 30, 2021
066b283
I hate prettier --fix
lizthegrey Apr 30, 2021
ca71abf
address review feedback.
lizthegrey Apr 30, 2021
0c584ed
my prettier config has diverged :(
lizthegrey Apr 30, 2021
9821727
address lint & review feedback.
lizthegrey Apr 30, 2021
71db080
Merge branch 'main' into lizf.update-grpc-docs
lizthegrey Apr 30, 2021
e55404b
Merge branch 'main' into lizf.update-grpc-docs
lizthegrey May 3, 2021
ea638cc
Merge branch 'main' into lizf.update-grpc-docs
lizthegrey May 3, 2021
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
Prev Previous commit
Next Next commit
I hate prettier --fix
  • Loading branch information
@lizthegrey
lizthegrey committed Apr 30, 2021
commit 066b2834596acd5f0c5a11c11c2dbfa5de83d6a6
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-collector-grpc/src/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export function send<ExportItem, ServiceRequest>(
}

export function fixUrl(url: string): string {
lizthegrey marked this conversation as resolved.
Show resolved Hide resolved
const target = URL(url);
const target = new URL(url);
if (target.pathname !== '/') {
diag.warn('URL path should not be set when using grpc, ignoring.');
lizthegrey marked this conversation as resolved.
Show resolved Hide resolved
}
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-exporter-collector-grpc/test/CollectorMetricExporter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ const testCollectorMetricExporter = (params: TestParams) =>
setTimeout(() => {
assert.ok(
typeof exportedData !== 'undefined',
'resource' + ' doesn't exist'
'resource' + " doesn't exist"
);
let resource;
if (exportedData) {
Expand All @@ -226,7 +226,7 @@ const testCollectorMetricExporter = (params: TestParams) =>
);
assert.ok(
typeof resource !== 'undefined',
'resource doesn't exist'
"resource doesn't exist"
);
if (resource) {
ensureResourceIsCorrect(resource);
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-exporter-collector-grpc/test/CollectorTraceExporter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ const testCollectorExporter = (params: TestParams) =>
setTimeout(() => {
assert.ok(
typeof exportedData !== 'undefined',
'resource' + ' doesn't exist'
'resource' + " doesn't exist"
);
let spans;
let resource;
Expand All @@ -188,7 +188,7 @@ const testCollectorExporter = (params: TestParams) =>

assert.ok(
typeof resource !== 'undefined',
'resource doesn't exist'
"resource doesn't exist"
);
if (resource) {
ensureResourceIsCorrect(resource);
Expand Down