Skip to content

Commit

Permalink
Merge branch 'shift-java-pages' of https://github.com/jack-berg/opent…
Browse files Browse the repository at this point in the history
…elemetry.io into shift-java-pages
  • Loading branch information
jack-berg committed Nov 13, 2024
2 parents 4849868 + 67786e4 commit 9ed1959
Show file tree
Hide file tree
Showing 19 changed files with 38 additions and 62 deletions.
18 changes: 0 additions & 18 deletions .htmltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,6 @@ IgnoreDirs:
# TODO drop next line after https://github.com/open-telemetry/opentelemetry.io/issues/5423 is fixed for ja pages:
- ^ja/docs/concepts/instrumentation/libraries/
# TODO drop next lines after https://github.com/open-telemetry/opentelemetry.io/issues/5555 is fixed for these pages:
- ^pt/docs/concepts/components/
- ^pt/docs/concepts/glossary/
- ^pt/docs/concepts/signals/baggage/
- ^pt/docs/languages/erlang/instrumentation/
- ^pt/docs/languages/erlang/sampling/
- ^pt/docs/languages/js/instrumentation/
- ^pt/docs/languages/js/sampling/
- ^pt/docs/languages/net/instrumentation/
- ^pt/docs/languages/net/libraries/
- ^pt/docs/languages/net/shim/
- ^pt/docs/languages/php/instrumentation/
- ^pt/docs/languages/python/instrumentation/
- ^pt/docs/languages/ruby/instrumentation/
- ^pt/docs/languages/ruby/sampling/
- ^pt/docs/zero-code/php/
# TODO drop next line after https://github.com/open-telemetry/opentelemetry.io/issues/5423 is fixed for pt pages:
- ^pt/docs/concepts/instrumentation/libraries/
# TODO drop next lines after https://github.com/open-telemetry/opentelemetry.io/issues/5555 is fixed for these pages:
- ^zh/docs/concepts/signals/baggage/
- ^zh/docs/zero-code/php/
# DO NOT EDIT! IgnoreDirs list is auto-generated from markdown file front matter.
Expand Down
4 changes: 3 additions & 1 deletion content/en/docs/collector/quick-start.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,13 @@ preferred shell.

## Generate and collect telemetry

3. Launch the Collector:
3. Launch the Collector, listening on ports 4317 (for OTLP gRPC), 4318 (for OTLP
HTTP) and 55679 (for ZPages):

