Skip to content

Commit be5b598

Browse files
danieljbrucegcf-owl-bot[bot]
danieljbruce
and
gcf-owl-bot[bot]
authored
fix: Record grpc code string for client side metrics instead of grpc code number (#1754)
* add the repro code * Adjust the test fixtures * remove the experiment test file * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Adjust metrics handler test fixture * Change system test fixtures * Remove only * Change status to OK * Remove only --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 2a96092 commit be5b598

File tree

9 files changed

+60
-59
lines changed

9 files changed

+60
-59
lines changed

‎protos/protos.d.ts‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎protos/protos.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/client-side-metrics/operation-metrics-collector.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
const {status} = require('@grpc/grpc-js');
1516
import * as fs from 'fs';
1617
import {MethodName, StreamingState} from './client-side-metrics-attributes';
1718
import {grpc, ServiceError} from 'google-gax';
@@ -222,7 +223,7 @@ export class OperationMetricsCollector {
222223
serverLatency: this.serverTime ?? undefined,
223224
connectivityErrorCount: this.connectivityErrorCount,
224225
streaming: this.streamingOperation,
225-
status: attemptStatus.toString(),
226+
status: status[attemptStatus],
226227
client_name: `nodejs-bigtable/${version}`,
227228
metricsCollectorData: this.getMetricsCollectorData(),
228229
});
@@ -308,7 +309,7 @@ export class OperationMetricsCollector {
308309
this.handlers.forEach(metricsHandler => {
309310
if (metricsHandler.onOperationComplete) {
310311
metricsHandler.onOperationComplete({
311-
status: finalOperationStatus.toString(),
312+
status: status[finalOperationStatus],
312313
streaming: this.streamingOperation,
313314
metricsCollectorData: this.getMetricsCollectorData(),
314315
client_name: `nodejs-bigtable/${version}`,

‎system-test/client-side-metrics-all-methods.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ function readRowsAssertionCheck(
110110
assert.deepStrictEqual(firstRequest, {
111111
connectivityErrorCount: 0,
112112
streaming,
113-
status: '0',
113+
status: 'OK',
114114
client_name: 'nodejs-bigtable',
115115
metricsCollectorData: {
116116
instanceId: instanceId1,
@@ -131,7 +131,7 @@ function readRowsAssertionCheck(
131131
delete secondRequest.applicationLatency;
132132
delete secondRequest.metricsCollectorData.appProfileId;
133133
assert.deepStrictEqual(secondRequest, {
134-
status: '0',
134+
status: 'OK',
135135
streaming,
136136
client_name: 'nodejs-bigtable',
137137
metricsCollectorData: {
@@ -155,7 +155,7 @@ function readRowsAssertionCheck(
155155
assert.deepStrictEqual(thirdRequest, {
156156
connectivityErrorCount: 0,
157157
streaming,
158-
status: '0',
158+
status: 'OK',
159159
client_name: 'nodejs-bigtable',
160160
metricsCollectorData: {
161161
instanceId: instanceId1,
@@ -176,7 +176,7 @@ function readRowsAssertionCheck(
176176
delete fourthRequest.applicationLatency;
177177
delete fourthRequest.metricsCollectorData.appProfileId;
178178
assert.deepStrictEqual(fourthRequest, {
179-
status: '0',
179+
status: 'OK',
180180
streaming,
181181
client_name: 'nodejs-bigtable',
182182
metricsCollectorData: {

‎system-test/client-side-metrics.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ function readRowsAssertionCheck(
176176
assert.deepStrictEqual(firstRequest, {
177177
connectivityErrorCount: 0,
178178
streaming,
179-
status: '0',
179+
status: 'OK',
180180
client_name: 'nodejs-bigtable',
181181
metricsCollectorData: {
182182
instanceId: instanceId1,
@@ -198,7 +198,7 @@ function readRowsAssertionCheck(
198198
delete secondRequest.applicationLatency;
199199
delete secondRequest.metricsCollectorData.appProfileId;
200200
assert.deepStrictEqual(secondRequest, {
201-
status: '0',
201+
status: 'OK',
202202
streaming,
203203
client_name: 'nodejs-bigtable',
204204
metricsCollectorData: {
@@ -222,7 +222,7 @@ function readRowsAssertionCheck(
222222
assert.deepStrictEqual(thirdRequest, {
223223
connectivityErrorCount: 0,
224224
streaming,
225-
status: '0',
225+
status: 'OK',
226226
client_name: 'nodejs-bigtable',
227227
metricsCollectorData: {
228228
instanceId: instanceId1,
@@ -244,7 +244,7 @@ function readRowsAssertionCheck(
244244
delete fourthRequest.applicationLatency;
245245
delete fourthRequest.metricsCollectorData.appProfileId;
246246
assert.deepStrictEqual(fourthRequest, {
247-
status: '0',
247+
status: 'OK',
248248
streaming,
249249
client_name: 'nodejs-bigtable',
250250
metricsCollectorData: {
@@ -723,7 +723,7 @@ describe('Bigtable/ClientSideMetrics', () => {
723723
assert.deepStrictEqual(firstRequest, {
724724
connectivityErrorCount: 0,
725725
streaming: 'true',
726-
status: '0',
726+
status: 'OK',
727727
client_name: 'nodejs-bigtable',
728728
metricsCollectorData: {
729729
instanceId: instanceId1,
@@ -745,7 +745,7 @@ describe('Bigtable/ClientSideMetrics', () => {
745745
delete secondRequest.applicationLatency;
746746
delete secondRequest.metricsCollectorData.appProfileId;
747747
assert.deepStrictEqual(secondRequest, {
748-
status: '0',
748+
status: 'OK',
749749
streaming: 'true',
750750
client_name: 'nodejs-bigtable',
751751
metricsCollectorData: {
@@ -769,7 +769,7 @@ describe('Bigtable/ClientSideMetrics', () => {
769769
assert.deepStrictEqual(thirdRequest, {
770770
connectivityErrorCount: 0,
771771
streaming: 'true',
772-
status: '0',
772+
status: 'OK',
773773
client_name: 'nodejs-bigtable',
774774
metricsCollectorData: {
775775
instanceId: instanceId1,
@@ -791,7 +791,7 @@ describe('Bigtable/ClientSideMetrics', () => {
791791
delete fourthRequest.applicationLatency;
792792
delete fourthRequest.metricsCollectorData.appProfileId;
793793
assert.deepStrictEqual(fourthRequest, {
794-
status: '0',
794+
status: 'OK',
795795
streaming: 'true',
796796
client_name: 'nodejs-bigtable',
797797
metricsCollectorData: {
@@ -825,7 +825,7 @@ describe('Bigtable/ClientSideMetrics', () => {
825825
attemptLatency: 23000,
826826
connectivityErrorCount: 0,
827827
streaming: 'true',
828-
status: '0',
828+
status: 'OK',
829829
client_name: 'nodejs-bigtable',
830830
metricsCollectorData: {
831831
instanceId: instanceId1,
@@ -837,7 +837,7 @@ describe('Bigtable/ClientSideMetrics', () => {
837837
},
838838
{
839839
projectId,
840-
status: '0',
840+
status: 'OK',
841841
streaming: 'true',
842842
metricsCollectorData: {
843843
instanceId: instanceId1,
@@ -858,7 +858,7 @@ describe('Bigtable/ClientSideMetrics', () => {
858858
serverLatency: undefined,
859859
connectivityErrorCount: 0,
860860
streaming: 'true',
861-
status: '0',
861+
status: 'OK',
862862
client_name: 'nodejs-bigtable',
863863
metricsCollectorData: {
864864
instanceId: instanceId1,
@@ -870,7 +870,7 @@ describe('Bigtable/ClientSideMetrics', () => {
870870
},
871871
{
872872
projectId,
873-
status: '0',
873+
status: 'OK',
874874
streaming: 'true',
875875
metricsCollectorData: {
876876
instanceId: instanceId1,
@@ -908,7 +908,7 @@ describe('Bigtable/ClientSideMetrics', () => {
908908
attemptLatency: 28000,
909909
connectivityErrorCount: 0,
910910
streaming: 'true',
911-
status: '0',
911+
status: 'OK',
912912
client_name: 'nodejs-bigtable',
913913
metricsCollectorData: {
914914
instanceId: instanceId1,
@@ -920,7 +920,7 @@ describe('Bigtable/ClientSideMetrics', () => {
920920
},
921921
{
922922
projectId,
923-
status: '0',
923+
status: 'OK',
924924
streaming: 'true',
925925
metricsCollectorData: {
926926
instanceId: instanceId1,
@@ -941,7 +941,7 @@ describe('Bigtable/ClientSideMetrics', () => {
941941
serverLatency: undefined,
942942
connectivityErrorCount: 0,
943943
streaming: 'true',
944-
status: '0',
944+
status: 'OK',
945945
client_name: 'nodejs-bigtable',
946946
metricsCollectorData: {
947947
instanceId: instanceId1,
@@ -953,7 +953,7 @@ describe('Bigtable/ClientSideMetrics', () => {
953953
},
954954
{
955955
projectId,
956-
status: '0',
956+
status: 'OK',
957957
streaming: 'true',
958958
metricsCollectorData: {
959959
instanceId: instanceId1,

‎system-test/read-modify-write-row-interceptors.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ describe('Bigtable/ReadModifyWriteRowInterceptorMetrics', () => {
253253
attemptCompleteData.metricsCollectorData.method,
254254
MethodName.READ_MODIFY_WRITE_ROW,
255255
);
256-
assert.strictEqual(attemptCompleteData.status, '0');
256+
assert.strictEqual(attemptCompleteData.status, 'OK');
257257
assert.strictEqual(
258258
attemptCompleteData.metricsCollectorData.table,
259259
TABLE_ID,
@@ -276,7 +276,7 @@ describe('Bigtable/ReadModifyWriteRowInterceptorMetrics', () => {
276276
operationCompleteData.metricsCollectorData.method,
277277
MethodName.READ_MODIFY_WRITE_ROW,
278278
);
279-
assert.strictEqual(operationCompleteData.status, '0');
279+
assert.strictEqual(operationCompleteData.status, 'OK');
280280
assert.strictEqual(
281281
operationCompleteData.metricsCollectorData.table,
282282
TABLE_ID,

0 commit comments

Comments
 (0)