Merge branch 'develop' into alanwest/apm-otel

Author: alanwest

netlify.toml

@@ -4,6 +4,10 @@ package = "@netlify/plugin-gatsby"
 [functions]
   included_files = ["!.cache/data/datastore/data.mdb","!.cache/query-engine"]
 
+[[edge_functions]]
+  function = "inject-country" # Matches the filename without .js
+  path = "/*" # Apply to all HTML pages served by Netlify
+
 [[headers]]
 for = "/*"
 

netlify/edge-functions/inject-country.js

@@ -0,0 +1,43 @@
+export default async (request, context) => {
+  const response = await context.next();
+
+  const contentType = response.headers.get("content-type");
+
+  // Only modify HTML responses.
+  // If it's not HTML, return the original response unmodified.
+  if (!contentType || !contentType.includes("text/html")) {
+    return response;
+  }
+
+  // Clone the response to be able to read its body.
+  // A response body can only be read once.
+  const clonedResponse = response.clone();
+  let pageText = await clonedResponse.text();
+
+  // Get the country code from the Netlify geolocation context.
+  // Default to "UNKNOWN" if not available.
+  const countryCode = context.geo?.country?.code || "UNKNOWN";
+
+  // Prepare the script to inject. This makes the country code available on the client-side.
+  const scriptToInject = `<script>window.userCountry = "${countryCode}";</script>`;
+
+  // Inject the script right before the closing </head> tag for early availability.
+  // This is generally the best place for such scripts.
+  if (pageText.includes("</head>")) {
+    pageText = pageText.replace("</head>", `${scriptToInject}</head>`);
+  } else if (pageText.includes("</body>")) {
+    // Fallback: if </head> is not found, try injecting before </body>.
+    // This is less ideal for early availability but better than not injecting.
+    pageText = pageText.replace("</body>", `${scriptToInject}</body>`);
+  }
+  // If neither </head> nor </body> is found, the script won't be injected.
+  // This might happen for malformed HTML or non-standard page structures.
+
+  // Return a new response with the modified HTML content.
+  // It's important to preserve the original status, statusText, and headers.
+  return new Response(pageText, {
+    status: response.status,
+    statusText: response.statusText,
+    headers: response.headers,
+  });
+};

package.json

@@ -10,18 +10,18 @@
     "@emotion/styled": "^11.3.0",
     "@mdx-js/mdx": "2.0.0-next.8",
     "@mdx-js/react": "2.0.0-next.8",
-    "@newrelic/gatsby-theme-newrelic": "9.12.1",
+    "@newrelic/gatsby-theme-newrelic": "9.12.2",
     "@splitsoftware/splitio-react": "^1.2.4",
     "ansi-colors": "^4.1.3",
     "cockatiel": "^3.0.0-beta.0",
     "compare-versions": "^6.0.0-rc.2",
     "date-fns": "^2.17.0",
-    "gatsby": "4.25.2",
+    "gatsby": "4.25.7",
     "gatsby-plugin-manifest": "4.25.0",
     "gatsby-plugin-mdx": "3.4.0",
     "gatsby-plugin-netlify": "^5.1.1",
     "gatsby-plugin-react-helmet": "^5.4.0",
-    "gatsby-plugin-sharp": "4.25.0",
+    "gatsby-plugin-sharp": "4.25.1",
     "gatsby-remark-autolink-headers": "^5.4.0",
     "gatsby-remark-copy-linked-files": "^5.4.0",
     "gatsby-remark-images": "^6.4.0",
@@ -101,7 +101,7 @@
     "esmock": "^2.6.4",
     "expect": "^29.7.0",
     "form-data": "^3.0.0",
-    "gatsby-plugin-typegen": "^2.2.4",
+    "gatsby-plugin-typegen": "^3.1.0",
     "hast-util-to-mdast9": "npm:[email protected]",
     "hast-util-to-string": "^1.0.4",
     "hastscript": "^6.0.0",

scripts/releaseNotes.mjs

@@ -73,7 +73,9 @@ const INCLUDE_AGENTS = new Set([
   'sdk',
   'fluentbit',
   'nrdot',
-  'prometheus'
+  'prometheus',
+  'aws_firehose_log_forwarder',
+  'aws_lambda_log_forwarder'
 ]);
 
 const generateReleaseNoteObject = async (filePath) => {