Skip to content

Commit 1b5daef

Browse files
Merge remote-tracking branch 'origin/main' into opentelemetrybot/semconv-integration-v1.31.0-dev
2 parents a1583f3 + 4575bd5 commit 1b5daef

Some content is hidden

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

52 files changed

+572
-303
lines changed

.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-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

.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.
+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/why-and-how-ebay-pivoted-to-opentelemetry/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -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/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

content/en/blog/2024/kubecon-eu.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ cSpell:ignore: Aiven Alexandre Anusha Arbiv Beemer Benedikt Blanco Bongartz Chek
1010
---
1111

1212
The OpenTelemetry project maintainers, members of the governance committee, and
13-
technical committee are thrilled to be at [KubeCon + CloudNativeCon Europe][]
14-
and at the co-located
13+
technical committee are thrilled to be at [KubeCon + CloudNativeCon Europe] and
14+
at the co-located
1515
[Observability Day](https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/co-located-events/observability-day/)
1616
in Paris from March 19 - 22, 2024.
1717

@@ -46,9 +46,9 @@ it again right before KubeCon!
4646

4747
## Observability Day
4848

49-
_[Observability Day][] fosters collaboration, discussion, and knowledge sharing
50-
of cloud-native observability projects_. This event will be held on March 19,
51-
2024 from 9:00 - 17:35. There will be several sessions on OpenTelemetry as well:
49+
_[Observability Day] fosters collaboration, discussion, and knowledge sharing of
50+
cloud native observability projects_. This event will be held on March 19, 2024
51+
from 9:00 - 17:35. There will be several sessions on OpenTelemetry as well:
5252

5353
- **[Welcome + Project Updates](https://sched.co/1YGT9)**<br> by Eduardo Silva,
5454
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,
9090
{{% alert title="Important access note" color="danger" %}}
9191

9292
You need an _in-person all-access_ pass for on-site access to **Observability
93-
Day**. For details, see [KubeCon registration][]. If you have a virtual ticket,
93+
Day**. For details, see [KubeCon registration]. If you have a virtual ticket,
9494
you will be able to follow **Observability Day** through a live stream.
9595

9696
[kubecon registration]:
@@ -135,7 +135,7 @@ that SIG. Sessions will be recorded and posted on the
135135
[OTel YouTube channel](https://youtube.com/@otel-official).
136136

137137
We will create action items from your comments as appropriate. Check
138-
[#otel-user-research][] in CNCF's Slack instance for results and action item
138+
[#otel-user-research] in CNCF's Slack instance for results and action item
139139
updates to come after KubeCon EU.
140140

141141
Back by popular demand! We'll be recording

content/en/blog/2024/kubecon-na.md

+6-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cSpell:ignore: Arnell Ashok Chandrasekar Clario Contribfest Ekansh Grabner Haeus
88
---
99

1010
The OpenTelemetry project maintainers, members of the governance committee, and
11-
technical committee are thrilled to be at [KubeCon NA][] in Salt Lake City from
11+
technical committee are thrilled to be at [KubeCon NA] in Salt Lake City from
1212
November 12 - 15, 2024.
1313

1414
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.
7878

7979
## Observability Day
8080

81-
_[Observability Day][] fosters collaboration, discussion, and knowledge sharing
82-
of cloud-native observability projects_. This event will be held on November 12,
81+
_[Observability Day] fosters collaboration, discussion, and knowledge sharing of
82+
cloud native observability projects_. This event will be held on November 12,
8383
2024 from 9am to 6pm.
8484
[Check the full schedule](https://colocatedeventsna2024.sched.com/overview/type/Observability+Day)
8585
to find your favorite talks about Observability and OpenTelemetry.
8686

8787
> <i class="far fa-exclamation-triangle"></i> **IMPORTANT access note**: You
8888
> need an _in-person all-access_ pass for on-site access to **Observability
89-
> Day**. For details, see [KubeCon registration][]. If you have a virtual
90-
> ticket, you will be able to follow **Observability Day** through a live
91-
> stream.
89+
> Day**. For details, see [KubeCon registration]. If you have a virtual ticket,
90+
> you will be able to follow **Observability Day** through a live stream.
9291
9392
## OpenTelemetry Observatory
9493

@@ -120,7 +119,7 @@ You can help us improve the project by sharing your thoughts and feedback about
120119
your OpenTelemetry adoption, implementation, and usage.
121120

122121
We will create action items from your comments as appropriate. Check
123-
[#otel-sig-end-user][] in CNCF's Slack instance for results and action item
122+
[#otel-sig-end-user] in CNCF's Slack instance for results and action item
124123
updates to come after KubeCon EU.
125124

126125
Come join us to listen, learn, and get involved in OpenTelemetry.

content/en/blog/2024/new-otel-features-envoy-istio/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sig: OpenTelemetry Specification
88
cSpell:ignore: bookinfo Grassi istioctl Joao productpage
99
---
1010

11-
In the dynamic world of cloud-native and distributed applications, managing
11+
In the dynamic world of cloud native and distributed applications, managing
1212
microservices effectively is critical. [Kubernetes](https://kubernetes.io/) has
1313
become the de facto standard for container orchestration, enabling seamless
1414
deployment, scaling, and management of containerized applications.

content/en/docs/demo/requirements/architecture.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cSpell:ignore: dockerstatsreceiver
77

88
## Summary
99

10-
The OpenTelemetry Community Demo application is intended to be a 'showcase' for
10+
The OpenTelemetry Community Demo application is intended to be a showcase for
1111
OpenTelemetry API, SDK, and tools in a production-lite cloud native application.
1212
The overall goal of this application is not only to provide a canonical 'demo'
1313
of OpenTelemetry components, but also to act as a framework for further

content/en/docs/faas/_index.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ weight: 360
88
---
99

1010
Functions as a Service (FaaS) is an important serverless compute platform for
11-
cloud native applications. However, platform quirks usually mean these
12-
applications have slightly different monitoring guidance and requirements than
13-
applications running on Kubernetes or Virtual Machines.
11+
[cloud native apps]. However, platform quirks usually mean these applications
12+
have slightly different monitoring guidance and requirements than applications
13+
running on Kubernetes or Virtual Machines.
1414

1515
The initial vendor scope of the FaaS documentation is around Microsoft Azure,
1616
Google Cloud Platform (GCP), and Amazon Web Services (AWS). AWS functions are
@@ -25,3 +25,5 @@ automatically.
2525

2626
The release status can be tracked in the
2727
[OpenTelemetry-Lambda repository](https://github.com/open-telemetry/opentelemetry-lambda).
28+
29+
[cloud native apps]: https://glossary.cncf.io/cloud-native-apps/

content/pt/docs/concepts/components.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Componentes
33
description: Os principais componentes que compõem o OpenTelemetry
44
weight: 20
5-
default_lang_commit: 2f34c456ab38b4d3502cd07bc36fa1455d4ef875
5+
default_lang_commit: f5c228e5d03deaabc00d5920c5757bf7bd23e3f3
66
---
77

88
O OpenTelemetry é atualmente composto por vários componentes principais:

0 commit comments

Comments
 (0)