```sh
docker run \
-p 127.0.0.1:4317:4317 \
-p 127.0.0.1:4318:4318 \
-p 127.0.0.1:55679:55679 \
otel/opentelemetry-collector-contrib:{{% param vers %}} \
2>&1 | tee collector-output.txt # Optionally tee output for easier search later
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 @@ -6,7 +6,7 @@ description: >-
aliases: [/java, /java/metrics, /java/tracing]
cascade:
vers:
instrumentation: 2.9.0
instrumentation: 2.10.0
otel: 1.44.1
contrib: 1.38.0
semconv: 1.28.0
Expand Down
18 changes: 1 addition & 17 deletions content/pt/docs/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,7 @@ title: Documentação
linkTitle: Docs
menu: { main: { weight: 10 } }
htmltest:
IgnoreDirs:
# TODO drop next lines after https://github.com/open-telemetry/opentelemetry.io/issues/5555 is fixed for these pages:
- ^pt/docs/concepts/components/
- ^pt/docs/concepts/glossary/
- ^pt/docs/concepts/signals/baggage/
- ^pt/docs/languages/erlang/instrumentation/
- ^pt/docs/languages/erlang/sampling/
- ^pt/docs/languages/js/instrumentation/
- ^pt/docs/languages/js/sampling/
- ^pt/docs/languages/net/instrumentation/
- ^pt/docs/languages/net/libraries/
- ^pt/docs/languages/net/shim/
- ^pt/docs/languages/php/instrumentation/
- ^pt/docs/languages/python/instrumentation/
- ^pt/docs/languages/ruby/instrumentation/
- ^pt/docs/languages/ruby/sampling/
- ^pt/docs/zero-code/php/
IgnoreDirs: {}
default_lang_commit: 2d88c10e1a14220a88a6e4859acb4047f49b6519
---

Expand Down
2 changes: 1 addition & 1 deletion content/pt/docs/concepts/components.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ necessárias.
Para mais informações, consulte
[Bibliotecas de instrumentação](/docs/concepts/instrumentation/libraries/).

### Exporters
### Exporters {#exporters}

{{% docs/languages/exporters/intro %}}

Expand Down
4 changes: 2 additions & 2 deletions content/pt/docs/concepts/context-propagation.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ sistema que é distribuído arbitrariamente entre processos e limites de rede.
Para compreender a propagação de contexto, você precisa entender dois conceitos
distintos: contexto e propagação.

## Contexto
## Contexto {#context}

O contexto é um objeto que contém as informações necessárias para que o serviço
emissor e receptor, ou
Expand All @@ -28,7 +28,7 @@ serviço B. O ID do rasto que está no contexto também será usado para o próx
trecho criado no serviço B, o que significa que o trecho faz parte do mesmo
rastro que o trecho do serviço A.

## Propagação
## Propagação {#propagation}

Propagação é o mecanismo que move o contexto entre serviços e processos. Ele
serializa ou desserializa o objeto de contexto e fornece as informações
Expand Down
11 changes: 3 additions & 8 deletions content/pt/docs/concepts/instrumentation/libraries.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
title: Bibliotecas
description: Aprenda como adicionar instrumentação nativa à sua biblioteca.
weight: 40
default_lang_commit: a570a00c7a238ffe26528d7bfb20efdbaf939c39
htmltest:
IgnoreDirs:
# TODO drop next line after https://github.com/open-telemetry/opentelemetry.io/issues/5423 is fixed for pt pages:
- ^pt/docs/concepts/instrumentation/libraries/
default_lang_commit: a570a00c7a238ffe26528d7bfb20efdbaf939c39 # + link-fix patch
---

O OpenTelemetry fornece [bibliotecas de instrumentação][] para várias
Expand Down Expand Up @@ -314,9 +310,8 @@ Aqui estão os
consulte a documentação do OpenTelemetry no seu idioma.

No caso de um sistema de mensagens, você pode receber mais de uma mensagem de
uma vez. As mensagens recebidas se tornam
[_links_](/docs/languages/java/instrumentation/#create-spans-with-links) no
trecho que você cria. Consulte as
uma vez. As mensagens recebidas se tornam _links_ no trecho que você cria.
Consulte as
[convenções de mensagens](/docs/specs/semconv/messaging/messaging-spans/) para
mais detalhes (AVISO: as convenções de mensagens estão
[em construção](https://github.com/open-telemetry/oteps/pull/173) 🚧).
Expand Down
2 changes: 1 addition & 1 deletion content/pt/docs/concepts/sampling/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ fornecedor ou com recursos computacionais em hospedagem própria, dependendo do
seu _backend_ de observabilidade, da natureza dos seus dados e das suas
tentativas de realizar amostragem de forma eficaz.

## Amostragem pela Cabeça
## Amostragem pela Cabeça {#head-sampling}

A amostragem pela cabeça (_head sampling_) é uma técnica de amostragem usada
para tomar uma decisão de amostragem o mais cedo possível. A decisão de amostrar
Expand Down
2 changes: 1 addition & 1 deletion content/pt/docs/concepts/signals/traces.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Para compreender como o rastreamento no OpenTelemetry funciona, vamos analisar
uma lista de componentes que terão um papel fundamental na instrumentação do
nosso código.

## Trace Provider
## Trace Provider {#tracer-provider}

Um Trace Provider (às vezes chamado de `TracerProvider`) é uma fábrica de
`rastros`. Na maioria das aplicações, um Trace Provider é inicializado uma vez e
Expand Down
2 changes: 1 addition & 1 deletion content/pt/docs/what-is-opentelemetry.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ pode ser estendido incluem:
Embora a maioria dos usuários possa não precisar estender o OpenTelemetry, o
projeto é projetado para tornar isso possível em quase todos os níveis.

## História
## História {#history}

O OpenTelemetry é um projeto da
[Cloud Native Computing Foundation (CNCF)](https://www.cncf.io) que é resultado
Expand Down
6 changes: 3 additions & 3 deletions data/registry-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@
},
"url": {
"type": "string",
"description": "The URL of the author",
"pattern": "^https:\\/\\/github\\.com\\/([a-zA-Z0-9](?:-?[a-zA-Z0-9]){0,38})$",
"errorMessage": "The URL of the author must be a valid GitHub user URL"
"description": "The URL of the author. This can be a website or a GitHub handle URL.",
"format": "uri",
"pattern": "^https://.*$"
}
},
"if": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ description:
behavior.
authors:
- name: Traefik Labs
url: https://github.com/immanuelfodor
urls:
website: https://traefik.io/traefik-hub/
docs: https://doc.traefik.io/traefik-hub/operations/metrics
createdAt: '2024-08-06'
createdAt: 2024-08-06
isNative: true
2 changes: 1 addition & 1 deletion data/registry/exporter-dotnet-inmemory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ createdAt: 2022-11-07
package:
registry: nuget
name: OpenTelemetry.Exporter.InMemory
version: 1.10.0-rc.1
version: 1.10.0
2 changes: 1 addition & 1 deletion data/registry/exporter-dotnet-prometheus-aspnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ createdAt: 2022-11-07
package:
registry: nuget
name: OpenTelemetry.Exporter.Prometheus.AspNetCore
version: 1.9.0-beta.2
version: 1.10.0-beta.1
2 changes: 1 addition & 1 deletion data/registry/exporter-dotnet-prometheus-httplistener.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ createdAt: 2022-11-07
package:
registry: nuget
name: OpenTelemetry.Exporter.Prometheus.HttpListener
version: 1.9.0-beta.2
version: 1.10.0-beta.1
2 changes: 1 addition & 1 deletion data/registry/exporter-js-sap-cloud-logging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ isFirstParty: false
package:
registry: npm
name: '@sap/opentelemetry-exporter-for-sap-cloud-logging'
version: 0.1.1
version: 0.2.0
2 changes: 1 addition & 1 deletion data/registry/instrumentation-ruby-elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ isNative: true
package:
registry: gems
name: elasticsearch
version: 8.15.0
version: 8.16.0
2 changes: 1 addition & 1 deletion scripts/check-i18n.sh
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ function main() {
for f in $TARGETS; do
((FILE_COUNT++))

LASTCOMMIT_FF=$(perl -ne "print \"\$1\" if /^$I18N_DLC_KEY:\\s*(.*)/" "$f")
LASTCOMMIT_FF=$(perl -ne "print \"\$1\" if /^$I18N_DLC_KEY:\\s*([a-f0-9]+)/i" "$f")
LASTCOMMIT="$LASTCOMMIT_FF"

if [[ $LIST_KIND == "ALL" && -n $COMMIT_HASH_ARG ]]; then
Expand Down
14 changes: 13 additions & 1 deletion static/refcache.json
Original file line number Diff line number Diff line change
Expand Up @@ -5255,6 +5255,10 @@
"StatusCode": 200,
"LastSeen": "2024-01-18T19:13:40.755331-05:00"
},
"https://github.com/immanuelfodor": {
"StatusCode": 200,
"LastSeen": "2024-11-13T13:16:21.346606655Z"
},
"https://github.com/instana/go-otel-exporter": {
"StatusCode": 200,
"LastSeen": "2024-01-18T19:10:14.475135-05:00"
Expand Down Expand Up @@ -8721,7 +8725,7 @@
},
"https://javadoc.io/doc/io.opentelemetry": {
"StatusCode": 200,
"LastSeen": "2024-11-13T15:33:58.49426-06:00"
"LastSeen": "2024-11-13T09:26:22.921349-05:00"
},
"https://javadoc.io/doc/io.opentelemetry/opentelemetry-exporter-prometheus/latest": {
"StatusCode": 200,
Expand Down Expand Up @@ -11743,6 +11747,10 @@
"StatusCode": 200,
"LastSeen": "2024-01-30T05:18:35.161372-05:00"
},
"https://repo1.maven.org/maven2/io/opentelemetry/instrumentation/opentelemetry-instrumentation-bom-alpha/2.10.0-alpha/opentelemetry-instrumentation-bom-alpha-2.10.0-alpha.pom": {
"StatusCode": 206,
"LastSeen": "2024-11-13T10:47:55.011955709Z"
},
"https://repo1.maven.org/maven2/io/opentelemetry/instrumentation/opentelemetry-instrumentation-bom-alpha/2.7.0-alpha/opentelemetry-instrumentation-bom-alpha-2.7.0-alpha.pom": {
"StatusCode": 206,
"LastSeen": "2024-10-23T20:20:08.34491-05:00"
Expand All @@ -11751,6 +11759,10 @@
"StatusCode": 206,
"LastSeen": "2024-10-23T20:19:21.596018-05:00"
},
"https://repo1.maven.org/maven2/io/opentelemetry/instrumentation/opentelemetry-instrumentation-bom/2.10.0/opentelemetry-instrumentation-bom-2.10.0.pom": {
"StatusCode": 206,
"LastSeen": "2024-11-13T10:47:53.144495226Z"
},
"https://repo1.maven.org/maven2/io/opentelemetry/instrumentation/opentelemetry-instrumentation-bom/2.7.0/opentelemetry-instrumentation-bom-2.7.0.pom": {
"StatusCode": 206,
"LastSeen": "2024-10-23T20:20:07.402964-05:00"
Expand Down

0 comments on commit 9ed1959

Please sign in to comment.