Skip to content

Commit b028a00

Browse files
authored
Merge branch 'main' into firstParty-flag-4-ruby
2 parents ac7fab1 + e5ef656 commit b028a00

File tree

12 files changed

+845
-25
lines changed

12 files changed

+845
-25
lines changed

.htmltest.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ IgnoreDirs:
1212
- zh/docs/contributing/pr-checks
1313
IgnoreInternalURLs: # list of paths
1414
IgnoreURLs: # list of regexs of paths or URLs to be ignored
15+
- ^/api$
1516
- ^((/..)?/docs/languages/\w+|\.\.)/(api|examples|registry)/$
1617
- ^(/..)?/docs/collector/registry/$
1718
- ^(/..)?/docs/languages/net/(metrics-api|traces-api)/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Here is a list of community roles with current and previous members:
5757
- Maintainers: [@open-telemetry/docs-maintainers][]
5858

5959
- [Austin Parker](https://github.com/austinlparker), Honeycomb
60-
- [Fabrizio Ferri-Benedetti](https://github.com/theletterf), Splunk
60+
- [Fabrizio Ferri-Benedetti](https://github.com/theletterf)
6161
- [Patrice Chalin](https://github.com/chalin), CNCF
6262
- [Phillip Carter](https://github.com/cartermp), Honeycomb
6363
- [Severin Neumann](https://github.com/svrnm), Cisco

content/en/api-docs.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

content/en/api.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
title: API references
3+
linkTitle: API
4+
redirect: /docs/languages/#api-references
5+
manualLinkTarget: _blank
6+
_build: { render: link }
7+
aliases: [api-docs]
8+
---

content/en/blog/2024/getting-started-with-otelsql/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ the other cool features `otelsql` provides.
364364
### Sqlcommenter support
365365

366366
otelsql integrates [Sqlcommenter](https://google.github.io/sqlcommenter), an
367-
open source ORM auto-instrumentation library that merges with OpenTelemetry by
367+
open source ORM autoinstrumentation library that merges with OpenTelemetry by
368368
injecting a comment into SQL statements to enable context propagation for the
369369
database.
370370

content/en/blog/2024/otel-governance/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ A relatively new process in the OpenTelemetry community is the
106106
[GC monthly check-in](https://github.com/open-telemetry/community/blob/main/gc-check-ins.md)
107107
with SIG maintainers. Each GC member was asked to pick about 4 SIGs, and then
108108
act as a liaison between those SIGs and the GC. Once a month, I ask SIG
109-
maintainers from Collector, Operator, Security, and Go Auto-Instrumentation
109+
maintainers from Collector, Operator, Security, and Go Autoinstrumentation
110110
questions, such as:
111111

112112
1\. Do you have any specific issues within your SIG that would require GC

content/en/blog/2024/otel-operator-q-and-a/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ easier. It does the following:
3131
- Provides
3232
[integration with the Prometheus Operator's `PodMonitor` and `ServiceMonitor` CRs](https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator).
3333
- Injects and configures
34-
[auto-instrumentation](https://www.honeycomb.io/blog/what-is-auto-instrumentation)
34+
[autoinstrumentation](https://www.honeycomb.io/blog/what-is-auto-instrumentation)
3535
into your pods, supported by the
3636
[`Instrumentation`](https://github.com/open-telemetry/opentelemetry-operator?tab=readme-ov-file#opentelemetry-auto-instrumentation-injection)
3737
custom resource.

content/en/blog/2024/prom-and-otel/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@ that:
189189

190190
- Manages the [OpenTelemetry Collector](/docs/collector/)
191191
- Injects and configures
192-
[auto-instrumentation](https://www.honeycomb.io/blog/what-is-auto-instrumentation)
192+
[autoinstrumentation](https://www.honeycomb.io/blog/what-is-auto-instrumentation)
193193
into your pods
194194

195195
In fact, the Operator creates two new
196196
[custom resource](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/)
197197
(CR) types in Kubernetes to support this functionality: the
198198
[OpenTelemetry Collector CR](https://github.com/open-telemetry/opentelemetry-operator#getting-started),
199199
and the
200-
[Auto-Instrumentation CR](https://github.com/open-telemetry/opentelemetry-operator#opentelemetry-auto-instrumentation-injection).
200+
[Autoinstrumentation CR](https://github.com/open-telemetry/opentelemetry-operator#opentelemetry-auto-instrumentation-injection).
201201

202202
Today, we will be focusing on the Target Allocator. The TA is an optional
203203
component of the Operator’s OTel Collector management capabilities.

content/en/docs/languages/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ references are available:
4848

4949
{{% apidocs %}}
5050

51-
{{% alert title="Tip" color="info" %}}
51+
{{% alert title="Note" color="info" %}}
5252

53-
You can find a list of available API references at </api-docs>.
53+
The list above is aliased to [`/api`](/api).
5454

5555
{{% /alert %}}
5656

content/es/docs/demo/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ default_lang_commit: 9b5e318036fb92e4a1896259cc3bbdad2843e1de
88
cSpell:ignore: OLJCESPC preconfigurados diagnostícala
99
---
1010

11-
Bienvenido a la documentación de la [Demo de OpenTelemetry](/ecosystem/demo/),
11+
Aquí tienes la documentación de la [Demo de OpenTelemetry](/ecosystem/demo/),
1212
que describe cómo instalar y ejecutar la demostración, además de algunos
1313
escenarios que puedes usar para ver OpenTelemetry en acción.
1414

0 commit comments

Comments
 (0)