fix: use tracing fetch

package.json

@@ -56,16 +56,16 @@
     "@adobe/helix-status": "10.1.3",
     "@adobe/helix-universal": "5.0.6",
     "@adobe/helix-universal-logger": "3.0.21",
-    "@adobe/spacecat-shared-ahrefs-client": "1.5.8",
-    "@adobe/spacecat-shared-data-access": "1.49.4",
-    "@adobe/spacecat-shared-google-client": "1.2.17",
-    "@adobe/spacecat-shared-http-utils": "1.6.14",
-    "@adobe/spacecat-shared-rum-api-client": "2.9.7",
+    "@adobe/spacecat-shared-ahrefs-client": "1.5.9",
+    "@adobe/spacecat-shared-data-access": "1.49.6",
+    "@adobe/spacecat-shared-google-client": "1.2.18",
+    "@adobe/spacecat-shared-http-utils": "1.6.15",
+    "@adobe/spacecat-shared-rum-api-client": "2.9.8",
     "@adobe/spacecat-shared-rum-api-client-v1": "npm:@adobe/[email protected]",
     "@aws-sdk/client-s3": "3.627.0",
     "@aws-sdk/client-lambda": "3.682.0",
     "@aws-sdk/credential-provider-node": "3.682.0",
-    "@adobe/spacecat-shared-utils": "1.22.1",
+    "@adobe/spacecat-shared-utils": "1.22.3",
     "@aws-sdk/client-secrets-manager": "3.682.0",
     "@aws-sdk/client-sqs": "3.682.0",
     "aws-xray-sdk": "3.10.1",

src/apex/handler.js

@@ -9,8 +9,9 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
+import { tracingFetch as fetch } from '@adobe/spacecat-shared-utils';
 
-import { fetch, hasNonWWWSubdomain, toggleWWW } from '../support/utils.js';
+import { hasNonWWWSubdomain, toggleWWW } from '../support/utils.js';
 import { AuditBuilder } from '../common/audit-builder.js';
 import { noopUrlResolver } from '../common/audit.js';
 

src/backlinks/handler.js

@@ -13,11 +13,11 @@
 import {
   internalServerError, noContent, notFound, ok,
 } from '@adobe/spacecat-shared-http-utils';
-import { composeAuditURL } from '@adobe/spacecat-shared-utils';
+import { composeAuditURL, tracingFetch as fetch } from '@adobe/spacecat-shared-utils';
 import AhrefsAPIClient from '@adobe/spacecat-shared-ahrefs-client';
 import { AbortController, AbortError } from '@adobe/fetch';
 import { retrieveSiteBySiteId } from '../utils/data-access.js';
-import { enhanceBacklinksWithFixes, fetch } from '../support/utils.js';
+import { enhanceBacklinksWithFixes } from '../support/utils.js';
 
 const TIMEOUT = 3000;
 

src/canonical/handler.js

@@ -11,8 +11,7 @@
  */
 
 import { JSDOM } from 'jsdom';
-import { composeBaseURL } from '@adobe/spacecat-shared-utils';
-import { fetch } from '../support/utils.js';
+import { composeBaseURL, tracingFetch as fetch } from '@adobe/spacecat-shared-utils';
 import { AuditBuilder } from '../common/audit-builder.js';
 import { noopUrlResolver } from '../common/audit.js';
 

src/experimentation-ess/common.js

@@ -12,6 +12,7 @@
 
 /* c8 ignore start */
 import RUMAPIClient from '@adobe/spacecat-shared-rum-api-client';
+import { tracingFetch as fetch } from '@adobe/spacecat-shared-utils';
 import { JSDOM } from 'jsdom';
 import { LambdaClient, InvokeCommand } from '@aws-sdk/client-lambda';
 import { defaultProvider } from '@aws-sdk/credential-provider-node';

src/lhs/lib.js

@@ -10,10 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import { isObject, isValidUrl } from '@adobe/spacecat-shared-utils';
+import { isObject, isValidUrl, tracingFetch as fetch } from '@adobe/spacecat-shared-utils';
 
 import PSIClient from '../support/psi-client.js';
-import { fetch } from '../support/utils.js';
 
 /**
  * Extracts audit scores from an audit.

src/sitemap/handler.js

@@ -10,10 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import { composeAuditURL, prependSchema } from '@adobe/spacecat-shared-utils';
+import { composeAuditURL, prependSchema, tracingFetch as fetch } from '@adobe/spacecat-shared-utils';
 import {
   extractDomainAndProtocol,
-  fetch,
   getBaseUrlPagesFromSitemapContents,
   getSitemapUrlsFromSitemapIndex,
   getUrlWithoutPath,

src/support/psi-client.js

@@ -10,10 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import { hasText, isObject, isValidUrl } from '@adobe/spacecat-shared-utils';
+import {
+  hasText, isObject, isValidUrl, tracingFetch as fetch,
+} from '@adobe/spacecat-shared-utils';
 
 import { createUrl } from '@adobe/fetch';
-import { fetch } from './utils.js';
 
 /**
  * The PSI strategies.

src/support/utils.js

@@ -10,19 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-import { context as h2, h1 } from '@adobe/fetch';
-import { hasText, prependSchema, resolveCustomerSecretsName } from '@adobe/spacecat-shared-utils';
+import {
+  hasText,
+  prependSchema,
+  resolveCustomerSecretsName,
+  tracingFetch as fetch,
+} from '@adobe/spacecat-shared-utils';
 import URI from 'urijs';
 import { JSDOM } from 'jsdom';
 import { GetSecretValueCommand, SecretsManagerClient } from '@aws-sdk/client-secrets-manager';
 
 URI.preventInvalidHostname = true;
 
-/* c8 ignore next 3 */
-export const { fetch } = process.env.HELIX_FETCH_FORCE_HTTP1
-  ? h1()
-  : h2();
-
 // weekly pageview threshold to eliminate urls with lack of samples
 
 export async function getRUMUrl(url) {

test/audits/backlinks.test.js

@@ -27,6 +27,7 @@ import auditBrokenBacklinks from '../../src/backlinks/handler.js';
 use(sinonChai);
 use(chaiAsPromised);
 
+// eslint-disable-next-line func-names
 describe('Backlinks Tests', function () {
   this.timeout(10000);
   let message;

test/audits/experimentation-opportunities.test.js

@@ -18,7 +18,7 @@ import sinonChai from 'sinon-chai';
 import nock from 'nock';
 import { handler } from '../../src/experimentation-opportunities/experimentation-opportunities.js';
 import { MockContextBuilder } from '../shared.js';
-import opportunitiesData from '../fixtures/opportunitiesdata.json' assert { type: 'json' };
+import opportunitiesData from '../fixtures/opportunitiesdata.json' with { type: 'json' };
 
 use(sinonChai);