@diia-inhouse/http 1.9.0 → 4.0.0

package/LICENCE.md

@@ -18,40 +18,40 @@ or has expressed by any other means his willingness to license under the EUPL.
 
 In this Licence, the following terms have the following meaning:
 
--   ‘The Licence’: this Licence.
+- ‘The Licence’: this Licence.
 
--   ‘The Original Work’: the work or software distributed or communicated by the
-    Licensor under this Licence, available as Source Code and also as Executable
-    Code as the case may be.
+- ‘The Original Work’: the work or software distributed or communicated by the
+  Licensor under this Licence, available as Source Code and also as Executable
+  Code as the case may be.
 
--   ‘Derivative Works’: the works or software that could be created by the
-    Licensee, based upon the Original Work or modifications thereof. This Licence
-    does not define the extent of modification or dependence on the Original Work
-    required in order to classify a work as a Derivative Work; this extent is
-    determined by copyright law applicable in the country mentioned in Article 15.
+- ‘Derivative Works’: the works or software that could be created by the
+  Licensee, based upon the Original Work or modifications thereof. This Licence
+  does not define the extent of modification or dependence on the Original Work
+  required in order to classify a work as a Derivative Work; this extent is
+  determined by copyright law applicable in the country mentioned in Article 15.
 
--   ‘The Work’: the Original Work or its Derivative Works.
+- ‘The Work’: the Original Work or its Derivative Works.
 
--   ‘The Source Code’: the human-readable form of the Work which is the most
-    convenient for people to study and modify.
+- ‘The Source Code’: the human-readable form of the Work which is the most
+  convenient for people to study and modify.
 
--   ‘The Executable Code’: any code which has generally been compiled and which is
-    meant to be interpreted by a computer as a program.
+- ‘The Executable Code’: any code which has generally been compiled and which is
+  meant to be interpreted by a computer as a program.
 
--   ‘The Licensor’: the natural or legal person that distributes or communicates
-    the Work under the Licence.
+- ‘The Licensor’: the natural or legal person that distributes or communicates
+  the Work under the Licence.
 
--   ‘Contributor(s)’: any natural or legal person who modifies the Work under the
-    Licence, or otherwise contributes to the creation of a Derivative Work.
+- ‘Contributor(s)’: any natural or legal person who modifies the Work under the
+  Licence, or otherwise contributes to the creation of a Derivative Work.
 
--   ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of
-    the Work under the terms of the Licence.
+- ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of
+  the Work under the terms of the Licence.
 
--   ‘Distribution’ or ‘Communication’: any act of selling, giving, lending,
-    renting, distributing, communicating, transmitting, or otherwise making
-    available, online or offline, copies of the Work or providing access to its
-    essential functionalities at the disposal of any other natural or legal
-    person.
+- ‘Distribution’ or ‘Communication’: any act of selling, giving, lending,
+  renting, distributing, communicating, transmitting, or otherwise making
+  available, online or offline, copies of the Work or providing access to its
+  essential functionalities at the disposal of any other natural or legal
+  person.
 
 2. Scope of the rights granted by the Licence
 
@@ -59,15 +59,15 @@ The Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
 sublicensable licence to do the following, for the duration of copyright vested
 in the Original Work:
 
--   use the Work in any circumstance and for all usage,
--   reproduce the Work,
--   modify the Work, and make Derivative Works based upon the Work,
--   communicate to the public, including the right to make available or display
-    the Work or copies thereof to the public and perform publicly, as the case may
-    be, the Work,
--   distribute the Work or copies thereof,
--   lend and rent the Work or copies thereof,
--   sublicense rights in the Work or copies thereof.
+- use the Work in any circumstance and for all usage,
+- reproduce the Work,
+- modify the Work, and make Derivative Works based upon the Work,
+- communicate to the public, including the right to make available or display
+  the Work or copies thereof to the public and perform publicly, as the case may
+  be, the Work,
+- distribute the Work or copies thereof,
+- lend and rent the Work or copies thereof,
+- sublicense rights in the Work or copies thereof.
 
 Those rights can be exercised on any media, supports and formats, whether now
 known or later invented, as far as the applicable law permits so.
