refactor(js-sdk): remove usage of patch file for handling telemetry a…

…ttributes (#442)

Makefile

@@ -66,7 +66,6 @@ build-client-js:
 	sed -i -e "s|_this|this|g" ${CLIENTS_OUTPUT_DIR}/fga-js-sdk/*.md
 	rm -rf  ${CLIENTS_OUTPUT_DIR}/fga-js-sdk/*-e
 	make run-in-docker sdk_language=js image=node:${NODE_DOCKER_TAG} command="/bin/sh -c 'npm i --lockfile-version 2 && npm run lint:fix -- --quiet'"
-	make run-in-docker sdk_language=js image=busybox:${BUSYBOX_DOCKER_TAG} command="/bin/sh -c 'patch -p1 api.ts /config/clients/js/patches/add-method-specific-attributes.patch'"
 	make run-in-docker sdk_language=js image=node:${NODE_DOCKER_TAG} command="/bin/sh -c 'npm run lint:fix && npm run build;'"
 
 ### Go

config/clients/js/template/apiInner.mustache

@@ -213,6 +213,12 @@ export const {{classname}}Fp = function(configuration: Configuration, credential
             const localVarAxiosArgs = localVarAxiosParamCreator.{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials, {
                 [TelemetryAttribute.FgaClientRequestMethod]: "{{operationIdCamelCase}}",
+                {{#pathParams.0}}
+                [TelemetryAttribute.FgaClientRequestStoreId]: storeId ?? "",
+                {{/pathParams.0}}
+                {{#bodyParam}}
+                ...TelemetryAttributes.fromRequestBody(body)
+                {{/bodyParam}}
             });
         },
     {{/operation}}

config/clients/js/template/telemetry/attributes.ts.mustache

@@ -100,4 +100,16 @@ export class TelemetryAttributes {
 
     return attributes;
   }
+
+  static fromRequestBody(body: any, attributes: Record<string, string | number> = {}): Record<string, string | number>  {
+    if (body?.authorization_model_id) {
+      attributes[TelemetryAttribute.FgaClientRequestModelId] = body.authorization_model_id;
+    }
+
+    if (body?.tuple_key?.user) {
+      attributes[TelemetryAttribute.FgaClientUser] = body.tuple_key.user;
+    }
+
+    return attributes;
+  }
 }

config/clients/js/template/tests/telemetry/attributes.test.ts.mustache

@@ -79,4 +79,20 @@ describe("TelemetryAttributes", () => {
     expect(result["fga-client.response.model_id"]).toEqual("model-id");
     expect(result["http.server.request.duration"]).toEqual(10);
   });
+
+  test("should create attributes from a request body correctly", () => {
+    const body = { authorization_model_id: "model-id", tuple_key: { user: "user:anne" } };
+    const attributes = TelemetryAttributes.fromRequestBody(body);
+
+    expect(attributes[TelemetryAttribute.FgaClientRequestModelId]).toEqual("model-id");
+    expect(attributes[TelemetryAttribute.FgaClientUser]).toEqual("user:anne");
+  });
+
+  test("should create attributes from a request body without tuple_key", () => {
+    const body = { authorization_model_id: "model-id" };
+    const attributes = TelemetryAttributes.fromRequestBody(body);
+
+    expect(attributes[TelemetryAttribute.FgaClientRequestModelId]).toEqual("model-id");
+    expect(attributes[TelemetryAttribute.FgaClientUser]).toBeUndefined();
+  });
 });