Skip to content

Commit 6f756c5

Browse files
vitorvascvitorvasc
authored
Merge branch 'main' into pt_update_concepts_instrumentation_libraries
2 parents bee6f79 + 57676e2 commit 6f756c5

File tree

124 files changed

+2731
-3722
lines changed

Some content is hidden

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

124 files changed

+2731
-3722
lines changed

‎.cspell.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ import:
1010
caseSensitive: true
1111
ignorePaths:
1212
- '*.svg'
13-
- data/community/members.yaml
14-
- vendors.yaml
1513
- content/ja
1614
- content/zh
15+
- data/community/members.yaml
16+
- static/refcache.json
17+
- vendors.yaml
1718
patterns:
1819
- name: CodeBlock
1920
pattern: |

‎.github/workflows/check-file.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Files
2+
3+
on:
4+
merge_group:
5+
pull_request:
6+
7+
jobs:
8+
check-expired:
9+
name: EXPIRED FILE check
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
- run: npm run check:expired
14+
- run: npm run _diff:fail
15+
16+
check-filenames:
17+
name: FILENAME check
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v4
21+
- run: npm run check:filenames
22+
23+
check-formatting:
24+
name: FILE FORMAT
25+
runs-on: ubuntu-latest
26+
steps:
27+
- uses: actions/checkout@v4
28+
- run: npm run check:format

‎.github/workflows/check-format.yml

-39
This file was deleted.

‎.github/workflows/check-links.yml

+34-32
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
env:
99
CHANGED_FILES:
10-
PR_NUM: ${{ github.event.issue.number }}
10+
PR_NUM: ${{ github.event.pull_request.number }}
1111
USER_EMAIL: [email protected]
1212
USER_NAME: opentelemetrybot
1313

@@ -55,36 +55,6 @@ jobs:
5555
echo "CHANGED_FILES=$CHANGED_FILES" >> "$GITHUB_ENV"
5656
continue-on-error: true
5757
58-
- name: Push changes if any, and fail check
59-
if: ${{ env.CHANGED_FILES }}
60-
run: |
61-
echo "Changes detected in the refcache etc:"
62-
git status --short
63-
64-
gh pr checkout $PR_NUM -b "pr-check-links-${RANDOM}"
65-
git branch -v
66-
67-
git config --local user.email "$USER_EMAIL"
68-
git config --local user.name "$USER_NAME"
69-
git add -A
70-
git commit -m "Updates from build-and-check-links workflow"
71-
72-
echo "\nPushing changes to PR."
73-
current_branch=$(git rev-parse --abbrev-ref HEAD)
74-
echo current_branch=$current_branch
75-
# gh pr checkout sets some git configs that we can use to make sure
76-
# we push to the right repo & to the right branch
77-
remote_repo=$(git config --get branch.${current_branch}.remote)
78-
echo remote_repo=$remote_repo
79-
remote_branch=$(git config --get branch.${current_branch}.merge)
80-
echo remote_branch=$remote_branch
81-
git push ${remote_repo} HEAD:${remote_branch}
82-
83-
echo "Failing workflow so that changes can be reviewed, and checks rerun."
84-
exit 1
85-
env:
86-
GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
87-
8858
- uses: actions/upload-artifact@v4
8959
with:
9060
name: build-log-etc
@@ -93,6 +63,36 @@ jobs:
9363
tmp/package*.json
9464
static/refcache.json
9565
66+
- name: Push changes if any, and fail check
67+
if: ${{ env.CHANGED_FILES }}
68+
run: |
69+
echo "Changes detected in the refcache etc:"
70+
git status --short
71+
72+
echo 'cmd: gh pr checkout $PR_NUM -b "pr-check-links-${RANDOM}"'
73+
# git branch -v
74+
75+
# git config --local user.email "$USER_EMAIL"
76+
# git config --local user.name "$USER_NAME"
77+
# git add -A
78+
# git commit -m "Updates from build-and-check-links workflow"
79+
80+
# echo "\nPushing changes to PR."
81+
# current_branch=$(git rev-parse --abbrev-ref HEAD)
82+
# echo current_branch=$current_branch
83+
# # gh pr checkout sets some git configs that we can use to make sure
84+
# # we push to the right repo & to the right branch
85+
# remote_repo=$(git config --get branch.${current_branch}.remote)
86+
# echo remote_repo=$remote_repo
87+
# remote_branch=$(git config --get branch.${current_branch}.merge)
88+
# echo remote_branch=$remote_branch
89+
# git push ${remote_repo} HEAD:${remote_branch}
90+
91+
# echo "Failing workflow so that changes can be reviewed, and checks rerun."
92+
# exit 1
93+
# env:
94+
# GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
95+
9696
check-refcache:
9797
name: REFCACHE updates?
9898
needs: build-and-check-links
@@ -104,7 +104,9 @@ jobs:
104104
- name: Fail when refcache contains entries with HTTP status 4XX
105105
run: |
106106
if grep -B 1 -e '"StatusCode": 4' static/refcache.json; then
107-
echo "Run 'npx gulp prune' to remove 4xx entries from the refcache"
107+
echo "Run 'npm run _refcache:prune' to remove 404 entries from refcache.json,"
108+
echo "or run './scripts/double-check-refcache-400s.mjs' locally to address"
109+
echo "other 400-status entries."
108110
exit 1
109111
fi
110112
- name: Does the refcache need updating?