@@ -240,43 +240,43 @@ their choice.
 
 Without prejudice to specific agreement between parties,
 
--   any litigation resulting from the interpretation of this License, arising
-    between the European Union institutions, bodies, offices or agencies, as a
-    Licensor, and any Licensee, will be subject to the jurisdiction of the Court
-    of Justice of the European Union, as laid down in article 272 of the Treaty on
-    the Functioning of the European Union,
+- any litigation resulting from the interpretation of this License, arising
+  between the European Union institutions, bodies, offices or agencies, as a
+  Licensor, and any Licensee, will be subject to the jurisdiction of the Court
+  of Justice of the European Union, as laid down in article 272 of the Treaty on
+  the Functioning of the European Union,
 
--   any litigation arising between other parties and resulting from the
-    interpretation of this License, will be subject to the exclusive jurisdiction
-    of the competent court where the Licensor resides or conducts its primary
-    business.
+- any litigation arising between other parties and resulting from the
+  interpretation of this License, will be subject to the exclusive jurisdiction
+  of the competent court where the Licensor resides or conducts its primary
+  business.
 
 15. Applicable Law
 
 Without prejudice to specific agreement between parties,
 
--   this Licence shall be governed by the law of the European Union Member State
-    where the Licensor has his seat, resides or has his registered office,
+- this Licence shall be governed by the law of the European Union Member State
+  where the Licensor has his seat, resides or has his registered office,
 
--   this licence shall be governed by Belgian law if the Licensor has no seat,
-    residence or registered office inside a European Union Member State.
+- this licence shall be governed by Belgian law if the Licensor has no seat,
+  residence or registered office inside a European Union Member State.
 
 Appendix
 
 ‘Compatible Licences’ according to Article 5 EUPL are:
 
--   GNU General Public License (GPL) v. 2, v. 3
--   GNU Affero General Public License (AGPL) v. 3
--   Open Software License (OSL) v. 2.1, v. 3.0
--   Eclipse Public License (EPL) v. 1.0
--   CeCILL v. 2.0, v. 2.1
--   Mozilla Public Licence (MPL) v. 2
--   GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3
--   Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for
-    works other than software
--   European Union Public Licence (EUPL) v. 1.1, v. 1.2
--   Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong
-    Reciprocity (LiLiQ-R+).
+- GNU General Public License (GPL) v. 2, v. 3
+- GNU Affero General Public License (AGPL) v. 3
+- Open Software License (OSL) v. 2.1, v. 3.0
+- Eclipse Public License (EPL) v. 1.0
+- CeCILL v. 2.0, v. 2.1
+- Mozilla Public Licence (MPL) v. 2
+- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3
+- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for
+  works other than software
+- European Union Public Licence (EUPL) v. 1.1, v. 1.2
+- Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong
+  Reciprocity (LiLiQ-R+).
 
 The European Commission may update this Appendix to later versions of the above
 licences without producing a new version of the EUPL, as long as they provide

package/dist/interfaces/{http.js → httpClient.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=http.js.map
+//# sourceMappingURL=httpClient.js.map

package/dist/interfaces/httpClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"httpClient.js","sourceRoot":"","sources":["../../src/interfaces/httpClient.ts"],"names":[],"mappings":""}

package/dist/interfaces/index.js

@@ -15,5 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./deps"), exports);
-__exportStar(require("./http"), exports);
+__exportStar(require("./httpClient"), exports);
 //# sourceMappingURL=index.js.map

package/dist/interfaces/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAsB;AAEtB,yCAAsB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAsB;AAEtB,+CAA4B"}

package/dist/services/errors/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RequestError = exports.OperationError = void 0;
+var operationError_1 = require("./operationError");
+Object.defineProperty(exports, "OperationError", { enumerable: true, get: function () { return operationError_1.OperationError; } });
+var requestError_1 = require("./requestError");
+Object.defineProperty(exports, "RequestError", { enumerable: true, get: function () { return requestError_1.RequestError; } });
+//# sourceMappingURL=index.js.map

