Merge branch 'main' into pt_update_concepts_sampling

open-telemetry · Feb 3, 2025 · 15be0ef · 15be0ef
2 parents 29fb91a + 2291fd8
commit 15be0ef
Show file tree

Hide file tree

Showing 27 changed files with 269 additions and 100 deletions.
diff --git a/.github/workflows/check-file.yml b/.github/workflows/check-file.yml
@@ -0,0 +1,28 @@
+name: Files
+
+on:
+  merge_group:
+  pull_request:
+
+jobs:
+  check-expired:
+    name: EXPIRED FILE check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: npm run check:expired
+      - run: npm run _diff:fail
+
+  check-filenames:
+    name: FILENAME check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: npm run check:filenames
+
+  check-formatting:
+    name: FILE FORMAT
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: npm run check:format
diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
diff --git a/.github/workflows/check-spelling.yml b/.github/workflows/check-spelling.yml
@@ -26,16 +26,19 @@ jobs:
           suggestions: true
 
   dict-check:
-    name: CSPELL:IGNORE check
+    name: CSPELL page-local word list check
     runs-on: ubuntu-latest
+    env:
+      FIX_CMD: fix:dict
     steps:
       - uses: actions/checkout@v4
-      - run: npm run fix:dict
+      - run: npm run ${{ env.FIX_CMD }}
       - name: Any changed files?
         run: |
           CHANGES=`git status --porcelain`
           if [[ $CHANGES ]]; then
-            echo "Locally run `npm run fix:dict` and commit the changes:"
+            echo "Add comment '/fix:${{ env.FIX_CMD }}' to your PR in GitHub,"
+            echo "or locally run 'npm run ${{ env.FIX_CMD }}' and commit the changes:"
             echo "$CHANGES"
             exit 1
           else

diff --git a/.htmltest.yml b/.htmltest.yml
@@ -70,8 +70,6 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
   # e.g.: https://www.microsoft.com/en-ca/sql-server.
   - ^https://www.microsoft.com/sql-server$
 
-  # TODO: drop after fix to https://github.com/rust-lang/crates.io/issues/788
-  - ^https://crates\.io/crates
   # TODO move into content/en/blog/2023/humans-of-otel.md once https://github.com/open-telemetry/opentelemetry.io/issues/3889 is implemented
   - ^https://shorturl.at/osHRX$
   # TODO move into content/en/blog/2023/contributing-to-otel/index.md once https://github.com/open-telemetry/opentelemetry.io/issues/3889 is implemented

diff --git a/.textlintrc.yml b/.textlintrc.yml
@@ -113,10 +113,11 @@ rules:
       # https://github.com/sapegin/textlint-rule-terminology/blob/ca36a645c56d21f27cb9d902b5fb9584030c59e3/index.js#L137-L142.
       #
       - ['3rd[- ]party', third-party]
-      - ['auto[- ]c(onfigur)(es?|ations?)', 'autoc$1$2'] # cspell:ignore autoc ations onfigur
+      - ['auto[- ]c(onfigur)(es?|ations?)', 'autoc$1$2'] # cSpell:disable-line
       - ['back[- ]end(s)?', 'backend$1']
       - [bugfix, bug fix]
       - [byte code, bytecode]
+      - ['(cloud)-(native)', '$1 $2']
       - [cpp, C++]
       - # dotnet|.net -> .NET, but NOT for strings like:
         # - File extension: file.net

diff --git a/content/en/announcements/_index.md b/content/en/announcements/_index.md
@@ -2,4 +2,6 @@
 title: Announcements
 cascade:
   type: docs
+  params:
+    hide_feedback: true
 ---
diff --git a/content/en/announcements/devex-survey.md b/content/en/announcements/devex-survey.md
diff --git a/content/en/announcements/kubecon-eu.md b/content/en/announcements/kubecon-eu.md
@@ -0,0 +1,14 @@
+---
+title: KubeCon + CloudNativeCon Europe 2025
+linkTitle: KubeCon EU 2025
+date: 2025-02-03
+expiryDate: 2025-04-04
+---
+
+<i class="fas fa-bullhorn"></i> [**{{% param title %}}**][LF],
+**<span class="text-nowrap">April 1 - 4,</span> London England**.
+<span class="d-none d-md-inline"><br></span> Come collaborate, learn, and
+share<span class="d-none d-sm-inline"> with the Cloud Native community</span>!
+
+[LF]:
+  https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/register/?utm_source=opentelemetry&utm_medium=all&utm_campaign=KubeCon-EU-2025&utm_content=slim-banner
diff --git a/content/en/blog/2019/opentelemetry-governance-committee-explained/index.md b/content/en/blog/2019/opentelemetry-governance-committee-explained/index.md
@@ -17,7 +17,7 @@ community by establishing processes. Let me explain.
 ![Watering can](watering-can.jpeg)
 
 The main objective of the OpenTelemetry project is to make robust, portable
