Skip to content

Commit

Permalink
Merge branch 'main' into collector-security
Browse files Browse the repository at this point in the history
  • Loading branch information
tiffany76 authored Oct 14, 2024
2 parents dbfd1b6 + 671e49e commit 2a582e7
Show file tree
Hide file tree
Showing 232 changed files with 1,221 additions and 222 deletions.
4 changes: 4 additions & 0 deletions .cspell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ version: '0.2'
language: en-US
import:
- '@cspell/dict-es-es/cspell-ext.json'
- '@cspell/dict-fr-fr/cspell-ext.json'
- '@cspell/dict-pt-br/cspell-ext.json'
caseSensitive: true
ignorePaths:
Expand All @@ -31,6 +32,8 @@ dictionaryDefinitions:
path: .cspell/en-words.txt
- name: es-palabras
path: .cspell/es-palabras.txt
- name: fr-mots
path: .cspell/fr-mots.txt
- name: pt-palavras
path: .cspell/pt-palavras.txt
dictionaries:
Expand All @@ -40,6 +43,7 @@ dictionaries:
# Local word lists
- en-words
- es-palabras
- fr-mots
- pt-palavras
# Programming languages and software terms
- cpp
Expand Down
6 changes: 6 additions & 0 deletions .cspell/es-palabras.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@ microservicios
extensibilidad
correlacionarse
deserializa
proprietarias
aspiracional
deserializar
Muestreadores
muestreadores
monitoreo
49 changes: 49 additions & 0 deletions .cspell/fr-mots.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
analyse
analyser
avec
collecter
collectez
comportement
contenant
créez
dans
découvrez
définie
démo
dessous
données
d'utiliser
efficace
entièrement
être
générer
gratuit
indépendant
instrumenter
intégrations
langages
librairies
logiciels
métriques
nombreux
nombreuses
observabilité
outils
permet
permettant
projet
projets
peut
qualité
savoir
s'intègre
supporte
supporté
tant
télémétrie
transmettez
universelle
utilisé
visuel
votre
vous
3 changes: 2 additions & 1 deletion .cspell/pt-palavras.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
desserializa
desserializar
autoinstrumentação
autoconsistentes
serialização
verbosidade
verbosidade
4 changes: 4 additions & 0 deletions .github/component-label-map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ lang:es:
- changed-files:
- any-glob-to-any-file:
- content/es/**
lang:fr:
- changed-files:
- any-glob-to-any-file:
- content/fr/**
sig:cpp:
- changed-files:
- any-glob-to-any-file:
Expand Down
3 changes: 3 additions & 0 deletions .github/component-owners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,6 @@ components:
content/es:
- open-telemetry/docs-maintainers
- open-telemetry/docs-es-approvers
content/fr:
- open-telemetry/docs-maintainers
- open-telemetry/docs-fr-approvers
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[submodule "content-modules/opentelemetry-specification"]
path = content-modules/opentelemetry-specification
url = https://github.com/open-telemetry/opentelemetry-specification.git
spec-pin = v1.37.0
spec-pin = v1.38.0
[submodule "content-modules/community"]
path = content-modules/community
url = https://github.com/open-telemetry/community
Expand All @@ -19,7 +19,7 @@
[submodule "content-modules/semantic-conventions"]
path = content-modules/semantic-conventions
url = https://github.com/open-telemetry/semantic-conventions
semconv-pin = v1.27.0
semconv-pin = v1.28.0
[submodule "content-modules/opamp-spec"]
path = content-modules/opamp-spec
url = https://github.com/open-telemetry/opamp-spec
Expand Down
1 change: 1 addition & 0 deletions .htmltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
- ^https://(www\.|eng\.)?uber\.com/(blog|flipr)/ # 406
- ^https://kofo.dev
- ^https://platform.openai.com
- ^https://openai.com
- ^https://star-history.com
- ^https://twitter.com
- ^https://www.chathamhouse.org
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ This is the source repository for the [OpenTelemetry][] website, project
documentation, and blog. The site is [built][contributing.md] using [Hugo][] and
is hosted on [Netlify][].

Public analytics for the website is [available here][].

## Get involved

To learn how to contribute fixes and new content to this project, read the
Expand Down Expand Up @@ -101,3 +103,5 @@ contributed][contributors]!
[slack]: https://slack.cncf.io/
[hugo]: https://gohugo.io
[netlify]: https://netlify.com
[available here]:
https://lookerstudio.google.com/reporting/34c2a65a-39e8-44aa-afa0-094975fee55d/page/4VDGB
2 changes: 1 addition & 1 deletion content-modules/semantic-conventions
2 changes: 1 addition & 1 deletion content/en/blog/2024/prom-and-otel/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ endpoint. Note that
The Prometheus exporter allows you to ship data in the Prometheus format, which
is then scraped by a Prometheus server. It's used to report metrics via the
Prometheus scrape HTTP endpoint. You can learn more by trying out this
[example](https://github.com/open-telemetry/opentelemetry-go/tree/main/example/prometheus).
[example](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/examples/prometheus).
However, the scraping won't really scale, as all the metrics are sent in a
single scrape.

Expand Down
7 changes: 7 additions & 0 deletions content/en/docs/collector/custom-collector.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,13 @@ processors:
receivers:
- gomod:
go.opentelemetry.io/collector/receiver/otlpreceiver {{% version-from-registry collector-receiver-otlp %}}

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.17.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.17.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.17.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.17.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.17.0
```
{{% alert color="primary" title="Tip" %}}
Expand Down
10 changes: 5 additions & 5 deletions content/en/docs/collector/internal-telemetry.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ service:
telemetry:
metrics:
readers:
pull:
exporter:
prometheus:
host: '0.0.0.0'
port: 8888
- pull:
exporter:
prometheus:
host: '0.0.0.0'
port: 8888
```
You can adjust the verbosity of the Collector metrics output by setting the
Expand Down
3 changes: 2 additions & 1 deletion content/en/docs/contributing/issues.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ One of the best ways to help make OTel docs better is to fix an existing issue.
<!-- prettier-ignore -->
> **NOTE**: we **_do not_ assign issues** to those who
> have not already made contributions to the [OpenTelemetry
> organization][org].
> organization][org], unless part of a mentorship or onboarding
> process.
{.mt-3}

<!-- prettier-ignore -->
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/go/examples.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Examples
redirect: https://github.com/open-telemetry/opentelemetry-go/tree/main/example
redirect: https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/examples
manualLinkTarget: _blank
_build: { render: link }
weight: 220
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/go/exporters.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func newExporter(ctx context.Context) (metric.Reader, error) {
```

To learn more on how to use the Prometheus exporter, try the
[prometheus example](https://github.com/open-telemetry/opentelemetry-go/tree/main/example/prometheus)
[prometheus example](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/examples/prometheus)

### OTLP logs over HTTP (Experimental)

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/java/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ aliases: [/java, /java/metrics, /java/tracing]
cascade:
vers:
instrumentation: 2.8.0
otel: 1.42.1
otel: 1.43.0
contrib: 1.38.0
semconv: 1.27.0
weight: 18
Expand Down
49 changes: 49 additions & 0 deletions content/es/docs/concepts/context-propagation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
---
title: Propagación de contexto
weight: 10
description: Aprende sobre el concepto que habilita el trazado distribuido.
default_lang_commit: 4966f752eb35f97c095ed1c813972c2ab38f0b1a
---

Con la propagación de contexto, [Señales](/docs/concepts/signals) pueden
correlacionarse entre sí, independientemente de dónde se generen. Aunque no está
limitado a las trazas, la propagación de contexto permite que las
[trazas](/docs/concepts/signals/traces) construyan información causal sobre un
sistema a través de servicios que están distribuidos arbitrariamente a través de
límites de procesos y redes.

Para entender la propagación de contexto, necesitas comprender dos conceptos
separados: contexto y propagación.

## Contexto

El contexto es un objeto que contiene la información para que el servicio emisor
y receptor, o la
[unidad de ejecución](/docs/specs/otel/glossary/#execution-unit), puedan
correlacionar una señal con otra.

Por ejemplo, si el servicio A llama al servicio B, entonces un span del servicio
A cuyo ID está en el contexto será usado como el span padre para el próximo span
creado en el servicio B. El ID de traza que está en el contexto también se usará
para el siguiente span creado en el servicio B, lo que significa que el span es
parte de la misma traza que el span del servicio A.

## Propagación

La propagación es el mecanismo que mueve el contexto entre servicios y procesos.
Serializa o deserializa el objeto de contexto y proporciona la información
relevante para ser propagada de un servicio a otro.

La propagación generalmente es manejada por bibliotecas de instrumentación y es
transparente para el usuario. En caso de que necesites propagar manualmente el
contexto, puedes utilizar la
[API de Propagadores](/docs/specs/otel/context/api-propagators/).

OpenTelemetry mantiene varios propagadores oficiales. El propagador
predeterminado utiliza los encabezados especificados por la especificación de
[W3C TraceContext](https://www.w3.org/TR/trace-context/).

## Especificación

Para aprender más sobre la Propagación de Contexto, consulta la
[especificación de Contexto](/docs/specs/otel/context/).
Loading

0 comments on commit 2a582e7

Please sign in to comment.