package/dist/services/errors/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/errors/index.ts"],"names":[],"mappings":";;;AAAA,mDAAiD;AAAxC,gHAAA,cAAc,OAAA;AAEvB,+CAA6C;AAApC,4GAAA,YAAY,OAAA"}

package/dist/services/errors/operationError.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OperationError = void 0;
+const types_1 = require("@diia-inhouse/types");
+const requestError_1 = require("./requestError");
+class OperationError extends requestError_1.RequestError {
+    constructor(message, originalError) {
+        super(message, types_1.HttpStatusCode.INTERNAL_SERVER_ERROR, originalError);
+        this.name = 'OperationError';
+    }
+}
+exports.OperationError = OperationError;
+//# sourceMappingURL=operationError.js.map

package/dist/services/errors/operationError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"operationError.js","sourceRoot":"","sources":["../../../src/services/errors/operationError.ts"],"names":[],"mappings":";;;AAAA,+CAAoD;AAEpD,iDAA6C;AAE7C,MAAa,cAAe,SAAQ,2BAAY;IAC5C,YAAY,OAAe,EAAE,aAAoB;QAC7C,KAAK,CAAC,OAAO,EAAE,sBAAc,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAA;QAEnE,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAA;IAChC,CAAC;CACJ;AAND,wCAMC"}

package/dist/services/errors/requestError.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RequestError = void 0;
+class RequestError extends Error {
+    statusCode;
+    originalError;
+    constructor(message, statusCode, originalError) {
+        super(message);
+        this.name = 'RequestError';
+        this.statusCode = statusCode;
+        this.originalError = originalError;
+    }
+}
+exports.RequestError = RequestError;
+//# sourceMappingURL=requestError.js.map

package/dist/services/errors/requestError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"requestError.js","sourceRoot":"","sources":["../../../src/services/errors/requestError.ts"],"names":[],"mappings":";;;AAAA,MAAa,YAAa,SAAQ,KAAK;IAC1B,UAAU,CAAQ;IAElB,aAAa,CAAO;IAE7B,YAAY,OAAe,EAAE,UAAkB,EAAE,aAAoB;QACjE,KAAK,CAAC,OAAO,CAAC,CAAA;QAEd,IAAI,CAAC,IAAI,GAAG,cAAc,CAAA;QAC1B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACtC,CAAC;CACJ;AAZD,oCAYC"}

package/dist/services/httpClient.js

@@ -1,168 +1,232 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpClientService = void 0;
-/* eslint-disable n/no-unsupported-features/node-builtins */
-const node_http_1 = require("node:http");
-const node_https_1 = require("node:https");
-const node_querystring_1 = require("node:querystring");
-const await_to_js_1 = __importDefault(require("await-to-js"));
-const lodash_1 = require("lodash");
+const api_1 = require("@opentelemetry/api");
+const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
+const axios_1 = __importStar(require("axios"));
+const diia_metrics_1 = require("@diia-inhouse/diia-metrics");
 const errors_1 = require("@diia-inhouse/errors");
 const types_1 = require("@diia-inhouse/types");