‎.github/workflows/check-spelling.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,19 @@ jobs:
2626
suggestions: true
2727

2828
dict-check:
29-
name: CSPELL:IGNORE check
29+
name: CSPELL page-local word list check
3030
runs-on: ubuntu-latest
31+
env:
32+
FIX_CMD: fix:dict
3133
steps:
3234
- uses: actions/checkout@v4
33-
- run: npm run fix:dict
35+
- run: npm run ${{ env.FIX_CMD }}
3436
- name: Any changed files?
3537
run: |
3638
CHANGES=`git status --porcelain`
3739
if [[ $CHANGES ]]; then
38-
echo "Locally run `npm run fix:dict` and commit the changes:"
40+
echo "Add comment '/fix:${{ env.FIX_CMD }}' to your PR in GitHub,"
41+
echo "or locally run 'npm run ${{ env.FIX_CMD }}' and commit the changes:"
3942
echo "$CHANGES"
4043
exit 1
4144
else

‎.github/workflows/survey-on-merged-pr.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
env:
88
PR_NUM: ${{ github.event.pull_request.number }}
9-
SURVEY_URL: https://forms.gle/WV58koUBGSG9HBY66
9+
SURVEY_URL: https://docs.google.com/forms/d/e/1FAIpQLSf2FfCsW-DimeWzdQgfl0KDzT2UEAqu69_f7F2BVPSxVae1cQ/viewform?entry.1540511742=open-telemetry/opentelemetry.io
1010

1111
jobs:
1212
comment-on-pr:
@@ -35,6 +35,6 @@ jobs:
3535
- name: Add comment to PR if author is not a member
3636
if: env.MEMBER_FOUND == 'false'
3737
run: |
38-
gh pr comment ${PR_NUM} --repo open-telemetry/opentelemetry.io --body "Thank you for your contribution! 🎉 We would like to hear from you about your experience contributing to OpenTelemetry by taking a few minutes to fill out this survey: ${SURVEY_URL}"
38+
gh pr comment ${PR_NUM} --repo open-telemetry/opentelemetry.io --body "Thank you for your contribution! 🎉 We would like to hear from you about your experience contributing to OpenTelemetry by taking a few minutes to fill out this [survey](${SURVEY_URL})"
3939
env:
4040
GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}

‎.htmltest.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,21 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
5555
# Ignore Docsy-generated GitHub links for now, until
5656
# https://github.com/google/docsy/issues/1432 is fixed
5757
- ^https?://github\.com/.*?/.*?/(new|edit|issues/new\?title)/ # view-page, edit-source etc
58-
# Here's an approximate regex to avoid the "View page source" links. TODO: fix this in Docsy
59-
- ^https?://github\.com/open-telemetry/opentelemetry.io/tree/
60-
# FIXME: A patch until we can get Docsy to mark "View page source" links as excluded from link checking,
61-
# Actually, it would be better to pin the version of the OTel spec.
62-
- ^https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/logs/event-(api|sdk)\.md
58+
# Ignore "View page source" links, except for spec pages, i.e., links starting with
59+
# https://github.com/open-telemetry/opentelemetry.io/tree/main/content/en/docs/specs
60+
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/[^e]
61+
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/es
62+
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/en/.*?/_index.md$
63+
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/en/[^d]
64+
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/en/docs/[^s]
65+
- ^https://github\.com/open-telemetry/opentelemetry.io/tree/main/content/en/docs/security
6366
# FIXME: same issue as for the OTel spec mentioned above:
6467
- ^https://github.com/open-telemetry/semantic-conventions/tree/main
6568

6669
# Too many redirects as the server tries to figure out the country and language,
6770
# e.g.: https://www.microsoft.com/en-ca/sql-server.
6871
- ^https://www.microsoft.com/sql-server$
6972

70-
# TODO: drop after fix to https://github.com/rust-lang/crates.io/issues/788
71-
- ^https://crates\.io/crates
7273
# TODO move into content/en/blog/2023/humans-of-otel.md once https://github.com/open-telemetry/opentelemetry.io/issues/3889 is implemented
7374
- ^https://shorturl.at/osHRX$
7475
# TODO move into content/en/blog/2023/contributing-to-otel/index.md once https://github.com/open-telemetry/opentelemetry.io/issues/3889 is implemented

