Skip to content

Commit 3896007

Browse files
vitorvascvitorvasc
authored
Merge branch 'main' into pt_update_concepts_instrumentation_libraries
2 parents 1a338f6 + 389e023 commit 3896007

File tree

244 files changed

+4317
-2043
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

244 files changed

+4317
-2043
lines changed

‎.cspell.yml

+3
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,6 @@ dictionaries:
5858
words: # Valid words across all locales
5959
- Docsy
6060
- htmltest
61+
# Hugo
62+
- jsonify
63+
- warnf

‎.cspell/es-palabras.txt

+2
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ Muestreadores
1414
muestreadores
1515
monitoreo
1616
multilenguaje
17+
redireccionar
18+
prerrellenada

‎.github/workflows/auto-update-community-members.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
auto-update-versions:
1111
name: Auto-update community members page
12-
runs-on: ubuntu-24.04
12+
runs-on: ubuntu-latest
1313
# Remove the if statement below when testing against a fork
1414
if: github.repository == 'open-telemetry/opentelemetry.io'
1515
steps:

‎.github/workflows/auto-update-registry.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
auto-update-versions:
1111
name: Auto-update registry versions
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-latest
1313
# Remove the if statement below when testing against a fork
1414
if: github.repository == 'open-telemetry/opentelemetry.io'
1515
steps:

‎.github/workflows/auto-update-versions.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
auto-update-versions:
1111
name: Auto-update versions
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-latest
1313
if: github.repository == 'open-telemetry/opentelemetry.io'
1414
env:
1515
DEPTH: --depth 999 # submodule clone depth

‎.github/workflows/check-text.yml

+1
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ jobs:
4646
cache-dependency-path: tmp/package-ci.json
4747
- run: npm install --ignore-scripts --omit=optional
4848
- run: npm run check:markdown
49+
- run: npm run check:markdown2

‎.github/workflows/pr-actions.yml

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: PR actions
2-
# cSpell:ignore esac htmltest refcache nvmrc
2+
# cSpell:ignore esac htmltest refcache nvmrc opentelemetrybot
33

44
on:
55
issue_comment:
@@ -15,7 +15,6 @@ jobs:
1515
pr-action:
1616
name: Run PR action
1717
runs-on: ubuntu-latest
18-
1918
if: |
2019
github.event.issue.pull_request &&
2120
startsWith(github.event.comment.body, '/fix:')
@@ -27,6 +26,13 @@ jobs:
2726
DEPTH: --depth 999 # submodule clone depth
2827

2928
steps:
29+
- name: Context info
30+
run: |
31+
echo $PR_NUM
32+
echo $COMMENT
33+
34+
- uses: actions/checkout@v4
35+
3036
- name: Extract action name
3137
id: extract_action_name
3238
run: |
@@ -40,13 +46,6 @@ jobs:
4046
fi
4147
echo "PR_ACTION=$PR_ACTION" >> "$GITHUB_ENV"
4248
43-
- name: Context info
44-
run: |
45-
echo $PR_NUM
46-
echo $COMMENT
47-
48-
- uses: actions/checkout@v4
49-
5049
- name: Write start comment
5150
run: |
5251
gh pr comment $PR_NUM -b "You triggered fix:${PR_ACTION} action run at $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"

‎.github/workflows/update-semconv-integration-branch.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ jobs:
8686
8787
sed -i "s/^\tsemconv-pin = .*/\tsemconv-pin = $commit_desc/" .gitmodules
8888
89-
if ! git diff-index --quiet HEAD; then
89+
git add -A
90+
91+
if ! git diff-index --quiet --cached HEAD; then
9092
git commit -am "Update semconv submodule to $commit_desc"
9193
git push
9294
fi

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[submodule "themes/docsy"]
33
path = themes/docsy
44
url = https://github.com/google/docsy.git
5-
docsy-pin = v0.11.0-39-g9e685592
5+
docsy-pin = v0.11.0-44-gcbc714be
66
docsy-note = "2024-04-01 Switching to google/docsy.git from cncf/docsy.git since we don't have any CNCF customizations."
77
docsy-reminder = "Ensure that any tag referenced by `docsy-pin` is present in the remote repo (url), otherwise add (push) the tags to the repo."
88
[submodule "content-modules/opentelemetry-specification"]

