Merge remote-tracking branch 'origin/main' into otelbot/semconv-integration-v1.39.0-dev

Author: otelbot[bot]

.cspell/en-words.txt

@@ -73,6 +73,7 @@ lifecycles
 lightstep
 Loffay
 Mancuso
+Marylia
 microservices
 mongodb
 ndjson

.github/copilot-instructions.md

@@ -105,9 +105,9 @@ info here.
 
 ```
 .
-├── README.md              # Project overview and contribution guidelines
-├── package.json           # Node.js dependencies and npm scripts
-├── hugo.yaml             # Hugo configuration with mounts and language settings
+├── README.md             # Project overview and contribution guidelines
+├── package.json          # Node.js dependencies and npm scripts
+├── config/**/*.yaml      # Hugo configuration with mounts and language settings
 ├── content/              # Main content (English and translations)
 ├── content-modules/      # Git submodules for specifications and community docs
 ├── layouts/              # Hugo templates and partial templates
@@ -168,13 +168,14 @@ npm run fix:markdown     # Auto-fix markdown issues
 - Uses Hugo v0.148.2 with extended features
 - Theme: Docsy (Google's documentation theme)
 - Multilingual support enabled for 8+ languages
-- Content mounting from submodules defined in `hugo.yaml`
+- Content mounting from submodules defined in
+  `config/_default/module-template.yaml`
 - Generated files placed in `public/` directory
 
 ### Frequently Accessed Files
 
 - `package.json` - Dependencies and scripts
-- `hugo.yaml` - Site configuration and content mounts
+- `config/_default/*.yaml` - Site configuration and content mounts
 - `content/en/docs/contributing/development.md` - Development setup guide
 - `.warnings-skip-list.txt` - Known acceptable build warnings
 - `.cspell.yml` - Spell checking configuration

.github/localization.instructions.md

@@ -153,7 +153,7 @@ default_lang_commit: <commit-hash-of-english-page>
 
 1. Create issue with localization request
 2. Translate homepage only: `content/LANG_ID/_index.md`
-3. Maintainers will update `hugo.yaml`, cSpell configuration, and create
+3. Maintainers will update Hugo config, cSpell configuration, and create
    language-specific tools
 
 ### Language-Specific Tooling

.htmltest.yml

@@ -17,9 +17,6 @@ IgnoreDirs:
   - ^(../)?blog/(\d+/)?page/\d+
   # Ignore old blog posts
   - ^(../)?blog/20(19|21|22|23)/
-  # TODO drop next lines after https://github.com/open-telemetry/opentelemetry.io/issues/5555 is fixed for these pages:
-  - ^zh/docs/concepts/signals/baggage/
-  - ^zh/docs/zero-code/php/
   # TODO drop the following config once this page is updated to reflect the corresponding `en`
   # page and the link 404 (detailed below) are resolved:
   #   zh/docs/contributing/index.html

config/_default/.gitignore

@@ -0,0 +1 @@
+module.yaml

config/_default/hugo.yaml

@@ -0,0 +1,265 @@
+# cSpell:ignore bluesky cicd docsy goldmark linkify netlify wordmark noopener
+baseURL: https://opentelemetry.io
+title: OpenTelemetry
+disableKinds: [taxonomy]
+theme: [docsy]
+disableAliases: true # We do redirects via Netlify's _redirects file
+enableGitInfo: true
+ignoreLogs: [spec-resource-not-found]
+
+# Language settings
+defaultContentLanguage: en
+#
+# TODO: Disabling the following for the duration of the Ask AI trial. If we
+# decide to keep Ask AI, then locales should provide Ask-AI i18n key entries
+# and the following should be re-enabled / uncommented.
+#
+# enableMissingTranslationPlaceholders: true
+
+languages:
+  en:
+    languageName: English
+    languageCode: en-US
+    params:
+      description: The OpenTelemetry Project Site
+  bn:
+    languageName: বাংলা (Bengali)
+    params:
+      description: ওপেনটেলিমেট্রি প্রকল্পের সাইট
+  es:
+    languageName: Español
+    params:
+      description: Sitio del proyecto OpenTelemetry
+  fr:
+    languageName: Français
+    params:
+      description: Site du projet OpenTelemetry
+  ja:
+    languageName: 日本語 (Japanese)
+    params:
+      description: OpenTelemetryプロジェクト公式サイト
+      notes:
+        docker-compose-v2: |
+          `docker-compose` は非推奨です. 詳細は、
+          [Migrate to Compose V2](https://docs.docker.com/compose/migrate/) を確認してください。
+  pt: # cSpell:ignore Português Projeto
+    languageName: Português
+    languageCode: pt-BR
+    params:
+      description: Site do Projeto OpenTelemetry
+  ro:
+    languageName: Română (Romanian)
+    languageCode: ro-RO
+    params:
+      description: Site-ul proiectului OpenTelemetry
+  uk:
+    languageName: Українська (Ukrainian)
+    languageCode: uk-UA
+    params:
+      description: Сайт проєкту OpenTelemetry
+  zh:
+    languageName: 中文 (Chinese)
+    languageCode: zh-CN
+    params:
+      description: OpenTelemetry 项目网站
+
+imaging:
+  resampleFilter: CatmullRom # cspell:disable-line
+  quality: 75
+  anchor: smart
+
+markup:
+  tableOfContents:
+    endLevel: 5
+  goldmark:
+    extensions:
+      linkify: false
+    parser:
+      attribute:
+        block: true
+      wrapStandAloneImageWithinParagraph: false
+    renderer:
+      unsafe: true
+  highlight:
+    noClasses: false
+
+# Netlify _redirects file
+mediaTypes:
+  text/netlify: {}
+
+outputFormats:
+  REDIRECTS:
+    mediaType: text/netlify
+    baseName: _redirects
+    notAlternative: true
+
+outputs:
+  home: [HTML, RSS]
+  section: [HTML]
+
+services:
+  rss: { limit: 20 }
+
+cascade:
+  build: { list: never, publishResources: false, render: never }
+  _target: { path: '{,/**}/_includes{,/**}' }
+
+params:
+  copyright:
+    authors: >-
+      OpenTelemetry Authors | Docs [CC BY
+      4.0](https://creativecommons.org/licenses/by/4.0)
+    from_year: 2019
+  tagline: Effective observability requires high-quality telemetry
+  sub_tagline: >-
+    **OpenTelemetry** makes robust, portable telemetry a built-in feature of
+    cloud-native software.
+  sub_description: >-
+    **OpenTelemetry** provides a single set of APIs, libraries, agents, and
+    collector services to capture distributed traces and metrics from your
+    application. You can analyze them using Prometheus, Jaeger, and other
+    observability tools.
+  github_repo: https://github.com/open-telemetry/opentelemetry.io
+  github_branch: main
+  gcs_engine_id: 015faf7de29c34606
+
+  ## Social media image path, such as Open Graph's og:image
+  #
+  # IMPORTANT: if you change the image but not the path, also increment the
+  # version ID in the filename below. Otherwise, for new paths, start at version
+  # `001`. Note that social-media images must be preserved (or redirected)
+  # forever.
+  images:
+    - img/social/logo-wordmark-001.png
+
+  ui:
+    navbar_logo: true
+    navbar_translucent_over_cover_disable: true
+    showLightDarkModeMenu: true
+    sidebar_menu_compact: true
+    sidebar_menu_foldable: true
+    sidebar_search_disable: true
+    sidebar_cache_limit: 1
+    sidebar_root_enabled: true
+    feedback:
+      enable: true
+      'yes': >-
+        Thank you. Your feedback is appreciated!
+      # prettier-ignore
+      'no': >-
+        Please let us know <a class="external-link" target="_blank" rel="noopener"
+        href="https://github.com/open-telemetry/opentelemetry.io/issues/new?template=PAGE_FEEDBACK.yml&title=[Page+feedback]%3A+ADD+A+SUMMARY+OF+YOUR+FEEDBACK+HERE">how
+        we can improve this page</a>. Your feedback is appreciated!
+  links:
+    user:
+      - name: Mailing Lists
+        url: https://github.com/open-telemetry/community#mailing-lists
+        icon: fa fa-envelope
+        desc: List of mailing lists that the project uses.
+      - name: Bluesky
+        url: https://bsky.app/profile/opentelemetry.io
+        icon: fab fa-bluesky
+        desc: Follow us on Bluesky to get the latest news!
+      - name: Mastodon
+        url: https://fosstodon.org/@opentelemetry
+        icon: fab fa-mastodon
+        desc: Follow us on Mastodon to get the latest news!
+      - name: Stack Overflow
+        url: https://stackoverflow.com/questions/tagged/open-telemetry
+        icon: fab fa-stack-overflow
+        desc: Practical questions and curated answers
+      - name: OTel logos
+        url: https://github.com/cncf/artwork/tree/master/projects/opentelemetry
+        icon: fas fa-image
+        desc: Official OpenTelemetry logos
+      - name: Meeting Recordings
+        url: https://docs.google.com/spreadsheets/d/1SYKfjYhZdm2Wh2Cl6KVQalKg_m4NhTPZqq-8SzEVO6s
+        icon: fas fa-video
+        desc: Watch our meeting recordings on Zoom Cloud
+      - name: Site analytics
+        url: https://lookerstudio.google.com/s/tSTKxK1ECeU
+        icon: fa-solid fa-chart-line
+        desc: Google analytics for opentelemetry.io
+    developer:
+      - name: GitHub
+        url: https://github.com/open-telemetry
+        icon: fab fa-github
+        desc: Find us on GitHub.
+      - name: 'Slack #opentelemetry'
+        url: https://cloud-native.slack.com/archives/CJFCJHG4Q
+        icon: fab fa-slack
+        desc: >-
+          Chat with other project developers. Sign up via
+          [slack.cncf.io](https://slack.cncf.io). Also see other channels
+          starting with a `#otel-` prefix.
+      - name: CNCF DevStats
+        url: https://opentelemetry.devstats.cncf.io/d/8/dashboards?orgId=1&refresh=15m
+        icon: fas fa-chart-area
+        desc: See our activity on CNCF DevStats
+      - name: Privacy Policy
+        url: https://www.linuxfoundation.org/legal/privacy-policy
+        icon: fa fa-book
+        desc: CNCF and Linux Foundation privacy policy.
+      - name: Trademark Usage
+        url: https://www.linuxfoundation.org/legal/trademark-usage
+        icon: fa-solid fa-trademark
+        desc: Linux Foundation’s trademarks policy and guidelines.
+      - name: Marketing Guidelines
+        url: /community/marketing-guidelines/
+        icon: fas fa-bullhorn
+        desc: >-
+          Important information on how to represent your personal or corporate
+          contributions or participation in the OpenTelemetry project.
+      - name: Site-build info
+        url: /site/
+        icon: fa-solid fa-hammer
+        desc: Site-build information.
+
+  logos:
+    hero: opentelemetry-horizontal-color.png
+    cncf: cncf.png
+
+  social:
+    - name: GitHub
+      url: https://github.com/open-telemetry/
+      color: black
+      icon: fab fa-github
+    - name: X
+      url: https://x.com/opentelemetry
+      color: twitter
+      icon: fab fa-x-twitter
+    - name: Slack
+      url: https://cloud-native.slack.com/archives/CJFCJHG4Q
+      color: slack
+      icon: fab fa-slack
+    - name: Medium
+      url: https://medium.com/opentelemetry
+      color: light
+      icon: fab fa-medium
+    - name: Mailing list
+      url: https://lists.cncf.io/g/cncf-opentelemetry-community
+      color: info
+      icon: far fa-envelope
+
+  fonts:
+    - name: Noto Sans # cspell:disable-line
+      sizes: [300, 400, 600, 700]
+      type: sans_serif
+
+  notes:
+    # Syntax is markdown. This params section is the default for `en` and
+    # fallback for other languages. Add locale specific entries under the
+    # top-level `languages.XX.params` entry for your locale XX.
+    docker-compose-v2: |
+      `docker-compose` is deprecated. For details, see
+      [Migrate to Compose V2](https://docs.docker.com/compose/migrate/).
+
+security:
+  funcs: # cspell:disable-line
+    getenv: # cspell:disable-line
+      # Netlify build env var
+      - ^(BRANCH|BUILD_ID|COMMIT_REF|CONTEXT|DEPLOY_ID|NETLIFY|PULL_REQUEST|REVIEW_ID)$
+#
+# mounts: are defined in module-template.yaml. See that file for processing
+# details. For information about Hugo config directories and files, see:
+# https://gohugo.io/configuration/introduction/#configuration-directory.