‎.textlintrc.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,11 @@ rules:
113113
# https://github.com/sapegin/textlint-rule-terminology/blob/ca36a645c56d21f27cb9d902b5fb9584030c59e3/index.js#L137-L142.
114114
#
115115
- ['3rd[- ]party', third-party]
116-
- ['auto[- ]c(onfigur)(es?|ations?)', 'autoc$1$2'] # cspell:ignore autoc ations onfigur
116+
- ['auto[- ]c(onfigur)(es?|ations?)', 'autoc$1$2'] # cSpell:disable-line
117117
- ['back[- ]end(s)?', 'backend$1']
118118
- [bugfix, bug fix]
119119
- [byte code, bytecode]
120+
- ['(cloud)-(native)', '$1 $2']
120121
- [cpp, C++]
121122
- # dotnet|.net -> .NET, but NOT for strings like:
122123
# - File extension: file.net

‎content/en/announcements/_index.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
title: Announcements
33
cascade:
44
type: docs
5+
params:
6+
hide_feedback: true
57
---

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

-11
This file was deleted.

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

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
title: KubeCon + CloudNativeCon Europe 2025
3+
linkTitle: KubeCon EU 2025
4+
date: 2025-02-03
5+
expiryDate: 2025-04-04
6+
---
7+
8+
<i class="fas fa-bullhorn"></i> [**{{% param title %}}**][LF],
9+
**<span class="text-nowrap">April 1 - 4,</span> London England**.
10+
<span class="d-none d-md-inline"><br></span> Come collaborate, learn, and
11+
share<span class="d-none d-sm-inline"> with the Cloud Native community</span>!
12+
13+
[LF]:
14+
https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/register/?utm_source=opentelemetry&utm_medium=all&utm_campaign=KubeCon-EU-2025&utm_content=slim-banner

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ community by establishing processes. Let me explain.
1717
![Watering can](watering-can.jpeg)
1818

1919
The main objective of the OpenTelemetry project is to make robust, portable
20-
telemetry a built-in feature of cloud-native software. The most effective way to
20+
telemetry a built-in feature of cloud native software. The most effective way to
2121
do it is to build a community of passionate people, from existing ecosystem with
2222
the diverse expertise and experience. This community will build a project that
2323
is attractive to users, who will use it to instrument their software, as well as