‎.htmltest.yml

+24-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ IgnoreAltMissing: true
55
IgnoreCanonicalBrokenLinks: false
66
IgnoreInternalEmptyHash: true # TODO: remove after resolution of https://github.com/google/docsy/issues/1995
77
CheckMailto: false
8+
# StripQueryString: false # TODO: enable once htmltest is fixed
89
TestFilesConcurrently: true
910
IgnoreDirs:
1011
# DO NOT EDIT! IgnoreDirs list is auto-generated from markdown file front matter.
@@ -24,7 +25,7 @@ IgnoreDirs:
2425
IgnoreInternalURLs: # list of paths
2526
IgnoreURLs: # list of regexs of paths or URLs to be ignored
2627
- /index.xml$ # Ignore rel="alternative" links to RSS feeds
27-
- ^/api$
28+
- ^/api/?$
2829
- ^((/..)?/docs/languages/\w+|\.\.)/(api|examples|registry)/$
2930
- ^(/..)?/docs/collector/registry/$
3031
- ^(/..)?/docs/languages/net/(metrics-api|traces-api)/
@@ -54,7 +55,7 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
5455

5556
# Ignore Docsy-generated GitHub links for now, until
5657
# https://github.com/google/docsy/issues/1432 is fixed
57-
- ^https?://github\.com/.*?/.*?/(new|edit|issues/new\?title)/ # view-page, edit-source etc
58+
- ^https?://github\.com/.*?/.*?/(new/|edit/|issues/new\?) # view-page, edit-source etc
5859
# Ignore "View page source" links, except for spec pages, i.e., links starting with
5960
# https://github.com/open-telemetry/opentelemetry.io/tree/main/content/en/docs/specs
6061
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/[^e]
@@ -74,3 +75,24 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
7475
- ^https://shorturl.at/osHRX$
7576
# TODO move into content/en/blog/2023/contributing-to-otel/index.md once https://github.com/open-telemetry/opentelemetry.io/issues/3889 is implemented
7677
- ^https://shorturl.at/vLYZ0$
78+
79+
# Temporary until semconv is updated to 1.30.0+
80+
- ^https://cloud.google.com/apis/design/resource_names#full_resource_name
81+
- ^https://cloud.google.com/functions/docs/concepts/exec#function_scope_versus_global_scope
82+
- ^https://developer.apple.com/documentation/uikit/uiapplicationdelegate#1656902
83+
- ^https://docs.docker.com/registry/spec/manifest-v2-2/#example-image-manifest
84+
- ^https://www.openssl.org/docs/man1.1.1/man3/SSL_get_version.html#RETURN-VALUES
85+
- ^https://www.erlang.org/doc/man/erl_error.html#format_exception-3
86+
# Fixed via https://github.com/open-telemetry/semantic-conventions/pull/1814
87+
- ^https://github.com/open-telemetry/opentelemetry-specification/tree/v1.41.0/specification/logs/api.md#emit-an-event
88+
89+
# Temporary until
90+
# https://pkg.go.dev/go.opentelemetry.io/collector/config/[email protected]+
91+
# is published to include
92+
# https://github.com/open-telemetry/opentelemetry-collector/pull/12309
93+
- ^https://pkg.go.dev/go.opentelemetry.io/collector/config/configauth#client-authenticators
94+
- ^https://pkg.go.dev/go.opentelemetry.io/collector/config/configauth#server-authenticators
95+
96+
# Temporary until
97+
# https://github.com/open-telemetry/opentelemetry.io/issues/6237 is resolved
98+
- ^https://github.com/open-telemetry/opentelemetry-operator/blob/main/docs/api.md#

