Skip to content

Commit f20f4d8

Browse files
authored
Merge branch 'main' into style-guide
2 parents 6617d09 + 8eb4801 commit f20f4d8

File tree

335 files changed

+4478
-1857
lines changed

Some content is hidden

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

335 files changed

+4478
-1857
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

.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-38-g77da7e49
5+
docsy-pin = v0.11.0-39-g9e685592
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

+14-7
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,28 @@ 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
7576
- ^https://shorturl.at/vLYZ0$
77+
78+
# Temporary until semconv is updated to 1.30.0+
79+
- ^https://cloud.google.com/apis/design/resource_names#full_resource_name
80+
- ^https://cloud.google.com/functions/docs/concepts/exec#function_scope_versus_global_scope
81+
- ^https://developer.apple.com/documentation/uikit/uiapplicationdelegate#1656902
82+
- ^https://docs.docker.com/registry/spec/manifest-v2-2/#example-image-manifest

.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/k8s-metadata/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cSpell:ignore: k8sattributes k8sattributesprocessor k8sprocessor KUBE replicaset
99

1010
{{% alert title="Note" color="info" %}} The most up to date information for how
1111
to enhance telemetry with Kubernetes metadata can be found in the docs. See
12-
[Getting Started with Kubernetes](/docs/kubernetes/getting-started/) for more
12+
[Getting Started with Kubernetes](/docs/platforms/kubernetes/getting-started/) for more
1313
info. {{% /alert %}}
1414

