Skip to content

Commit

Permalink
Merge branch 'main' into issue-5853
Browse files Browse the repository at this point in the history
  • Loading branch information
meswapnilk authored Jan 10, 2025
2 parents 6b6bc0c + 9e74e88 commit 8a6437e
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 7 deletions.
10 changes: 5 additions & 5 deletions content/en/docs/faas/lambda-collector.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Here is a sample configuration file of `collector.yaml` in the root directory:

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

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

##### Set Configuration Environment Variables from CloudFormation
Expand All @@ -155,7 +155,7 @@ Function:
...
Environment:
Variables:
OPENTELEMETRY_COLLECTOR_CONFIG_FILE: /var/task/collector.yaml
OPENTELEMETRY_COLLECTOR_CONFIG_URI: /var/task/collector.yaml
```

##### Load Configuration from an S3 Object
Expand All @@ -170,5 +170,5 @@ Function:
...
Environment:
Variables:
OPENTELEMETRY_COLLECTOR_CONFIG_FILE: s3://<bucket_name>.s3.<region>.amazonaws.com/collector_config.yaml
OPENTELEMETRY_COLLECTOR_CONFIG_URI: s3://<bucket_name>.s3.<region>.amazonaws.com/collector_config.yaml
```
46 changes: 46 additions & 0 deletions content/es/docs/contributing/prerequisites.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
---
title: Requisitos previos
description:
Para contribuir, necesitas estar familiarizado con las siguientes tecnologías
y herramientas.
aliases: [requisitos]
weight: 1
default_lang_commit: 2127d75cef0be2f2554f5b47520a108ba381b790
---

Para contribuir a este repositorio, necesitas estar familiarizado con las
siguientes tecnologías y herramientas:

- [git](https://git-scm.com/)
- [GitHub](https://github.com/)
- Markdown ([CommonMark](https://commonmark.org/))
- YAML

Para detalles técnicos sobre cómo se construye y prueba la documentación
localmente, consulta [Desarrollo](../development).

## Firma del CNCF CLA {#cla}

Todos los colaboradores de OpenTelemetry deben firmar el [Acuerdo de Licencia de
Contribuidor (CLA)][CLA] de la Linux Foundation.

Las solicitudes de código (pull requests) de colaboradores que no hayan firmado
el CLA fallarán en las pruebas automatizadas. El nombre y correo electrónico que
proporciones deben coincidir con los encontrados en `git config`, y los usados
para el CLA de CNCF.

## Código de conducta

Todos los colaboradores de OpenTelemetry están sujetos al [Código de Conducta de
la Comunidad CNCF][CoC].

## Directrices de la comunidad

Para las directrices generales de la comunidad de OpenTelemetry, incluyendo
roles y expectativas, consulta la [Guía para Nuevos Contribuidores de
OpenTelemetry][NCG].

[CLA]: https://docs.linuxfoundation.org/lfx/easycla/contributors
[CoC]: https://github.com/cncf/foundation/blob/main/code-of-conduct.md
[NCG]:
https://github.com/open-telemetry/community/blob/main/guides/contributor/README.md
15 changes: 15 additions & 0 deletions content/es/docs/languages/go/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
title: Go
description: >-
<img width="35" class="img-initial" src="/img/logos/32x32/Golang_SDK.svg"
alt="Go"> Una implementación de OpenTelemetry específica del lenguaje Go.
# aliases: [/golang, /golang/metrics, /golang/tracing] - aliases not needed since they predate the creation of this page
weight: 16
default_lang_commit: 1ce408a51513e6eb782032ae5e8d092b7d1647e4
---

{{% docs/languages/index-intro go /%}}

## Más información

- [Repositorio Contrib](https://github.com/open-telemetry/opentelemetry-go-contrib)
2 changes: 1 addition & 1 deletion content/es/docs/languages/python/instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cSpell:ignore: millis ottrace textmap

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

{{% docs/languages/instrumentation-intro %}}
{{% es/docs/languages/instrumentation-intro %}}

## Configuración

Expand Down
2 changes: 1 addition & 1 deletion data/registry/instrumentation-java-http4k.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ isFirstParty: true
package:
registry: maven
name: org.http4k/http4k-opentelemetry
version: 5.45.0.0
version: 5.45.1.0

0 comments on commit 8a6437e

Please sign in to comment.