updating to [email protected]

Author: leftieFriele

lib/resolver.content.js

@@ -39,14 +39,9 @@ export default class PodletClientContentResolver {
      */
     // @ts-expect-error Deliberate default empty options for better error messages
     constructor(options = {}) {
-        this.#http =
-            options.http ||
-            new HttpClient({
-                throwOn400: false,
-                throwOn500: false,
-            });
         const name = options.clientName;
         this.#log = abslog(options.logger);
+        this.#http = options.http || new HttpClient({ logger: this.#log });
         this.#metrics = new Metrics();
         this.#histogram = this.#metrics.histogram({
             name: 'podium_client_resolver_content_resolve',

lib/resolver.fallback.js

@@ -34,9 +34,9 @@ export default class PodletClientFallbackResolver {
      */
     // @ts-expect-error Deliberate default empty options for better error messages
     constructor(options = {}) {
-        this.#http = options.http || new HttpClient();
         const name = options.clientName;
         this.#log = abslog(options.logger);
+        this.#http = options.http || new HttpClient({ logger: this.#log });
         this.#metrics = new Metrics();
         this.#histogram = this.#metrics.histogram({
             name: 'podium_client_resolver_fallback_resolve',

lib/resolver.js

@@ -34,8 +34,8 @@ export default class PodletClientResolver {
 
         const log = abslog(options.logger);
         const httpClient = new HttpClient({
-            throwOn400: false,
-            throwOn500: false,
+            clientName: options.clientName,
+            logger: log,
         });
         this.#cache = new Cache(registry, options);
         this.#manifest = new Manifest({

lib/resolver.manifest.js

@@ -22,7 +22,7 @@ const UA_STRING = `${pkg.name} ${pkg.version}`;
  * @typedef {object} PodletClientManifestResolverOptions
  * @property {string} clientName
  * @property {import('abslog').AbstractLoggerOptions} [logger]
- * @property {import('./http.js').default} [http]
+ * @property {import('@podium/http-client').default} [http]
  */
 
 export default class PodletClientManifestResolver {
@@ -37,14 +37,9 @@ export default class PodletClientManifestResolver {
      */
     // @ts-expect-error Deliberate default empty options for better error messages
     constructor(options = {}) {
-        this.#http =
-            options.http ||
-            new HttpClient({
-                throwOn400: true,
-                throwOn500: true,
-            });
         const name = options.clientName;
         this.#log = abslog(options.logger);
+        this.#http = options.http || new HttpClient({ logger: this.#log });
         this.#metrics = new Metrics();
         this.#histogram = this.#metrics.histogram({
             name: 'podium_client_resolver_manifest_resolve',

package.json

@@ -39,7 +39,7 @@
   "dependencies": {
     "@hapi/boom": "10.0.1",
     "@metrics/client": "2.5.3",
-    "@podium/http-client": "1.0.0-beta.3",
+    "@podium/http-client": "1.0.0-beta.4",
     "@podium/schemas": "5.0.6",
     "@podium/utils": "5.3.1",
     "abslog": "2.4.4",

tests/resolver.test.js

@@ -41,24 +41,19 @@ tap.test(
                 const metrics = [];
                 stream.on('data', (metric) => metrics.push(metric));
                 stream.on('end', async () => {
-                    t.equal(metrics.length, 3);
+                    t.equal(metrics.length, 2);
+
                     t.equal(metrics[0].name, 'http_client_breaker_events');
                     t.equal(metrics[0].type, 2);
                     t.same(metrics[0].labels[0], {
-                        name: 'name',
-                        value: 'fire',
-                    });
-                    t.equal(metrics[1].name, 'http_client_breaker_events');
-                    t.equal(metrics[1].type, 2);
-                    t.same(metrics[1].labels[0], {
                         name: 'name',
                         value: 'success',
                     });
                     t.equal(
-                        metrics[2].name,
+                        metrics[1].name,
                         'podium_client_resolver_manifest_resolve',
                     );
-                    t.equal(metrics[2].type, 5);
+                    t.equal(metrics[1].type, 5);
                     resolve();
                 });
             });