Merge branch 'main' of github.com:HTTPArchive/almanac.httparchive.org…

… into production

.github/workflows/linter.yml

@@ -32,7 +32,7 @@ jobs:
         run: |
           echo "::set-env name=VALIDATE_ALL_CODEBASE::false"
       - name: Lint Code Base
-        uses: github/super-linter@v3.11.0
+        uses: github/super-linter@v3.12.0
         env:
           DEFAULT_BRANCH: main
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test_website.yml

@@ -30,7 +30,7 @@ jobs:
     - name: Remove node modules to avoid linting errors
       run: rm -rf src/node_modules
     - name: Lint Generated HTML
-      uses: github/super-linter@v3.11.0
+      uses: github/super-linter@v3.12.0
       env:
         DEFAULT_BRANCH: main
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

sql/2020/22_HTTP_2/avg_percentage_of_resources_loaded_over_HTTP_by_version_per_site.sql

@@ -0,0 +1,26 @@
+# standardSQL
+# Average percentage of resources loaded over HTTP .9, 1, 1.1, 2, and QUIC per site
+SELECT
+  client,
+  protocol,
+  AVG(num_requests / total_requests) AS avg_pct_requests_per_page
+FROM (
+  SELECT 
+    client,
+    page,
+    IF(JSON_EXTRACT_SCALAR(payload, '$._protocol') IN ('http/0.9', 'http/1.0', 'http/1.1', 'HTTP/2', 'QUIC', 'http/2+quic/46', 'HTTP/3'), JSON_EXTRACT_SCALAR(payload, '$._protocol'), 'other') AS protocol,
+    COUNT(0) AS num_requests,
+    SUM(COUNT(0)) OVER (PARTITION BY client, page) AS total_requests
+  FROM 
+    `httparchive.almanac.requests`
+  WHERE
+    date = '2020-08-01'
+  GROUP BY
+    client,
+    page,
+    protocol)
+GROUP BY 
+  client,
+  protocol
+ORDER BY
+  avg_pct_requests_per_page DESC

sql/2020/22_HTTP_2/tls_adoption_by_http_version.sql

@@ -1,22 +1,40 @@
 # standardSQL
-# Distribution of TLS versions
+# Distribution of TLS versions by HHTP Version
 SELECT
   client,
-  http_version,
+  protocol,
   tls_version,
-  COUNT(0) AS freq,
-  SUM(COUNT(0)) OVER (PARTITION BY client) AS total,
-  ROUND(COUNT(0) / SUM(COUNT(0)) OVER (PARTITION BY client), 4) pct
+  COUNT(DISTINCT page) AS freq,
+  total,
+  COUNT(DISTINCT page) / total AS pct
 FROM (
   SELECT
     client,
-    JSON_EXTRACT_SCALAR(payload, '$._protocol') as http_version,
-    JSON_EXTRACT_SCALAR(payload, '$._tls_version') AS tls_version
-  FROM `httparchive.almanac.requests` WHERE date='2020-08-01'
-  )
+    page,
+    IF(JSON_EXTRACT_SCALAR(payload, '$._protocol') IN ('http/0.9', 'http/1.0', 'http/1.1', 'HTTP/2', 'QUIC', 'http/2+quic/46', 'HTTP/3'), JSON_EXTRACT_SCALAR(payload, '$._protocol'), 'other') AS protocol,
+    IFNULL(JSON_EXTRACT_SCALAR(payload, '$._tls_version'), JSON_EXTRACT_SCALAR(payload, '$._securityDetails.protocol')) AS tls_version
+  FROM
+    `httparchive.almanac.requests`
+  WHERE
+    date = '2020-08-01' AND
+    STARTS_WITH(url, 'https') AND
+    firstHtml)
+JOIN (
+  SELECT
+    _TABLE_SUFFIX AS client,
+    COUNT(0) AS total
+  FROM
+    `httparchive.summary_pages.2020_08_01_*`
+  WHERE
+    STARTS_WITH(url, 'https')
+  GROUP BY
+    client)
+USING
+  (client)
 GROUP BY
   client,
-  http_version,
-  tls_version
+  protocol,
+  tls_version,
+  total
 ORDER BY
-  freq / total DESC
+  pct DESC

src/config/2019.json

@@ -470,6 +470,24 @@
       "github": "dougsillars",
       "twitter": "dougsillars"
     },
+    "eduqg": {
+      "name": "Eduardo Q. Gomes",
+      "teams": [
+        "translators"
+      ],
+      "avatar_url": "https://avatars3.githubusercontent.com/u/17773211?v=4&s=200",
+      "website": "https://eduqg.github.io/",
+      "github": "eduqg"
+    },
+    "elaynelemos": {
+      "name": "Elayne Lemos",
+      "teams": [
+        "translators"
+      ],
+      "avatar_url": "https://avatars2.githubusercontent.com/u/24370436?v=4&s=200",
+      "github": "elaynelemos",
+      "linkedin": "elaynelemos"
+    },
     "meyerweb": {
       "name": "Eric A. Meyer",
       "teams": [