Skip to content

Commit 44ec47c

Browse files
committed
Merge remote-tracking branch 'origin/main' into otelbot/spec-integration-v1.51.0-dev
2 parents 57fdf9d + e67e24b commit 44ec47c

22 files changed

+1114
-1187
lines changed

.github/copilot-instructions.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ info here.
105105

106106
```
107107
.
108-
├── README.md # Project overview and contribution guidelines
109-
├── package.json # Node.js dependencies and npm scripts
110-
├── hugo.yaml # Hugo configuration with mounts and language settings
108+
├── README.md # Project overview and contribution guidelines
109+
├── package.json # Node.js dependencies and npm scripts
110+
├── config/**/*.yaml # Hugo configuration with mounts and language settings
111111
├── content/ # Main content (English and translations)
112112
├── content-modules/ # Git submodules for specifications and community docs
113113
├── layouts/ # Hugo templates and partial templates
@@ -168,13 +168,14 @@ npm run fix:markdown # Auto-fix markdown issues
168168
- Uses Hugo v0.148.2 with extended features
169169
- Theme: Docsy (Google's documentation theme)
170170
- Multilingual support enabled for 8+ languages
171-
- Content mounting from submodules defined in `hugo.yaml`
171+
- Content mounting from submodules defined in
172+
`config/_default/module-template.yaml`
172173
- Generated files placed in `public/` directory
173174

174175
### Frequently Accessed Files
175176

176177
- `package.json` - Dependencies and scripts
177-
- `hugo.yaml` - Site configuration and content mounts
178+
- `config/_default/*.yaml` - Site configuration and content mounts
178179
- `content/en/docs/contributing/development.md` - Development setup guide
179180
- `.warnings-skip-list.txt` - Known acceptable build warnings
180181
- `.cspell.yml` - Spell checking configuration

.github/localization.instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ default_lang_commit: <commit-hash-of-english-page>
153153

154154
1. Create issue with localization request
155155
2. Translate homepage only: `content/LANG_ID/_index.md`
156-
3. Maintainers will update `hugo.yaml`, cSpell configuration, and create
156+
3. Maintainers will update Hugo config, cSpell configuration, and create
157157
language-specific tools
158158

159159
### Language-Specific Tooling

.htmltest.yml

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

config/_default/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.yaml

config/_default/hugo.yaml

Lines changed: 265 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,265 @@
1+
# cSpell:ignore bluesky cicd docsy goldmark linkify netlify wordmark noopener
2+
baseURL: https://opentelemetry.io
3+
title: OpenTelemetry
4+
disableKinds: [taxonomy]
5+
theme: [docsy]
6+
disableAliases: true # We do redirects via Netlify's _redirects file
7+
enableGitInfo: true
8+
ignoreLogs: [spec-resource-not-found]
9+
10+
# Language settings
11+
defaultContentLanguage: en
12+
#
13+
# TODO: Disabling the following for the duration of the Ask AI trial. If we
14+
# decide to keep Ask AI, then locales should provide Ask-AI i18n key entries
15+
# and the following should be re-enabled / uncommented.
16+
#
17+
# enableMissingTranslationPlaceholders: true
18+
19+
languages:
20+
en:
21+
languageName: English
22+
languageCode: en-US
23+
params:
24+
description: The OpenTelemetry Project Site
25+
bn:
26+
languageName: বাংলা (Bengali)
27+
params:
28+
description: ওপেনটেলিমেট্রি প্রকল্পের সাইট
29+
es:
30+
languageName: Español
31+
params:
32+
description: Sitio del proyecto OpenTelemetry
33+
fr:
34+
languageName: Français
35+
params:
36+
description: Site du projet OpenTelemetry
37+
ja:
38+
languageName: 日本語 (Japanese)
39+
params:
40+
description: OpenTelemetryプロジェクト公式サイト
41+
notes:
42+
docker-compose-v2: |
43+
`docker-compose` は非推奨です. 詳細は、
44+
[Migrate to Compose V2](https://docs.docker.com/compose/migrate/) を確認してください。
45+
pt: # cSpell:ignore Português Projeto
46+
languageName: Português
47+
languageCode: pt-BR
48+
params:
49+
description: Site do Projeto OpenTelemetry
50+
ro:
51+
languageName: Română (Romanian)
52+
languageCode: ro-RO
53+
params:
54+
description: Site-ul proiectului OpenTelemetry
55+
uk:
56+
languageName: Українська (Ukrainian)
57+
languageCode: uk-UA
58+
params:
59+
description: Сайт проєкту OpenTelemetry
60+
zh:
61+
languageName: 中文 (Chinese)
62+
languageCode: zh-CN
63+
params:
64+
description: OpenTelemetry 项目网站
65+
66+
imaging:
67+
resampleFilter: CatmullRom # cspell:disable-line
68+
quality: 75
69+
anchor: smart
70+
71+
markup:
72+
tableOfContents:
73+
endLevel: 5
74+
goldmark:
75+
extensions:
76+
linkify: false
77+
parser:
78+
attribute:
79+
block: true
80+
wrapStandAloneImageWithinParagraph: false
81+
renderer:
82+
unsafe: true
83+
highlight:
84+
noClasses: false
85+
86+
# Netlify _redirects file
87+
mediaTypes:
88+
text/netlify: {}
89+
90+
outputFormats:
91+
REDIRECTS:
92+
mediaType: text/netlify
93+
baseName: _redirects
94+
notAlternative: true
95+
96+
outputs:
97+
home: [HTML, RSS]
98+
section: [HTML]
99+
100+
services:
101+
rss: { limit: 20 }
102+
103+
cascade:
104+
build: { list: never, publishResources: false, render: never }
105+
_target: { path: '{,/**}/_includes{,/**}' }
106+
107+
params:
108+
copyright:
109+
authors: >-
110+
OpenTelemetry Authors | Docs [CC BY
111+
4.0](https://creativecommons.org/licenses/by/4.0)
112+
from_year: 2019
113+
tagline: Effective observability requires high-quality telemetry
114+
sub_tagline: >-
115+
**OpenTelemetry** makes robust, portable telemetry a built-in feature of
116+
cloud-native software.
117+
sub_description: >-
118+
**OpenTelemetry** provides a single set of APIs, libraries, agents, and
119+
collector services to capture distributed traces and metrics from your
120+
application. You can analyze them using Prometheus, Jaeger, and other
121+
observability tools.
122+
github_repo: https://github.com/open-telemetry/opentelemetry.io
123+
github_branch: main
124+
gcs_engine_id: 015faf7de29c34606
125+
126+
## Social media image path, such as Open Graph's og:image
127+
#
128+
# IMPORTANT: if you change the image but not the path, also increment the
129+
# version ID in the filename below. Otherwise, for new paths, start at version
130+
# `001`. Note that social-media images must be preserved (or redirected)
131+
# forever.
132+
images:
133+
- img/social/logo-wordmark-001.png
134+
135+
ui:
136+
navbar_logo: true
137+
navbar_translucent_over_cover_disable: true
138+
showLightDarkModeMenu: true
139+
sidebar_menu_compact: true
140+
sidebar_menu_foldable: true
141+
sidebar_search_disable: true
142+
sidebar_cache_limit: 1
143+
sidebar_root_enabled: true
144+
feedback:
145+
enable: true
146+
'yes': >-
147+
Thank you. Your feedback is appreciated!
148+
# prettier-ignore
149+
'no': >-
150+
Please let us know <a class="external-link" target="_blank" rel="noopener"
151+
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
152+
we can improve this page</a>. Your feedback is appreciated!
153+
links:
154+
user:
155+
- name: Mailing Lists
156+
url: https://github.com/open-telemetry/community#mailing-lists
157+
icon: fa fa-envelope
158+
desc: List of mailing lists that the project uses.
159+
- name: Bluesky
160+
url: https://bsky.app/profile/opentelemetry.io
161+
icon: fab fa-bluesky
162+
desc: Follow us on Bluesky to get the latest news!
163+
- name: Mastodon
164+
url: https://fosstodon.org/@opentelemetry
165+
icon: fab fa-mastodon
166+
desc: Follow us on Mastodon to get the latest news!
167+
- name: Stack Overflow
168+
url: https://stackoverflow.com/questions/tagged/open-telemetry
169+
icon: fab fa-stack-overflow
170+
desc: Practical questions and curated answers
171+
- name: OTel logos
172+
url: https://github.com/cncf/artwork/tree/master/projects/opentelemetry
173+
icon: fas fa-image
174+
desc: Official OpenTelemetry logos
175+
- name: Meeting Recordings
176+
url: https://docs.google.com/spreadsheets/d/1SYKfjYhZdm2Wh2Cl6KVQalKg_m4NhTPZqq-8SzEVO6s
177+
icon: fas fa-video
178+
desc: Watch our meeting recordings on Zoom Cloud
179+
- name: Site analytics
180+
url: https://lookerstudio.google.com/s/tSTKxK1ECeU
181+
icon: fa-solid fa-chart-line
182+
desc: Google analytics for opentelemetry.io
183+
developer:
184+
- name: GitHub
185+
url: https://github.com/open-telemetry
186+
icon: fab fa-github
187+
desc: Find us on GitHub.
188+
- name: 'Slack #opentelemetry'
189+
url: https://cloud-native.slack.com/archives/CJFCJHG4Q
190+
icon: fab fa-slack
191+
desc: >-
192+
Chat with other project developers. Sign up via
193+
[slack.cncf.io](https://slack.cncf.io). Also see other channels
194+
starting with a `#otel-` prefix.
195+
- name: CNCF DevStats
196+
url: https://opentelemetry.devstats.cncf.io/d/8/dashboards?orgId=1&refresh=15m
197+
icon: fas fa-chart-area
198+
desc: See our activity on CNCF DevStats
199+
- name: Privacy Policy
200+
url: https://www.linuxfoundation.org/legal/privacy-policy
201+
icon: fa fa-book
202+
desc: CNCF and Linux Foundation privacy policy.
203+
- name: Trademark Usage
204+
url: https://www.linuxfoundation.org/legal/trademark-usage
205+
icon: fa-solid fa-trademark
206+
desc: Linux Foundation’s trademarks policy and guidelines.
207+
- name: Marketing Guidelines
208+
url: /community/marketing-guidelines/
209+
icon: fas fa-bullhorn
210+
desc: >-
211+
Important information on how to represent your personal or corporate
212+
contributions or participation in the OpenTelemetry project.
213+
- name: Site-build info
214+
url: /site/
215+
icon: fa-solid fa-hammer
216+
desc: Site-build information.
217+
218+
logos:
219+
hero: opentelemetry-horizontal-color.png
220+
cncf: cncf.png
221+
222+
social:
223+
- name: GitHub
224+
url: https://github.com/open-telemetry/
225+
color: black
226+
icon: fab fa-github
227+
- name: X
228+
url: https://x.com/opentelemetry
229+
color: twitter
230+
icon: fab fa-x-twitter
231+
- name: Slack
232+
url: https://cloud-native.slack.com/archives/CJFCJHG4Q
233+
color: slack
234+
icon: fab fa-slack
235+
- name: Medium
236+
url: https://medium.com/opentelemetry
237+
color: light
238+
icon: fab fa-medium
239+
- name: Mailing list
240+
url: https://lists.cncf.io/g/cncf-opentelemetry-community
241+
color: info
242+
icon: far fa-envelope
243+
244+
fonts:
245+
- name: Noto Sans # cspell:disable-line
246+
sizes: [300, 400, 600, 700]
247+
type: sans_serif
248+
249+
notes:
250+
# Syntax is markdown. This params section is the default for `en` and
251+
# fallback for other languages. Add locale specific entries under the
252+
# top-level `languages.XX.params` entry for your locale XX.
253+
docker-compose-v2: |
254+
`docker-compose` is deprecated. For details, see
255+
[Migrate to Compose V2](https://docs.docker.com/compose/migrate/).
256+
257+
security:
258+
funcs: # cspell:disable-line
259+
getenv: # cspell:disable-line
260+
# Netlify build env var
261+
- ^(BRANCH|BUILD_ID|COMMIT_REF|CONTEXT|DEPLOY_ID|NETLIFY|PULL_REQUEST|REVIEW_ID)$
262+
#
263+
# mounts: are defined in module-template.yaml. See that file for processing
264+
# details. For information about Hugo config directories and files, see:
265+
# https://gohugo.io/configuration/introduction/#configuration-directory.

0 commit comments

Comments
 (0)