‎assets/scss/_page_no_left_sidebar.scss

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
// Styles for docs-like pages without left sidebar
2+
3+
.td-no-left-sidebar .td-main {
4+
// Hide left sidebar
5+
.td-sidebar {
6+
display: none !important;
7+
}
8+
9+
// Adjust ToC sidebar, e.g., to fill Bootstrap columns that the left sidebar
10+
// would have taken was using.
11+
.td-sidebar-toc {
12+
@include media-breakpoint-up(md) {
13+
display: block !important;
14+
}
15+
16+
// Always 2 col wide (unless hidden)
17+
@extend .col-md-2;
18+
19+
// Don't scroll with the page (otherwise, for short pages, the ToC hides
20+
// behind the top navbar).
21+
position: fixed;
22+
right: 0;
23+
24+
// Ensure ToC doesn't overlap with the footer
25+
z-index: -1;
26+
}
27+
28+
// The <main> element sibling of the ToC sidebar
29+
> div > main {
30+
// Always 10 col wide (unless the ToC sidebar is hidden)
31+
@extend .col-md-10;
32+
@extend .col-xl-10;
33+
34+
@include media-breakpoint-up(md) {
35+
padding-right: 3rem;
36+
}
37+
38+
@include media-breakpoint-up(lg) {
39+
// Center content on larger screens
40+
41+
.td-content {
42+
max-width: 80%;
43+
margin-left: auto;
44+
margin-right: auto;
45+
46+
// Cancel .td-max-width-on-larger-screens
47+
> * {
48+
max-width: 100%;
49+
}
50+
}
51+
}
52+
}
53+
}

‎assets/scss/_styles_project.scss

+51-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/* Docsy-delta full file override: we're not tracking changes to the Docsy file of the same name. */
2-
// cSpell:ignore cncf docsy
2+
// cSpell:ignore cncf docsy otca
33

44
@import 'registry';
55
@import 'tabs';
66
@import 'external_link';
77
@import 'td/code-dark';
8+
@import '_page_no_left_sidebar';
89

