Skip to content

plugin(grpc): use HttpTextFormat instead of Binary propagator #762

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

Merged
dyladan merged 6 commits into from
Feb 22, 2020
Merged

plugin(grpc): use HttpTextFormat instead of Binary propagator #762

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5345376
feat: update HttpTraceContext for gRPC metadata
mayurkale22 Feb 3, 2020
86a2b2b
keep textformat interface intact
mayurkale22 Feb 3, 2020
c2c8e32
update the usage based on new implementation
mayurkale22 Feb 20, 2020
49320c0
Update packages/opentelemetry-plugin-grpc/src/grpc.ts
mayurkale22 Feb 20, 2020
cfaade7
fix: lint
mayurkale22 Feb 20, 2020
c49c0b2
Merge branch 'master' into use_trace_context
mayurkale22 Feb 21, 2020
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
32 changes: 19 additions & 13 deletions packages/opentelemetry-plugin-grpc/src/grpc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,19 @@
* limitations under the License.
*/

import { BasePlugin } from '@opentelemetry/core';
import {
BasePlugin,
getExtractedSpanContext,
setExtractedSpanContext,
} from '@opentelemetry/core';
import {
CanonicalCode,
Span,
SpanContext,
SpanKind,
SpanOptions,
Status,
Context,
} from '@opentelemetry/api';
import * as events from 'events';
import * as grpcTypes from 'grpc';
Expand Down Expand Up @@ -122,24 +127,25 @@ export class GrpcPlugin extends BasePlugin<grpc> {
}
}

private _getSpanContext(metadata: grpcTypes.Metadata): SpanContext | null {
const metadataValue = metadata.getMap()[GRPC_TRACE_KEY] as Buffer;
// Entry doesn't exist
if (!metadataValue) {
return null;
}
return this._tracer.getBinaryFormat().fromBytes(metadataValue);
private _getSpanContext(
metadata: grpcTypes.Metadata
): SpanContext | undefined {
return getExtractedSpanContext(
this._tracer.getHttpTextFormat().extract(Context.TODO, metadata.getMap())
);
}

private _setSpanContext(
metadata: grpcTypes.Metadata,
spanContext: SpanContext
): void {
const serializedSpanContext = this._tracer
.getBinaryFormat()
.toBytes(spanContext);
const buffer = Buffer.from(serializedSpanContext);
metadata.set(GRPC_TRACE_KEY, buffer);
const carrier = {};
this._tracer
.getHttpTextFormat()
.inject(setExtractedSpanContext(Context.TODO, spanContext), carrier);
for (const [k, v] of Object.entries(carrier)) {
Copy link
Member

@dyladan dyladan Feb 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to approve this for now, but we should be using the new setter interface for propagators to handle this. https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/api-propagators.md#setter-argument

metadata.set(k, v as string);
}
}

private _patchServer() {
Expand Down