Skip to content

Commit 8a6437e

Browse files
authored
Merge branch 'main' into issue-5853
2 parents 6b6bc0c + 9e74e88 commit 8a6437e

File tree

5 files changed

+68
-7
lines changed

5 files changed

+68
-7
lines changed

content/en/docs/faas/lambda-collector.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Here is a sample configuration file of `collector.yaml` in the root directory:
9999

100100
```yaml
101101
#collector.yaml in the root directory
102-
#Set an environment variable 'OPENTELEMETRY_COLLECTOR_CONFIG_FILE' to '/var/task/collector.yaml'
102+
#Set an environment variable 'OPENTELEMETRY_COLLECTOR_CONFIG_URI' to '/var/task/collector.yaml'
103103
104104
receivers:
105105
otlp:
@@ -131,7 +131,7 @@ service:
131131
132132
Once your collector configuration is set through a confmap provider, create an
133133
environment variable on your Lambda function
134-
`OPENTELEMETRY_COLLECTOR_CONFIG_FILE` and set the path of configuration w.r.t to
134+
`OPENTELEMETRY_COLLECTOR_CONFIG_URI` and set the path of configuration w.r.t to
135135
the confmap provider as its value. for e.g, if you are using a file configmap
136136
provider, set its value to `/var/task/<path>/<to>/<filename>`. This will tell
137137
the extension where to find the collector configuration.
@@ -141,7 +141,7 @@ the extension where to find the collector configuration.
141141
You can set this via the Lambda console, or via the AWS CLI.
142142

143143
```bash
144-
aws lambda update-function-configuration --function-name Function --environment Variables={OPENTELEMETRY_COLLECTOR_CONFIG_FILE=/var/task/collector.yaml}
144+
aws lambda update-function-configuration --function-name Function --environment Variables={OPENTELEMETRY_COLLECTOR_CONFIG_URI=/var/task/collector.yaml}
145145
```
146146

147147
##### Set Configuration Environment Variables from CloudFormation
@@ -155,7 +155,7 @@ Function:
155155
...
156156
Environment:
157157
Variables:
158-
OPENTELEMETRY_COLLECTOR_CONFIG_FILE: /var/task/collector.yaml
158+
OPENTELEMETRY_COLLECTOR_CONFIG_URI: /var/task/collector.yaml
159159
```
160160

161161
##### Load Configuration from an S3 Object
@@ -170,5 +170,5 @@ Function:
170170
...
171171
Environment:
172172
Variables:
173-
OPENTELEMETRY_COLLECTOR_CONFIG_FILE: s3://<bucket_name>.s3.<region>.amazonaws.com/collector_config.yaml
173+
OPENTELEMETRY_COLLECTOR_CONFIG_URI: s3://<bucket_name>.s3.<region>.amazonaws.com/collector_config.yaml
174174
```
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
---
2+
title: Requisitos previos
3+
description:
4+
Para contribuir, necesitas estar familiarizado con las siguientes tecnologías
5+
y herramientas.
6+
aliases: [requisitos]
7+
weight: 1
8+
default_lang_commit: 2127d75cef0be2f2554f5b47520a108ba381b790
9+
---
10+
11+
Para contribuir a este repositorio, necesitas estar familiarizado con las
12+
siguientes tecnologías y herramientas:
13+
14+
- [git](https://git-scm.com/)
15+
- [GitHub](https://github.com/)
16+
- Markdown ([CommonMark](https://commonmark.org/))
17+
- YAML
18+
19+
Para detalles técnicos sobre cómo se construye y prueba la documentación
20+
localmente, consulta [Desarrollo](../development).
21+
22+
## Firma del CNCF CLA {#cla}
23+
24+
Todos los colaboradores de OpenTelemetry deben firmar el [Acuerdo de Licencia de
25+
Contribuidor (CLA)][CLA] de la Linux Foundation.
26+
27+
Las solicitudes de código (pull requests) de colaboradores que no hayan firmado
28+
el CLA fallarán en las pruebas automatizadas. El nombre y correo electrónico que
29+
proporciones deben coincidir con los encontrados en `git config`, y los usados
30+
para el CLA de CNCF.
31+
32+
## Código de conducta
33+
34+
Todos los colaboradores de OpenTelemetry están sujetos al [Código de Conducta de
35+
la Comunidad CNCF][CoC].
36+
37+
## Directrices de la comunidad
38+
39+
Para las directrices generales de la comunidad de OpenTelemetry, incluyendo
40+
roles y expectativas, consulta la [Guía para Nuevos Contribuidores de
41+
OpenTelemetry][NCG].
42+
43+
[CLA]: https://docs.linuxfoundation.org/lfx/easycla/contributors
44+
[CoC]: https://github.com/cncf/foundation/blob/main/code-of-conduct.md
45+
[NCG]:
46+
https://github.com/open-telemetry/community/blob/main/guides/contributor/README.md
+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
title: Go
3+
description: >-
4+
<img width="35" class="img-initial" src="/img/logos/32x32/Golang_SDK.svg"
5+
alt="Go"> Una implementación de OpenTelemetry específica del lenguaje Go.
6+
# aliases: [/golang, /golang/metrics, /golang/tracing] - aliases not needed since they predate the creation of this page
7+
weight: 16
8+
default_lang_commit: 1ce408a51513e6eb782032ae5e8d092b7d1647e4
9+
---
10+
11+
{{% docs/languages/index-intro go /%}}
12+
13+
## Más información
14+
15+
- [Repositorio Contrib](https://github.com/open-telemetry/opentelemetry-go-contrib)

content/es/docs/languages/python/instrumentation.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cSpell:ignore: millis ottrace textmap
99

1010
<!-- markdownlint-disable no-duplicate-heading -->
1111

12-
{{% docs/languages/instrumentation-intro %}}
12+
{{% es/docs/languages/instrumentation-intro %}}
1313

1414
## Configuración
1515

data/registry/instrumentation-java-http4k.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ isFirstParty: true
1919
package:
2020
registry: maven
2121
name: org.http4k/http4k-opentelemetry
22-
version: 5.45.0.0
22+
version: 5.45.1.0

0 commit comments

Comments
 (0)