910
.td-home {
1011
.otel-logo {
@@ -335,3 +336,52 @@ details {
335336
padding-left: 0.6rem;
336337
}
337338
}
339+
340+
.ot-training {
341+
@extend .td-no-left-sidebar;
342+
$card-padding: 2rem;
343+
344+
.badge--otca {
345+
margin-top: map-get($spacers, 4) !important;
346+
img {
347+
border-style: none !important;
348+
display: initial;
349+
max-width: 244px;
350+
}
351+
@include media-breakpoint-up(md) {
352+
padding-left: $card-padding;
353+
}
354+
355+
@include media-breakpoint-down(md) {
356+
text-align: center;
357+
}
358+
}
359+
360+
.card--course-wrapper {
361+
@include media-breakpoint-up(md) {
362+
padding-left: $card-padding;
363+
}
364+
}
365+
366+
.card--course {
367+
margin-top: map-get($spacers, 5) !important;
368+
margin-bottom: map-get($spacers, 5) !important;
369+
370+
@include media-breakpoint-down(md) {
371+
margin-left: auto !important;
372+
margin-right: auto !important;
373+
}
374+
375+
img {
376+
padding-bottom: 2.6rem;
377+
}
378+
}
379+
}
380+
381+
// TODO: upstream to Docsy
382+
383+
.hk-no-external-icon {
384+
a.external-link:after {
385+
display: none !important;
386+
}
387+
}

‎content/en/_includes/_index.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: # bogus for markdownlint
3+
cascade:
4+
build: { list: never, render: never }
5+
---

‎content/en/_includes/page-not-translated-msg.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
title: # bogus entry for markdownlint
3+
---
4+
5+
<i class="fa-solid fa-circle-info" style="margin-left: -1.5rem"></i> You are
6+
viewing the **English version** of this page because it has not yet been fully
7+
translated. Interested in helping out? See [Contributing](/docs/contributing/).

‎content/en/announcements/contribex-survey.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
title: Contributor Experience Survey
3+
date: 2025-02-17
4+
expiryDate: 2025-03-17
5+
---
6+
7+
<i class="fas fa-bullhorn"></i> Help us [improve the contributor experience]
8+
(5-10 min). Survey closes March 17.
9+
10+
[improve the contributor experience]: /blog/2025/contribex-survey/

‎content/en/announcements/kubecon-eu.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: KubeCon + CloudNativeCon Europe 2025
33
linkTitle: KubeCon EU 2025
44
date: 2025-02-03
55
expiryDate: 2025-04-04
6+
weight: -1
67
---
78

89
<i class="fas fa-bullhorn"></i> [**{{% param title %}}**][LF],

‎content/en/announcements/training.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
title: Training!
3+
date: 2025-02-14
4+
expiryDate: 2025-04-14
5+
---
6+
7+
<span class="badge text-bg-secondary">New</span> OTel **Certification** and
8+
_FREE_ **course**. [Learn more](/training/)

‎content/en/blog/2019/opentelemetry-governance-committee-explained/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ feedback!
7777
_A version of this article was [originally posted][] on
7878
[medium.com/opentelemetry](https://medium.com/opentelemetry)._
7979

80-
[originally posted]: {{% param canonical_url %}}
80+
[originally posted]: <{{% param canonical_url %}}>

‎content/en/blog/2021/auto-instrumentation-k8s.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ This article introduces OpenTelemetry Operator’s new feature that significantl
99
simplifies instrumenting workloads deployed on Kubernetes. Read all the details
1010
from the [original post][].
1111

12-
[original post]: {{% param canonical_url %}}
12+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/collector.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ canonical_url: https://medium.com/opentelemetry/opentelemetry-collector-achieves
88
The OpenTelemetry Collector has made its first GA release. For all the details,
99
see the [original post][].
1010

11-
[original post]: {{% param canonical_url %}}
11+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/cpp.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ OpenTelemetry C++ released its v1.0 stable version last month, which implements
99
the OpenTelemetry distributed tracing specification! For all the details, see
1010
the [original post][].
1111

12-
[original post]: {{% param canonical_url %}}
12+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/gc-election.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ The OpenTelemetry project is excited to announce the 2021 OpenTelemetry
99
Governance Committee (GC) election. For all the details, see the [original
1010
post][].
1111

12-
[original post]: {{% param canonical_url %}}
12+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/malabi.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ cSpell:ignore: Malabi
1010
This article introduces you to Malabi, a new open source tool for trace-based
1111
testing. For all the details, see the [original post][].
1212

13-
[original post]: {{% param canonical_url %}}
13+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/otel-gc.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ canonical_url: https://medium.com/opentelemetry/welcome-to-the-incoming-2021-ope
88
The OpenTelemetry project just completed its 2021 election for the Governance
99
Committee (GC). For all the details, see the [original post][].
1010

11-
[original post]: {{% param canonical_url %}}
11+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/python.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ canonical_url: https://medium.com/opentelemetry/announcing-opentelemetry-python-
88
Today, OpenTelemetry Python distributed tracing API/SDK released its 1.0
99
version. For all the details, see the [original post][].
1010

11-
[original post]: {{% param canonical_url %}}
11+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/swift.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ canonical_url: https://medium.com/opentelemetry/opentelemetry-swift-1-0-beta-8f7
88
Today, OpenTelemetry Swift distributed tracing API/SDK has released its 1.0
99
version. For all the details, see the [original post][].
1010

11-
[original post]: {{% param canonical_url %}}
11+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2021/womens-day.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ Happy International Women’s Day! The OpenTelemetry project would like to exten
99
our thanks to all our women contributors. For all the details, see the [original
1010
post][].
1111

12-
[original post]: {{% param canonical_url %}}
12+
[original post]: <{{% param canonical_url %}}>

‎content/en/blog/2022/apisix/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -395,4 +395,4 @@ _A version of this article was [originally posted][] on the Apache APISIX blog._
395395

396396
[^1]: {{% param notes.docker-compose-v2 %}}
397397

398-
[originally posted]: {{% param canonical_url %}}
398+
[originally posted]: <{{% param canonical_url %}}>

0 commit comments

Comments
 (0)