1515
Attaching Kubernetes resource metadata to OpenTelemetry traces is useful to

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ in this setup are mentioned in brackets.
106106
[v1.2.1] installed.
107107
- A Kubernetes [v1.23.3] edge cluster to create a test cluster. Using
108108
[Kind](https://kind.sigs.k8s.io/) is recommended.
109-
- Installed [OpenTelemetry Operator](/docs/kubernetes/operator/) [v0.58.0] on
109+
- Installed [OpenTelemetry Operator](/docs/platforms/kubernetes/operator/) [v0.58.0] on
110110
both ends.
111111
- Installed [Jaeger Operator](https://www.jaegertracing.io/docs/1.37/operator/)
112112
[v1.37.0] on your public cluster.

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/contributing-to-otel/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Feeling a little more adventurous? Then why not join one of the other OTel
145145
(SIGs)? By joining a SIG, you can contribute to things like (but not limited to)
146146
SDK development, auto-instrumentation of libraries, the
147147
[OTel Collector](/docs/collector/), and the
148-
[OTel Operator](/docs/kubernetes/operator/). You don't even need to be a regular
148+
[OTel Operator](/docs/platforms/kubernetes/operator/). You don't even need to be a regular
149149
contributor. Sometimes, contributions come out of necessity. Like maybe you
150150
found a bug in the Collector. Why not take a stab at fixing it? Or maybe there's
151151
a feature that you and your team desperately need. Again, why not take a stab at

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

+4-4
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
@@ -156,9 +156,9 @@ others are still instrumented using the [legacy OpenTracing
156156
[using shims](/docs/migration/opentracing/).
157157

158158
The OpenTelemetry Operator is being implemented to auto-instrument Java and .NET
159-
code. Among other things, the [OTel Operator](/docs/kubernetes/operator/)
159+
code. Among other things, the [OTel Operator](/docs/platforms/kubernetes/operator/)
160160
supports injecting and
161-
[configuring auto-instrumentation](/docs/kubernetes/operator/automatic/#configure-automatic-instrumentation)
161+
[configuring auto-instrumentation](/docs/platforms/kubernetes/operator/automatic/#configure-automatic-instrumentation)
162162
in .NET, Java, Python, and Node.js. Iris hopes that Go auto-instrumentation will
163163
be available in the near-future. To track progress of auto-instrumentation in
164164
Go, see
@@ -255,7 +255,7 @@ would be a bottleneck in terms of load and single point of failure. The team
255255
currently has one
256256
[OpenTelemetry Collector agent](/docs/collector/deployment/agent/) per
257257
Kubernetes cluster. The end goal is to replace those agents with the
258-
[OTel Operator](/docs/kubernetes/operator/) instead, which allows you to deploy
258+
[OTel Operator](/docs/platforms/kubernetes/operator/) instead, which allows you to deploy
259259
and configure the OTel Collector and inject and configure auto-instrumentation.
260260

261261
Everything is then sent to a central OTel Collector (i.e. an

content/en/blog/2023/jmx-metric-insight/index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ that our Kafka installation is working as expected.
111111
### Export metrics to Prometheus
112112

113113
The metrics can be exported by any of the supported metric exporters, to a
114-
backend of your choice. The full list of exporters and their configuration
115-
options can be found
116-
[here](https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/autoconfigure/README.md#exporters).
114+
backend of your choice. For the full list of exporters and their configuration
115+
options, see
116+
[Properties: exporters](/docs/languages/java/configuration/#properties-exporters).
117117
For instance, you can export the metrics to an OTel collector using the OTLP
118118
exporter, perform some processing and then consume the metrics on a backend of
119119
your choice. In this example for the sake of simplicity, we are directly

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/lambda-release.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cSpell:ignore: adot otel-faas socha
99
The
1010
[Functions-as-a-Service (FaaS) SIG](https://docs.google.com/document/d/187XYoQcXQ9JxS_5v2wvZ0NEysaJ02xoOYNXj08pT0zc)
1111
is incredibly excited to announce that the release of OpenTelemetry Lambda
12-
layers, and associated [documentation](/docs/faas/) on how to monitor Amazon Web
12+
layers, and associated [documentation](/docs/platforms/faas/) on how to monitor Amazon Web
1313
Services (AWS) Lambdas.
1414

1515
## OTel FaaS repackaged
@@ -42,7 +42,7 @@ The FaaS SIG has addressed the above-mentioned shortcomings:
4242
Collector alongside auto-instrumentation layers for JavaScript, Java, and
4343
Python.
4444
- Added official community Lambda documentation to the OTel website under the
45-
new [FaaS section](/docs/faas/).
45+
new [FaaS section](/docs/platforms/faas/).
4646

4747
## What next
4848

content/en/blog/2023/opamp-status/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ with a backlog of issues created to guide further development.
105105
## OpAMP in Kubernetes
106106

107107
In OTel we have dedicated support for Kubernetes as a compute platform via the
108-
[OpenTelemetry Operator for Kubernetes](/docs/kubernetes/operator/). In this
108+
[OpenTelemetry Operator for Kubernetes](/docs/platforms/kubernetes/operator/). In this
109109
context, we're also working on OpAMP support in Kubernetes which will be
110110
available through a
111111
[bridge component](https://docs.google.com/document/d/1M8VLNe_sv1MIfu5bUR5OV_vrMBnAI7IJN-7-IAr37JY/)

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/collector-roadmap/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ wanted to focus on:
6565
OTLP exporter.
6666
2. Individual Go modules that the Collector components rely upon must also be
6767
marked as stable as per the project's
68-
[versioning guidelines](https://github.com/open-telemetry/opentelemetry-collector/blob/main/VERSIONING.md#public-api-expectations).
68+
[versioning guidelines](https://github.com/open-telemetry/opentelemetry-collector/blob/main/VERSIONING.md#general-go-api-considerations).
6969

7070
Aside from this, there were a few areas the contributors wanted to improve based
7171
on user feedback:

content/en/blog/2024/go-contrib-removal.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ To become a code owner of one of the modules, you need to be a member of the
4747
OpenTelemetry organization and have a good working knowledge of the code you
4848
seek to maintain. To become a member of OpenTelemetry in GitHub, see the
4949
requirements in
50-
[Community membership](https://github.com/open-telemetry/community/blob/main/community-membership.md#requirements).
50+
[Community membership](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#requirements).
5151

5252
If you satisfy all requirements,
5353
[open an issue](https://github.com/open-telemetry/opentelemetry-go-contrib/issues/new?assignees=&labels=&projects=&template=owner.md&title=).

content/en/blog/2024/java-metric-systems-compared/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ The result is a configurable option unique to OpenTelemetry Java called
285285
what their memory mode is based on whether they read metric state concurrently
286286
or not. Right now you opt into the optimized memory behavior (which we call
287287
`MemoryMode.reusable_data`) via an
288-
[environment variable](https://github.com/open-telemetry/opentelemetry-java/tree/main/sdk-extensions/autoconfigure#exporters).
288+
[environment variable](/docs/languages/java/configuration/#properties-exporters).
289289
In the future, the optimized memory mode will be enabled by default, since only
290290
exceptional cases need concurrent access to the metric state. It turns out that
291291
the objects holding the metric state (`MetricData` in OpenTelemetry Java terms)

0 commit comments

Comments
 (0)