+const errors_2 = require("./errors");
+const utils_1 = require("./utils");
 class HttpClientService {
     logger;
-    binaryMimeTypes = ['application/pdf', 'application/p7s'];
-    binaryMimeTypesPrefixes = ['image/'];
-    constructor(logger) {
+    metrics;
+    systemServiceName;
+    timeout;
+    baseUrl;
+    constructor(logger, metrics, systemServiceName, timeout = types_1.DurationMs.Second * 30, baseUrl = '') {
         this.logger = logger;
+        this.metrics = metrics;
+        this.systemServiceName = systemServiceName;
+        this.timeout = timeout;
+        this.baseUrl = baseUrl;
     }
-    async get(options, hostFingerprint) {
-        this.setCheckServerIdentity(options, hostFingerprint);
-        return await (0, await_to_js_1.default)(this.makeRequest(types_1.HttpMethod.GET, options));
+    async get(path, opts) {
+        return await this.request({
+            path,
+            method: types_1.HttpMethod.GET,
+            ...opts,
+        });
     }
-    async post(options, hostFingerprint, body) {
-        this.setCheckServerIdentity(options, hostFingerprint);
-        return await (0, await_to_js_1.default)(this.makeRequest(types_1.HttpMethod.POST, options, body));
+    async post(path, opts) {
+        return await this.request({
+            path,
+            method: types_1.HttpMethod.POST,
+            ...opts,
+        });
     }
-    async put(options, hostFingerprint, body) {
-        this.setCheckServerIdentity(options, hostFingerprint);
-        return await (0, await_to_js_1.default)(this.makeRequest(types_1.HttpMethod.PUT, options, body));
+    async put(path, opts) {
+        return await this.request({
+            path,
+            method: types_1.HttpMethod.PUT,
+            ...opts,
+        });
     }
-    async delete(options, hostFingerprint, body) {
-        this.setCheckServerIdentity(options, hostFingerprint);
-        return await (0, await_to_js_1.default)(this.makeRequest(types_1.HttpMethod.DELETE, options, body));
+    async delete(path, opts) {
+        return await this.request({
+            path,
+            method: types_1.HttpMethod.DELETE,
+            ...opts,
+        });
     }
-    makeRequest(method, options, body) {
-        options.method = method;
-        let parsedHost;
-        try {
-            parsedHost = new URL(options.host || '');
-        }
-        catch (err) {
-            const msg = `Host "${options.host}" must include protocol`;
-            this.logger.error(msg, { err });
-            throw new Error(msg);
+    async patch(path, opts) {
+        return await this.request({
+            path,
+            method: types_1.HttpMethod.PATCH,
+            ...opts,
+        });
+    }
+    async request(opts) {
+        const activeContext = api_1.context.active();
+        const tracer = api_1.trace.getTracer(this.systemServiceName);
+        const baseUrl = opts.baseUrl || this.baseUrl;
+        if (!baseUrl) {
+            throw new Error('Base URL is not provided');
         }
-        options.host = parsedHost.hostname;
-        options.port = parsedHost.port || options.port;
-        let requestFn;
-        if (parsedHost.protocol === 'https:') {
-            requestFn = node_https_1.request;
+        const span = tracer.startSpan(opts.method, {
+            kind: api_1.SpanKind.CLIENT,
+            attributes: {
+                [semantic_conventions_1.SEMATTRS_MESSAGING_SYSTEM]: diia_metrics_1.RequestMechanism.Http,
+                [semantic_conventions_1.SemanticAttributes.HTTP_METHOD]: opts.method,
+                [semantic_conventions_1.SemanticAttributes.HTTP_URL]: `${baseUrl}${opts.path}`,
+                [semantic_conventions_1.SemanticAttributes.HTTP_TARGET]: opts.path,
+                'messaging.caller': this.systemServiceName,
+            },
+        }, activeContext);
+        const { response, error, retryCount } = await this.requestHelper({ ...opts, baseUrl }, span);
+        span?.setAttribute('retryCount', retryCount);
+        if (response) {
+            const statusCode = response.status;
+            this.logger.info('HTTP request succeeded', {
+                statusCode,
+                path: opts.path,
+                method: opts.method,
+            });
+            span?.setStatus({ code: api_1.SpanStatusCode.OK });
+            span?.setAttribute(semantic_conventions_1.SemanticAttributes.HTTP_STATUS_CODE, statusCode);
+            span?.end();
+            return {
+                isOk: true,
+                statusCode,
+                headers: response.headers || {},
+                body: response.data,
+            };
         }
-        else if (parsedHost.protocol === 'http:') {
-            requestFn = node_http_1.request;
+        if (error) {
+            const { statusCode, originalError } = error;
+            this.logger.error('HTTP request failed', {
+                err: error,
+                method: opts.method,
+                path: opts.path,
+                statusCode,
+            });
+            span?.setStatus({ code: api_1.SpanStatusCode.ERROR });
+            span?.recordException({
+                name: originalError.name || 'Unexpected error',
+                message: originalError.message,
+                code: statusCode,
+            });
+            span?.end();
+            return {
+                isOk: false,
+                statusCode,
+                body: originalError instanceof axios_1.AxiosError ? originalError.response?.data : undefined,
+                headers: originalError instanceof axios_1.AxiosError ? originalError.response?.headers || {} : {},
+            };
         }
-        else {
-            throw new Error(`Unknown protocol, ${parsedHost.protocol}`);
+        throw new Error('Unexpected error caused');
+    }
+    async requestHelper(opts, span, currentRequestRetries = 0) {
+        const timeout = opts.timeout || this.timeout;
+        const { method, path, baseUrl, query = {}, body, headers = {}, responseType = 'json', retries = 0, retryInterval = 0, httpsAgent, httpAgent, errorType: errorTypeOps, metricLabel, } = opts;
+        const startTime = process.hrtime.bigint();
+        span.addEvent('request', { message: `Started processing request. Retry count ${currentRequestRetries}` });
+        try {
+            const response = await axios_1.default.request({
+                method,
+                baseURL: baseUrl,
+                url: path,
+                params: query,
+                data: body,
+                headers,
+                responseType,
+                timeout,
+                httpsAgent,
+                httpAgent,
+            });
+            this.observeSuccessRequest({
+                statusCode: response.status,
+                retryCount: currentRequestRetries,
+                startTime,
+                span,
+                baseUrl: baseUrl,
+                metricLabel,
+            });
+            return { response, retryCount: currentRequestRetries };
         }
-        return new Promise((resolve, reject) => {
-            try {
-                const data = [];
-                const request = requestFn(options, (response) => {
-                    if (!this.isBinaryContentType(response.headers)) {
-                        response.setEncoding('utf8');
-                    }
-                    response.on('data', (chunk) => {
-                        data.push(chunk);
-                    });
-                    response.on('end', () => {
-                        let parsedData;
-                        const res = (0, lodash_1.cloneDeep)(response);
-                        const { statusCode = '' } = res;
-                        const isSuccessStatusCode = /2\d{2}/.test(statusCode.toString());
-                        res.data = res.data || undefined;
-                        if (data.length === 0) {
-                            this.logger.info('No data in response', { statusCode });
-                            return isSuccessStatusCode ? resolve(res) : reject(res);
-                        }
-                        try {
-                            if (this.isJsonContentType(response.headers)) {
-                                parsedData = JSON.parse(data.join(''));
-                                res.data = parsedData;
-                            }
-                            else if (this.isBinaryContentType(response.headers)) {
-                                // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-                                res.data = Buffer.concat(data);
-                            }
-                            else {
-                                res.data = data.join('');
-                            }
-                        }
-                        catch (err) {
-                            this.logger.error(`Failed to parse data: ${data}`);
-                            if (err instanceof Error) {
-                                return reject(err);
-                            }
-                        }
-                        if (!isSuccessStatusCode) {
-                            return reject(res);
-                        }
-                        return resolve(res);
+        catch (err) {
+            const statusCode = err?.response?.status || types_1.HttpStatusCode.INTERNAL_SERVER_ERROR;
+            const errorType = errors_1.ErrorType.External || errorTypeOps;
+            this.observeFailedRequest({
+                statusCode,
+                retryCount: currentRequestRetries,
+                startTime,
+                span,
+                errorType,
+                baseUrl: baseUrl,
+                metricLabel,
+            });
+            if (err instanceof axios_1.AxiosError) {
+                if (currentRequestRetries < retries) {
+                    this.logger.info('Retrying HTTP request', {
+                        err,
+                        path,
+                        retries: currentRequestRetries + 1,
                     });
-                });
-                request.on('error', (err) => reject(err));
-                request.on('timeout', () => {
-                    const msg = 'Failed due timeout reason';
-                    this.logger.error(msg);
-                    return reject(new errors_1.RequestTimeoutError(msg));
-                });
-                request.on('abort', () => {
-                    const msg = 'Failed due abort reason';
-                    this.logger.error(msg);
-                    return reject(new errors_1.ServiceUnavailableError(msg));
-                });
-                if (body) {
-                    const preparedBody = typeof body === 'string' ? body : (0, node_querystring_1.stringify)(body);
-                    request.write(preparedBody);
-                }
-                request.end();
-            }
-            catch (err) {
-                if (err instanceof Error) {
-                    return reject(err);
+                    return await (0, utils_1.waitAndRun)(() => this.requestHelper(opts, span, currentRequestRetries + 1), retryInterval);
                 }
+                const requestError = new errors_2.RequestError(err.message, statusCode, err);
+                return { error: requestError, retryCount: currentRequestRetries };
             }
-        });
-    }
-    isJsonContentType(headers) {
-        const contentTypeHeader = headers['content-type'];
-        if (!contentTypeHeader) {
-            return false;
+            const operationError = new errors_2.OperationError('Internal package error', err);
+            return { error: operationError, retryCount: currentRequestRetries };
         }
-        return /^application\/json/.test(contentTypeHeader);
     }
-    isBinaryContentType(headers) {
-        const contentTypeHeader = headers['content-type'];
-        if (!contentTypeHeader) {
-            return false;
-        }
-        return (this.binaryMimeTypes.includes(contentTypeHeader) ||
-            this.binaryMimeTypesPrefixes.some((mimeTypePrefix) => contentTypeHeader.startsWith(mimeTypePrefix)));
+    observeSuccessRequest(params) {
+        const { statusCode, retryCount, startTime, span, baseUrl, metricLabel } = params;
+        const labels = this.getLabels(statusCode, diia_metrics_1.RequestStatus.Successful, baseUrl, metricLabel);
+        span.addEvent('request', { message: `Finished processing request. Retry count ${retryCount}` });
+        this.metrics.totalTimerMetric.observeSeconds(labels, process.hrtime.bigint() - startTime);
     }
-    setCheckServerIdentity(options, hostFingerprint) {
-        if (!hostFingerprint) {
-            return;
-        }
-        const checkServerIdentity = (host, cert) => {
-            const certFingerprint = cert.fingerprint256 || cert.fingerprint;
-            this.logger.info(`Checking fingerprint for host: ${host}, fingerprint is ${certFingerprint}`);
-            if (!hostFingerprint || hostFingerprint === certFingerprint) {
-                this.logger.info('Fingerprint validated successfully');
-                return;
-            }
-            this.logger.info('Failed to validate fingerprint');
-            return new Error(`Fingerprint for host ${host} does not match`);
+    observeFailedRequest(params) {
+        const { statusCode, retryCount, startTime, span, errorType, baseUrl, metricLabel } = params;
+        const labels = this.getLabels(statusCode, diia_metrics_1.RequestStatus.Failed, baseUrl, metricLabel, errorType);
+        span.addEvent('request', { message: `Finished processing request. Retry count ${retryCount}` });
+        this.metrics.totalTimerMetric.observeSeconds(labels, process.hrtime.bigint() - startTime);
+    }
+    getLabels(statusCode, status, baseUrl, metricLabel, errorType) {
+        return {
+            status,
+            statusCode,
+            source: this.systemServiceName,
+            destination: `${baseUrl}|${metricLabel}`,
+            mechanism: diia_metrics_1.RequestMechanism.Http,
+            ...(errorType ? { errorType } : {}),
         };
-        if (options.agent instanceof node_https_1.Agent) {
-            ;
-            options.agent.options.checkServerIdentity = checkServerIdentity;
-        }
-        else {
-            options.agent = new node_https_1.Agent({ checkServerIdentity });
-        }
     }
 }
 exports.HttpClientService = HttpClientService;