Merge branch 'main' into alsh/atlassian-analytics

Author: alshdavid

packages/runtimes/js/src/helpers/.babelrc

@@ -1,8 +1,6 @@
 export type AtlaspackAnalyticsEvent = {
-  kind?: string;
   action: string;
   attributes?: {[key: string]: string | number | boolean};
-  tags?: string[];
 };
 
 export function sendAnalyticsEvent(event: AtlaspackAnalyticsEvent): void;

packages/runtimes/js/src/helpers/browser/analytics/analytics.d.ts

@@ -1,10 +1,8 @@
 // @flow
 
 export type AtlaspackAnalyticsEvent = {|
-  kind?: string,
   action: string,
   attributes?: { [key: string]: string | number | boolean },
-  tags?: string[],
 |};
 
 declare export function sendAnalyticsEvent(event: AtlaspackAnalyticsEvent): void;

packages/runtimes/js/src/helpers/browser/analytics/analytics.js.flow

@@ -61,7 +61,6 @@ async function load(id) {
 
 function sendAnalyticsEvent(action, targetUrl, attempt) {
   require('./analytics/analytics.js').sendAnalyticsEvent({
-    kind: 'operational',
     action: 'importRetry',
     attributes: {
       action,

packages/runtimes/js/src/helpers/browser/esm-js-loader-retry.js

@@ -28,19 +28,22 @@ function getFilenameFromUrlPath(pathname) {
  * @returns {number}
  */
 function getDomainShardIndex(str, maxShards) {
+  // As we include the base domain as a shard option then we add 1 to maxShards
+  // to account for that.
+  let totalShards = maxShards + 1;
   let shard = str.split('').reduce((a, b) => {
-    let n = (a << maxShards) - a + b.charCodeAt(0);
+    let n = (a << totalShards) - a + b.charCodeAt(0);
 
     // The value returned by << is 64 bit, the & operator coerces to 32,
     // prevents overflow as we iterate.
     return n & n;
   }, 0);
 
-  shard = shard % maxShards;
+  shard = shard % totalShards;
 
   // Make number positive
   if (shard < 0) {
-    shard += maxShards;
+    shard += totalShards;
   }
 
   return shard;
@@ -69,17 +72,20 @@ function removeTrailingShard(subdomain) {
  */
 function applyShardToDomain(domain, shard) {
   let i = domain.indexOf('.');
+  // If the shard is 0, then just use the base domain.
+  // If the shard is > 0, then remove 1 as the shards domains index from 0
+  let shardSuffix = shard === 0 ? '' : `-${shard - 1}`;
 
   // Domains like localhost have no . separators
   if (i === -1) {
-    return `${removeTrailingShard(domain)}-${shard}`;
+    return `${removeTrailingShard(domain)}${shardSuffix}`;
   }
 
   // If this domain already has a shard number in it, strip it
   // out before adding the new one
   let firstSubdomain = removeTrailingShard(domain.slice(0, i));
 
-  return `${firstSubdomain}-${shard}${domain.slice(i)}`;
+  return `${firstSubdomain}${shardSuffix}${domain.slice(i)}`;
 }
 
 /**

packages/utils/domain-sharding/src/index.js

@@ -1,13 +1,56 @@
 // @flow
 import assert from 'assert';
-import {shardUrlUnchecked, shardUrl, domainShardingKey} from '../src/index.js';
+import {
+  shardUrlUnchecked,
+  shardUrl,
+  domainShardingKey,
+  applyShardToDomain,
+} from '../src/index.js';
 
 describe('domain sharding helpers', () => {
   beforeEach(() => {
     // $FlowFixMe
     delete globalThis[domainShardingKey];
   });
 
+  describe('applyShardToDomain', () => {
+    it('should use the base domain for shard 0', () => {
+      const testBundle =
+        'https://bundle-shard.assets.example.com/assets/test-bundle.123abc.js';
+
+      const result = applyShardToDomain(testBundle, 0);
+
+      assert.equal(
+        result,
+        'https://bundle-shard.assets.example.com/assets/test-bundle.123abc.js',
+      );
+    });
+
+    it('should use the 0 shard domain for shard 1', () => {
+      const testBundle =
+        'https://bundle-shard.assets.example.com/assets/test-bundle.123abc.js';
+
+      const result = applyShardToDomain(testBundle, 1);
+
+      assert.equal(
+        result,
+        'https://bundle-shard-0.assets.example.com/assets/test-bundle.123abc.js',
+      );
+    });
+
+    it('should use the 2 shard domain for shard 3', () => {
+      const testBundle =
+        'https://bundle-shard.assets.example.com/assets/test-bundle.123abc.js';
+
+      const result = applyShardToDomain(testBundle, 3);
+
+      assert.equal(
+        result,
+        'https://bundle-shard-2.assets.example.com/assets/test-bundle.123abc.js',
+      );
+    });
+  });
+
   describe('shardUrlUnchecked', () => {
     it('should shard a URL', () => {
       const testBundle =
@@ -17,7 +60,19 @@ describe('domain sharding helpers', () => {
 
       assert.equal(
         result,
-        'https://bundle-shard-0.assets.example.com/assets/test-bundle.123abc.js',
+        'https://bundle-shard-1.assets.example.com/assets/test-bundle.123abc.js',
+      );
+    });
+
+    it('should include the original domain in the shar', () => {
+      const testBundle =
+        'https://bundle-shard.assets.example.com/assets/test-bundle.123abc.js';
+
+      const result = shardUrlUnchecked(testBundle, 5);
+
+      assert.equal(
+        result,
+        'https://bundle-shard-1.assets.example.com/assets/test-bundle.123abc.js',
       );
     });
 
@@ -29,7 +84,7 @@ describe('domain sharding helpers', () => {
 
       assert.equal(
         result,
-        'https://bundle-shard-4.assets.example.com/assets/TestBundle.1a2b3c.js',
+        'https://bundle-shard-2.assets.example.com/assets/TestBundle.1a2b3c.js',
       );
     });
 
@@ -38,7 +93,7 @@ describe('domain sharding helpers', () => {
 
       const result = shardUrlUnchecked(testBundle, 5);
 
-      assert.equal(result, 'http://localhost-3/assets/testBundle.123abc.js');
+      assert.equal(result, 'http://localhost-2/assets/testBundle.123abc.js');
     });
 
     it('should handle domains with ports', () => {
@@ -48,7 +103,7 @@ describe('domain sharding helpers', () => {
 
       assert.equal(
         result,
-        'http://localhost-3:8081/assets/testBundle.123abc.js',
+        'http://localhost-2:8081/assets/testBundle.123abc.js',
       );
     });
   });
@@ -63,7 +118,7 @@ describe('domain sharding helpers', () => {
 
       assert.equal(
         result,
-        'https://bundle-shard-0.assets.example.com/assets/test-bundle.123abc.js',
+        'https://bundle-shard-1.assets.example.com/assets/test-bundle.123abc.js',
       );
     });