-telemetry a built-in feature of cloud-native software. The most effective way to
+telemetry a built-in feature of cloud native software. The most effective way to
 do it is to build a community of passionate people, from existing ecosystem with
 the diverse expertise and experience. This community will build a project that
 is attractive to users, who will use it to instrument their software, as well as

diff --git a/content/en/blog/2022/demo-announcement/index.md b/content/en/blog/2022/demo-announcement/index.md
@@ -126,7 +126,7 @@ ourselves to just the items listed here.
 - Demonstrations of the ability to add
   [Baggage](https://github.com/open-telemetry/opentelemetry-demo/issues/100) and
   other custom tags
-- Continue to build on other cloud-native technologies like:
+- Continue to build on other cloud native technologies like:
   - Kubernetes
   - gRPC
   - [OpenFeature](https://github.com/open-feature)

diff --git a/content/en/blog/2022/instrument-kafka-clients/index.md b/content/en/blog/2022/instrument-kafka-clients/index.md
@@ -11,7 +11,7 @@ system in a distributed environment. Different services communicate with each
 other by using Apache Kafka as a messaging system but even more as en event or
 data streaming platform.
 
-Taking into account the cloud-native approach for developing microservices,
+Taking into account the cloud native approach for developing microservices,
 quite often [Kubernetes](https://kubernetes.io/) is also used to run the
 workloads. In this scenario, you can also easily deploy and manage an Apache
 Kafka cluster on top of it, by using a project like

diff --git a/content/en/blog/2022/why-and-how-ebay-pivoted-to-opentelemetry/index.md b/content/en/blog/2022/why-and-how-ebay-pivoted-to-opentelemetry/index.md
@@ -22,7 +22,7 @@ experience. The Observability landscape is an ever-changing one and recent
 developments in the OpenTelemetry world forced us to rethink our strategy in
 order to pivot to using it. eBay’s observability platform Sherlock.io provides
 developers and Site Reliability Engineers (SREs) with a robust set of
-cloud-native offerings to observe the various applications that power the eBay
+cloud native offerings to observe the various applications that power the eBay
 ecosystem. Sherlock.io supports the three pillars of observability — metrics,
 logs and traces. The platform’s metric store is a clustered and sharded
 implementation of the Prometheus storage engine. We use the Metricbeat agent to

diff --git a/content/en/blog/2023/end-user-q-and-a-03.md b/content/en/blog/2023/end-user-q-and-a-03.md
@@ -69,7 +69,7 @@ at the chance to work with it.
 ### What is the architecture at Farfetch like? How has OpenTelemetry helped?
 
 Farfetch currently has 2000 engineers, with a complex and varied architecture
-which includes cloud-native, Kubernetes, and virtual machines running on three
+which includes cloud native, Kubernetes, and virtual machines running on three
 different cloud providers. There is a lot of information coming from everywhere,
 with a lack of standardization on how to collect this information. For example,
 Prometheus is used mostly as a standard for collecting metrics; however, in some

diff --git a/content/en/blog/2023/kubecon-eu.md b/content/en/blog/2023/kubecon-eu.md
@@ -42,7 +42,7 @@ Come network with OpenTelemetry maintainers and core contributors during the
 2023 from 16:00 - 17:00. You can attend with a _standard in-person pass_.
 
 [Observability Day][] _fosters collaboration, discussion, and knowledge sharing
-of cloud-native observability projects_. This event will be held on April 18,
+of cloud native observability projects_. This event will be held on April 18,
 2023 from 9:00 - 17:00. There will be several sessions on OpenTelemetry as well.
 
 > <i class="far fa-exclamation-triangle"></i> **IMPORTANT access note**: You

diff --git a/content/en/blog/2023/kubecon-na.md b/content/en/blog/2023/kubecon-na.md
@@ -79,7 +79,7 @@ OpenTelemetry maintainers in making OpenTelemetry better for everyone during the
 ## Co-located Events
 
 [Observability Day][] _fosters collaboration, discussion, and knowledge sharing
-of cloud-native observability projects_. This event will be held on November 6,
+of cloud native observability projects_. This event will be held on November 6,
 2023 from 9am - 5pm. There will be several sessions on OpenTelemetry as well.
 
 > <i class="far fa-exclamation-triangle"></i> **IMPORTANT access note**: You

diff --git a/content/en/blog/2023/otel-in-focus-04.md b/content/en/blog/2023/otel-in-focus-04.md
@@ -81,7 +81,7 @@ There's much more -- be sure to check out the release notes!
 
 ## Project Updates
 
-KubeCon EU saw over ten thousand cloud-native developers gather in Amsterdam,
+KubeCon EU saw over ten thousand cloud native developers gather in Amsterdam,
 and a lot of you stopped by the OpenTelemetry booth to say hi! Hopefully some of
 you got your hands on our limited-edition KubeCon stickers... if not, well,
 there'll be more limited edition stickers. Just not for KubeCon, because it's

diff --git a/content/en/blog/2024/kubecon-eu.md b/content/en/blog/2024/kubecon-eu.md
@@ -10,8 +10,8 @@ cSpell:ignore: Aiven Alexandre Anusha Arbiv Beemer Benedikt Blanco Bongartz Chek
 ---
 
 The OpenTelemetry project maintainers, members of the governance committee, and
-technical committee are thrilled to be at [KubeCon + CloudNativeCon Europe][]
-and at the co-located
+technical committee are thrilled to be at [KubeCon + CloudNativeCon Europe] and
+at the co-located
 [Observability Day](https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/co-located-events/observability-day/)
 in Paris from March 19 - 22, 2024.
 
@@ -46,9 +46,9 @@ it again right before KubeCon!
 
 ## Observability Day
 
-_[Observability Day][] fosters collaboration, discussion, and knowledge sharing
-of cloud-native observability projects_. This event will be held on March 19,
-2024 from 9:00 - 17:35. There will be several sessions on OpenTelemetry as well:
+_[Observability Day] fosters collaboration, discussion, and knowledge sharing of
+cloud native observability projects_. This event will be held on March 19, 2024
+from 9:00 - 17:35. There will be several sessions on OpenTelemetry as well:
 
 - **[Welcome + Project Updates](https://sched.co/1YGT9)**<br> by Eduardo Silva,
   FluentBit & Austin Parker, honeycomb.io<br> Tuesday, March 19th • 09:00 -
@@ -90,7 +90,7 @@ of cloud-native observability projects_. This event will be held on March 19,
 {{% alert title="Important access note" color="danger" %}}
 
 You need an _in-person all-access_ pass for on-site access to **Observability
-Day**. For details, see [KubeCon registration][]. If you have a virtual ticket,
+Day**. For details, see [KubeCon registration]. If you have a virtual ticket,
 you will be able to follow **Observability Day** through a live stream.
 
 [kubecon registration]:
@@ -135,7 +135,7 @@ that SIG. Sessions will be recorded and posted on the
 [OTel YouTube channel](https://youtube.com/@otel-official).
 
 We will create action items from your comments as appropriate. Check
-[#otel-user-research][] in CNCF's Slack instance for results and action item
+[#otel-user-research] in CNCF's Slack instance for results and action item
 updates to come after KubeCon EU.
 
 Back by popular demand! We'll be recording

diff --git a/content/en/blog/2024/kubecon-na.md b/content/en/blog/2024/kubecon-na.md
@@ -8,7 +8,7 @@ cSpell:ignore: Arnell Ashok Chandrasekar Clario Contribfest Ekansh Grabner Haeus
 ---
 
 The OpenTelemetry project maintainers, members of the governance committee, and
-technical committee are thrilled to be at [KubeCon NA][] in Salt Lake City from
+technical committee are thrilled to be at [KubeCon NA] in Salt Lake City from
 November 12 - 15, 2024.
 
 Read on to learn about all the things related OpenTelemetry during KubeCon.
@@ -78,17 +78,16 @@ first steps: documentation, Collector, Java, JS, Ruby, Python, .NET, and more.
 
 ## Observability Day
 
-_[Observability Day][] fosters collaboration, discussion, and knowledge sharing
-of cloud-native observability projects_. This event will be held on November 12,
+_[Observability Day] fosters collaboration, discussion, and knowledge sharing of
+cloud native observability projects_. This event will be held on November 12,
 2024 from 9am to 6pm.
 [Check the full schedule](https://colocatedeventsna2024.sched.com/overview/type/Observability+Day)
 to find your favorite talks about Observability and OpenTelemetry.
 
 > <i class="far fa-exclamation-triangle"></i> **IMPORTANT access note**: You
 > need an _in-person all-access_ pass for on-site access to **Observability
-> Day**. For details, see [KubeCon registration][]. If you have a virtual
-> ticket, you will be able to follow **Observability Day** through a live
-> stream.
+> Day**. For details, see [KubeCon registration]. If you have a virtual ticket,
+> you will be able to follow **Observability Day** through a live stream.
 
 ## OpenTelemetry Observatory
 
@@ -120,7 +119,7 @@ You can help us improve the project by sharing your thoughts and feedback about
 your OpenTelemetry adoption, implementation, and usage.
 
 We will create action items from your comments as appropriate. Check
-[#otel-sig-end-user][] in CNCF's Slack instance for results and action item
+[#otel-sig-end-user] in CNCF's Slack instance for results and action item
 updates to come after KubeCon EU.
 
 Come join us to listen, learn, and get involved in OpenTelemetry.

diff --git a/content/en/blog/2024/new-otel-features-envoy-istio/index.md b/content/en/blog/2024/new-otel-features-envoy-istio/index.md
@@ -8,7 +8,7 @@ sig: OpenTelemetry Specification
 cSpell:ignore: bookinfo Grassi istioctl Joao productpage
 ---
 
-In the dynamic world of cloud-native and distributed applications, managing
+In the dynamic world of cloud native and distributed applications, managing
 microservices effectively is critical. [Kubernetes](https://kubernetes.io/) has
 become the de facto standard for container orchestration, enabling seamless
 deployment, scaling, and management of containerized applications.

diff --git a/content/en/docs/demo/requirements/architecture.md b/content/en/docs/demo/requirements/architecture.md
@@ -7,7 +7,7 @@ cSpell:ignore: dockerstatsreceiver
 
 ## Summary
 
-The OpenTelemetry Community Demo application is intended to be a 'showcase' for
+The OpenTelemetry Community Demo application is intended to be a showcase for
 OpenTelemetry API, SDK, and tools in a production-lite cloud native application.
 The overall goal of this application is not only to provide a canonical 'demo'
 of OpenTelemetry components, but also to act as a framework for further

diff --git a/content/en/docs/faas/_index.md b/content/en/docs/faas/_index.md
@@ -8,9 +8,9 @@ weight: 360
 ---
 
 Functions as a Service (FaaS) is an important serverless compute platform for
-cloud native applications. However, platform quirks usually mean these
-applications have slightly different monitoring guidance and requirements than
-applications running on Kubernetes or Virtual Machines.
+[cloud native apps]. However, platform quirks usually mean these applications
+have slightly different monitoring guidance and requirements than applications
+running on Kubernetes or Virtual Machines.
 
 The initial vendor scope of the FaaS documentation is around Microsoft Azure,
 Google Cloud Platform (GCP), and Amazon Web Services (AWS). AWS functions are
@@ -25,3 +25,5 @@ automatically.
 
 The release status can be tracked in the
 [OpenTelemetry-Lambda repository](https://github.com/open-telemetry/opentelemetry-lambda).
+
+[cloud native apps]: https://glossary.cncf.io/cloud-native-apps/
diff --git a/data/registry/instrumentation-rust-trillium.yml b/data/registry/instrumentation-rust-trillium.yml
@@ -15,6 +15,6 @@ urls:
 createdAt: 2021-04-25
 package:
   registry: crates
-  name: opentelemetry-trillium-opentelemetry
+  name: trillium-opentelemetry
   version: 0.2.16
 isFirstParty: true
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "__check:links": "make --keep-going check-links",
     "_build": "npm run _hugo -- -e dev --buildDrafts --buildFuture --baseURL \"${DEPLOY_PRIME_URL:-http://localhost}\"",
-    "__check:format": "npx prettier${PRETTIER_AT_VERS}",
+    "__check:format": "./scripts/npx-helper.sh prettier",
     "_check:format:any": "npm run __check:format -- --check --ignore-path ''",
     "_check:format:ja+zh": "npm run _check:format:nowrap -- content/ja content/zh",
     "_check:format:nowrap": "npm run _check:format:any -- --prose-wrap preserve",

diff --git a/scripts/double-check-refcache-400s.mjs b/scripts/double-check-refcache-400s.mjs
@@ -4,6 +4,7 @@ import fs from 'fs/promises';
 import { getUrlStatus, isHttp2XX } from './get-url-status.mjs';
 
 const CACHE_FILE = 'static/refcache.json';
+const cratesIoURL = 'https://crates.io/crates/';
 
 async function readRefcache() {
   try {
@@ -28,13 +29,14 @@ async function retry400sAndUpdateCache() {
   for (const [url, details] of Object.entries(cache)) {
     const { StatusCode, LastSeen } = details;
     if (isHttp2XX(StatusCode)) continue;
-    if (StatusCode === 404) {
+    if (StatusCode === 404 && !url.startsWith(cratesIoURL)) {
       console.log(`Skipping 404: ${url} (last seen ${LastSeen}).`);
       continue;
     }
 
-    process.stdout.write(`Checking: ${url} (was ${StatusCode})... `);
-    const status = await getUrlStatus(url, true);
+    process.stdout.write(`Checking: ${url} (was ${StatusCode}) ... `);
+    const verbose = false;
+    const status = await getUrlStatus(url, verbose);
     console.log(`${status}.`);
 
     if (!isHttp2XX(status)) continue;