‎content/en/blog/2022/demo-announcement/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ ourselves to just the items listed here.
126126
- Demonstrations of the ability to add
127127
[Baggage](https://github.com/open-telemetry/opentelemetry-demo/issues/100) and
128128
other custom tags
129-
- Continue to build on other cloud-native technologies like:
129+
- Continue to build on other cloud native technologies like:
130130
- Kubernetes
131131
- gRPC
132132
- [OpenFeature](https://github.com/open-feature)

‎content/en/blog/2022/instrument-kafka-clients/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ system in a distributed environment. Different services communicate with each
1111
other by using Apache Kafka as a messaging system but even more as en event or
1212
data streaming platform.
1313

14-
Taking into account the cloud-native approach for developing microservices,
14+
Taking into account the cloud native approach for developing microservices,
1515
quite often [Kubernetes](https://kubernetes.io/) is also used to run the
1616
workloads. In this scenario, you can also easily deploy and manage an Apache
1717
Kafka cluster on top of it, by using a project like

‎content/en/blog/2022/k8s-otel-expose/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ linkTitle: Exposing a Collector
44
date: 2022-09-08
55
author: '[Benedikt Bongartz](https://github.com/frzifus)'
66
# prettier-ignore
7-
cSpell:ignore: basicauth Benedikt Bongartz dXNlci0xOjEyMzQK frzifus htpasswd k8sattributes K8sattributes k8sattributesprocessor K8sprocessor k8sprocessor Keycloak letsencrypt llczt oidc rolebinding
7+
cSpell:ignore: basicauth Benedikt Bongartz dXNlci0xOjEyMzQK frzifus htpasswd k8sattributes k8sattributesprocessor Keycloak letsencrypt llczt oidc rolebinding
88
---
99

1010
Exposing an [OpenTelemetry Collector](/docs/collector/) currently requires a

‎content/en/blog/2022/why-and-how-ebay-pivoted-to-opentelemetry/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ date: 2022-12-19
55
author: '[Vijay Samuel](https://github.com/vjsamuel) (eBay)'
66
canonical_url: https://tech.ebayinc.com/engineering/why-and-how-ebay-pivoted-to-opentelemetry/
77
# prettier-ignore
8-
cSpell:ignore: Aishwarya Aradros Ashpole Auditbeat autodiscover Bhattacharya Bogdan Charif Christos clusterlocal Dropwizard Drutu Feldmeier Filebeat filereloadreceiver Golubenco Kroh kube Markou Metricbeat metricbeat Mirabella Nigaryan Premendra Pérez Rami Ruflin Santanu Sarbu sharded Siering Soriano statefulset Steffen Teoh Tigran Vijay Yandapalli
8+
cSpell:ignore: Aishwarya Aradros Ashpole Auditbeat autodiscover Bhattacharya Bogdan Charif Christos clusterlocal Dropwizard Drutu Feldmeier Filebeat filereloadreceiver Golubenco Kroh kube Markou metricbeat Mirabella Nigaryan Premendra Pérez Rami Ruflin Santanu Sarbu sharded Siering Soriano statefulset Steffen Teoh Tigran Vijay Yandapalli
99
---
1010

1111
eBay makes a crucial pivot to OpenTelemetry to better align with industry
@@ -22,7 +22,7 @@ experience. The Observability landscape is an ever-changing one and recent
2222
developments in the OpenTelemetry world forced us to rethink our strategy in
2323
order to pivot to using it. eBay’s observability platform Sherlock.io provides
2424
developers and Site Reliability Engineers (SREs) with a robust set of
25-
cloud-native offerings to observe the various applications that power the eBay
25+
cloud native offerings to observe the various applications that power the eBay
2626
ecosystem. Sherlock.io supports the three pillars of observability — metrics,
2727
logs and traces. The platform’s metric store is a clustered and sharded
2828
implementation of the Prometheus storage engine. We use the Metricbeat agent to

‎content/en/blog/2023/end-user-q-and-a-03.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ at the chance to work with it.
6969
### What is the architecture at Farfetch like? How has OpenTelemetry helped?
7070

7171
Farfetch currently has 2000 engineers, with a complex and varied architecture
72-
which includes cloud-native, Kubernetes, and virtual machines running on three
72+
which includes cloud native, Kubernetes, and virtual machines running on three
7373
different cloud providers. There is a lot of information coming from everywhere,
7474
with a lack of standardization on how to collect this information. For example,
7575
Prometheus is used mostly as a standard for collecting metrics; however, in some

‎content/en/blog/2023/end-user-q-and-a-04.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ date: 2023-07-24
55
author: '[Reese Lee](https://github.com/reese-lee) (New Relic)'
66
body_class: otel-with-contributions-from
77
# prettier-ignore
8-
cSpell:ignore: Aronoff autoscaler Boten codepath fluentbit k8sattributesprocessor kubelet spanmetrics
8+
cSpell:ignore: Aronoff autoscaler codepath fluentbit k8sattributesprocessor kubelet spanmetrics
99
---
1010

1111
With contributions from [Adriana Villela](https://github.com/avillela)

‎content/en/blog/2023/kubecon-eu.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Come network with OpenTelemetry maintainers and core contributors during the
4242
2023 from 16:00 - 17:00. You can attend with a _standard in-person pass_.
4343

4444
[Observability Day][] _fosters collaboration, discussion, and knowledge sharing
45-
of cloud-native observability projects_. This event will be held on April 18,
45+
of cloud native observability projects_. This event will be held on April 18,
4646
2023 from 9:00 - 17:00. There will be several sessions on OpenTelemetry as well.
4747

4848
> <i class="far fa-exclamation-triangle"></i> **IMPORTANT access note**: You

‎content/en/blog/2023/kubecon-na.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ OpenTelemetry maintainers in making OpenTelemetry better for everyone during the
7979
## Co-located Events
8080

8181
[Observability Day][] _fosters collaboration, discussion, and knowledge sharing
82-
of cloud-native observability projects_. This event will be held on November 6,
82+
of cloud native observability projects_. This event will be held on November 6,
8383
2023 from 9am - 5pm. There will be several sessions on OpenTelemetry as well.
8484

8585
> <i class="far fa-exclamation-triangle"></i> **IMPORTANT access note**: You

‎content/en/blog/2023/otel-in-focus-04.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ There's much more -- be sure to check out the release notes!
8181

8282
## Project Updates
8383

84-
KubeCon EU saw over ten thousand cloud-native developers gather in Amsterdam,
84+
KubeCon EU saw over ten thousand cloud native developers gather in Amsterdam,
8585
and a lot of you stopped by the OpenTelemetry booth to say hi! Hopefully some of
8686
you got your hands on our limited-edition KubeCon stickers... if not, well,
8787
there'll be more limited edition stickers. Just not for KubeCon, because it's

0 commit comments

Comments
 (0)