Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

Commit bc0de66

Browse files
mayurkale22mayurkale22
authored
gRPC plugin : remove metrics to stats (#374)
1 parent c0fe475 commit bc0de66

File tree

5 files changed

+33
-37
lines changed

5 files changed

+33
-37
lines changed

‎packages/opencensus-instrumentation-grpc/src/grpc-stats/client-metrics.ts renamed to ‎packages/opencensus-instrumentation-grpc/src/grpc-stats/client-stats.ts

File renamed without changes.

‎packages/opencensus-instrumentation-grpc/src/grpc-stats/server-metrics.ts renamed to ‎packages/opencensus-instrumentation-grpc/src/grpc-stats/server-stats.ts

File renamed without changes.

‎packages/opencensus-instrumentation-grpc/src/grpc-stats/stats-common.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616

1717
import {Stats} from '@opencensus/core';
18-
import {GRPC_BASIC_CLIENT_VIEWS} from './client-metrics';
19-
import {GRPC_BASIC_SERVER_VIEWS} from './server-metrics';
18+
import {GRPC_BASIC_CLIENT_VIEWS} from './client-stats';
19+
import {GRPC_BASIC_SERVER_VIEWS} from './server-stats';
2020

2121
/** Method to register all GRPC Views. */
2222
export function registerAllGrpcViews(globalStats: Stats) {

‎packages/opencensus-instrumentation-grpc/src/grpc.ts

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import {EventEmitter} from 'events';
2020
import * as grpcTypes from 'grpc';
2121
import * as lodash from 'lodash';
2222
import * as shimmer from 'shimmer';
23-
import * as clientMetrics from './grpc-stats/client-metrics';
24-
import * as serverMetrics from './grpc-stats/server-metrics';
23+
import * as clientStats from './grpc-stats/client-stats';
24+
import * as serverStats from './grpc-stats/server-stats';
2525
const sizeof = require('object-sizeof');
2626

2727
/** The metadata key under which span context is stored as a binary value. */
@@ -232,7 +232,7 @@ export class GrpcPlugin extends BasePlugin {
232232

233233
// record stats
234234
const tags = new TagMap();
235-
tags.set(serverMetrics.GRPC_SERVER_METHOD, {value: rootSpan.name});
235+
tags.set(serverStats.GRPC_SERVER_METHOD, {value: rootSpan.name});
236236
const req = call.hasOwnProperty('request') ? call.request : {};
237237
GrpcPlugin.recordStats(
238238
rootSpan.kind, tags, value, req, Date.now() - startTime);
@@ -377,7 +377,7 @@ export class GrpcPlugin extends BasePlugin {
377377

378378
// record stats
379379
const tags = new TagMap();
380-
tags.set(clientMetrics.GRPC_CLIENT_METHOD, {value: span.name});
380+
tags.set(clientStats.GRPC_CLIENT_METHOD, {value: span.name});
381381
GrpcPlugin.recordStats(
382382
span.kind, tags, originalArgs, res, Date.now() - startTime);
383383

@@ -543,45 +543,43 @@ export class GrpcPlugin extends BasePlugin {
543543
switch (kind) {
544544
case SpanKind.CLIENT:
545545
measureList.push({
546-
measure: clientMetrics.GRPC_CLIENT_SENT_BYTES_PER_RPC,
546+
measure: clientStats.GRPC_CLIENT_SENT_BYTES_PER_RPC,
547547
value: sizeof(argsOrValue)
548548
});
549549
measureList.push({
550-
measure: clientMetrics.GRPC_CLIENT_RECEIVED_BYTES_PER_RPC,
550+
measure: clientStats.GRPC_CLIENT_RECEIVED_BYTES_PER_RPC,
551551
value: sizeof(reqOrRes)
552552
});
553553
measureList.push({
554-
measure: clientMetrics.GRPC_CLIENT_RECEIVED_MESSAGES_PER_RPC,
554+
measure: clientStats.GRPC_CLIENT_RECEIVED_MESSAGES_PER_RPC,
555555
value: 1
556556
});
557557
measureList.push({
558-
measure: clientMetrics.GRPC_CLIENT_SENT_MESSAGES_PER_RPC,
558+
measure: clientStats.GRPC_CLIENT_SENT_MESSAGES_PER_RPC,
559559
value: 1
560560
});
561-
measureList.push({
562-
measure: clientMetrics.GRPC_CLIENT_ROUNDTRIP_LATENCY,
563-
value: ms
564-
});
561+
measureList.push(
562+
{measure: clientStats.GRPC_CLIENT_ROUNDTRIP_LATENCY, value: ms});
565563
break;
566564
case SpanKind.SERVER:
567565
measureList.push({
568-
measure: serverMetrics.GRPC_SERVER_RECEIVED_BYTES_PER_RPC,
566+
measure: serverStats.GRPC_SERVER_RECEIVED_BYTES_PER_RPC,
569567
value: sizeof(reqOrRes)
570568
});
571569
measureList.push({
572-
measure: serverMetrics.GRPC_SERVER_RECEIVED_MESSAGES_PER_RPC,
570+
measure: serverStats.GRPC_SERVER_RECEIVED_MESSAGES_PER_RPC,
573571
value: 1
574572
});
575573
measureList.push({
576-
measure: serverMetrics.GRPC_SERVER_SENT_BYTES_PER_RPC,
574+
measure: serverStats.GRPC_SERVER_SENT_BYTES_PER_RPC,
577575
value: sizeof(argsOrValue)
578576
});
579577
measureList.push({
580-
measure: serverMetrics.GRPC_SERVER_SENT_MESSAGES_PER_RPC,
578+
measure: serverStats.GRPC_SERVER_SENT_MESSAGES_PER_RPC,
581579
value: 1
582580
});
583581
measureList.push(
584-
{measure: serverMetrics.GRPC_SERVER_SERVER_LATENCY, value: ms});
582+
{measure: serverStats.GRPC_SERVER_SERVER_LATENCY, value: ms});
585583
break;
586584
default:
587585
break;

‎packages/opencensus-instrumentation-grpc/test/test-grpc.ts

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import * as assert from 'assert';
2020
import * as grpcModule from 'grpc';
2121
import * as path from 'path';
2222
import {GRPC_TRACE_KEY, GrpcModule, GrpcPlugin, plugin, SendUnaryDataCallback} from '../src/';
23-
import * as clientMetrics from '../src/grpc-stats/client-metrics';
24-
import * as serverMetrics from '../src/grpc-stats/server-metrics';
23+
import * as clientStats from '../src/grpc-stats/client-stats';
24+
import * as serverStats from '../src/grpc-stats/server-stats';
2525
import {registerAllGrpcViews} from '../src/grpc-stats/stats-common';
2626

2727
const PROTO_PATH = __dirname + '/fixtures/grpc-instrumentation-test.proto';
@@ -373,41 +373,39 @@ describe('GrpcPlugin() ', function() {
373373
assert.equal(testExporter.recordedMeasurements.length, 10);
374374
assert.strictEqual(
375375
testExporter.recordedMeasurements[0].measure,
376-
serverMetrics.GRPC_SERVER_RECEIVED_BYTES_PER_RPC);
376+
serverStats.GRPC_SERVER_RECEIVED_BYTES_PER_RPC);
377377
assert.equal(testExporter.recordedMeasurements[0].value, 14);
378-
assert.deepStrictEqual(testExporter.recordedMeasurements[1], {
379-
measure: serverMetrics.GRPC_SERVER_RECEIVED_MESSAGES_PER_RPC,
380-
value: 1
381-
});
378+
assert.deepStrictEqual(
379+
testExporter.recordedMeasurements[1],
380+
{measure: serverStats.GRPC_SERVER_RECEIVED_MESSAGES_PER_RPC, value: 1});
382381
assert.strictEqual(
383382
testExporter.recordedMeasurements[2].measure,
384-
serverMetrics.GRPC_SERVER_SENT_BYTES_PER_RPC);
383+
serverStats.GRPC_SERVER_SENT_BYTES_PER_RPC);
385384
assert.equal(testExporter.recordedMeasurements[2].value, 14);
386385
assert.deepStrictEqual(
387386
testExporter.recordedMeasurements[3],
388-
{measure: serverMetrics.GRPC_SERVER_SENT_MESSAGES_PER_RPC, value: 1});
387+
{measure: serverStats.GRPC_SERVER_SENT_MESSAGES_PER_RPC, value: 1});
389388
assert.strictEqual(
390389
testExporter.recordedMeasurements[4].measure,
391-
serverMetrics.GRPC_SERVER_SERVER_LATENCY);
390+
serverStats.GRPC_SERVER_SERVER_LATENCY);
392391

393392
assert.strictEqual(
394393
testExporter.recordedMeasurements[5].measure,
395-
clientMetrics.GRPC_CLIENT_SENT_BYTES_PER_RPC);
394+
clientStats.GRPC_CLIENT_SENT_BYTES_PER_RPC);
396395
assert.equal(testExporter.recordedMeasurements[5].value, 107);
397396
assert.strictEqual(
398397
testExporter.recordedMeasurements[6].measure,
399-
clientMetrics.GRPC_CLIENT_RECEIVED_BYTES_PER_RPC);
398+
clientStats.GRPC_CLIENT_RECEIVED_BYTES_PER_RPC);
400399
assert.equal(testExporter.recordedMeasurements[6].value, 14);
401-
assert.deepStrictEqual(testExporter.recordedMeasurements[7], {
402-
measure: clientMetrics.GRPC_CLIENT_RECEIVED_MESSAGES_PER_RPC,
403-
value: 1
404-
});
400+
assert.deepStrictEqual(
401+
testExporter.recordedMeasurements[7],
402+
{measure: clientStats.GRPC_CLIENT_RECEIVED_MESSAGES_PER_RPC, value: 1});
405403
assert.deepStrictEqual(
406404
testExporter.recordedMeasurements[8],
407-
{measure: clientMetrics.GRPC_CLIENT_SENT_MESSAGES_PER_RPC, value: 1});
405+
{measure: clientStats.GRPC_CLIENT_SENT_MESSAGES_PER_RPC, value: 1});
408406
assert.strictEqual(
409407
testExporter.recordedMeasurements[9].measure,
410-
clientMetrics.GRPC_CLIENT_ROUNDTRIP_LATENCY);
408+
clientStats.GRPC_CLIENT_ROUNDTRIP_LATENCY);
411409
assert.ok(testExporter.recordedMeasurements[9].value > 0);
412410
}
413411

0 commit comments

Comments
 (0)