Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
deal with grpc(s) while here
  • Loading branch information
lizthegrey committed Apr 30, 2021
commit 7ebf326ea6d51b865e28bf2a08ec17a42c73cdee
4 changes: 2 additions & 2 deletions packages/opentelemetry-exporter-collector-grpc/src/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ export function onInit<ExportItem, ServiceRequest>(
config: CollectorExporterConfigNode
): void {
collector.grpcQueue = [];
const serverAddress = removeProtocol(collector.url);
if (collector.url.includes('/')) {
diag.warn('URL path cannot be set when using grpc');
}
const serverAddress = removeProtocol(collector.url);
const credentials: grpc.ChannelCredentials =
config.credentials || grpc.credentials.createInsecure();

Expand Down Expand Up @@ -109,5 +109,5 @@ export function send<ExportItem, ServiceRequest>(
}

function removeProtocol(url: string): string {
return url.replace(/^https?:\/\//, '');
return url.replace(/^(http|grpc)s?:\/\//, '');
}
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ const testCollectorMetricExporter = (params: TestParams) =>
)
: undefined;
collectorExporter = new CollectorMetricExporter({
url: address,
url: 'grpcs://' + address,
credentials,
serviceName: 'basic-service',
metadata: params.metadata,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const testCollectorExporter = (params: TestParams) =>
: undefined;
collectorExporter = new CollectorTraceExporter({
serviceName: 'basic-service',
url: address,
url: 'grpcs://' + address,
credentials,
metadata: params.metadata,
});
Expand Down