Skip to content

Commit

Permalink
Merge branch 'open-telemetry:main' into optimize-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
SusanGithaigaN authored Nov 28, 2024
2 parents ee8b037 + 2ddb450 commit 58eaa35
Show file tree
Hide file tree
Showing 19 changed files with 103 additions and 113 deletions.
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
!/layouts/shortcodes
/layouts/shortcodes/*
!/layouts/shortcodes/docs
/layouts/shortcodes/pt
!/layouts/shortcodes/es
!/layouts/shortcodes/pt

/content/ja
/content/zh
Expand Down
22 changes: 9 additions & 13 deletions content/en/community/end-user/slack-channel.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,17 @@ description: >-
weight: 40
---

Previously, we had a private channel to provide a space for end users to discuss
adoption and implementation issues while allowing them to maintain a layer of
privacy and to meet compliance concerns. Now that the project and community have
grown, and with the transition of the End User WG to End User SIG, we believe
that this private channel is no longer needed.
Join our Slack channel to connect with other OpenTelemetry end users!

As of April 2024, we will begin shifting all of our communications to the
[`#otel-sig-end-user`](https://cloud-native.slack.com/archives/C01RT3MSWGZ)
channel (previously named the `#otel-user-research` channel), and will be
archiving the private channel by **April 30, 2024**.
First, [request an invitation](https://slack.cncf.io/) to CNCF's Slack instance.
Next, join
[`#otel-sig-end-user`](https://cloud-native.slack.com/archives/C01RT3MSWGZ), and
introduce yourself if you'd like.

We encourage you to join us over at
[`#otel-sig-end-user`](https://cloud-native.slack.com/archives/C01RT3MSWGZ) to
learn about our new charter, what you can expect from us as an end user, and
more. Note the following:
We encourage questions and discussions about adoption and implementation. You
can also hear about upcoming events and get a chance to contribute to the
project by participating in surveys and user feedback sessions. Note the
following:

- Troubleshooting or tactical SDK specific questions are still best directed to
individual SIG channels or the
Expand Down
12 changes: 6 additions & 6 deletions content/en/docs/collector/internal-telemetry.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,14 @@ service:
exporter:
otlp:
protocol: grpc/protobuf
endpoint: localhost:14317
endpoint: http://localhost:14317
traces:
processors:
batch:
exporter:
otlp:
protocol: grpc/protobuf
endpoint: localhost:14317
- batch:
exporter:
otlp:
protocol: grpc/protobuf
endpoint: http://localhost:14317
```

{{% alert title="Caution" color="warning" %}}
Expand Down
3 changes: 3 additions & 0 deletions content/en/docs/concepts/signals/metrics.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ The instrument kind is one of the following:
size).
- **Gauge**: Measures a current value at the time it is read. An example would
be the fuel gauge in a vehicle. Gauges are asynchronous.
- **Asynchronous Gauge**: Same as the **Gauge**, but is collected once for each
export. Could be used if you don't have access to the continuous changes, but
only to the aggregated value.
- **Histogram**: A client-side aggregation of values, such as request latencies.
A histogram is a good choice if you are interested in value statistics. For
example: How many requests take fewer than 1s?
Expand Down
72 changes: 4 additions & 68 deletions content/en/docs/kubernetes/collector/components.md
Original file line number Diff line number Diff line change
Expand Up @@ -283,77 +283,13 @@ filelog:
exclude:
# Exclude logs from all containers named otel-collector
- /var/log/pods/*/otel-collector/*.log
start_at: beginning
start_at: end
include_file_path: true
include_file_name: false
operators:
# Find out which format is used by kubernetes
- type: router
id: get-format
routes:
- output: parser-docker
expr: 'body matches "^\\{"'
- output: parser-crio
expr: 'body matches "^[^ Z]+ "'
- output: parser-containerd
expr: 'body matches "^[^ Z]+Z"'
# Parse CRI-O format
- type: regex_parser
id: parser-crio
regex:
'^(?P<time>[^ Z]+) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*)
?(?P<log>.*)$'
output: extract_metadata_from_filepath
timestamp:
parse_from: attributes.time
layout_type: gotime
layout: '2006-01-02T15:04:05.999999999Z07:00'
# Parse CRI-Containerd format
- type: regex_parser
id: parser-containerd
regex:
'^(?P<time>[^ ^Z]+Z) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*)
?(?P<log>.*)$'
output: extract_metadata_from_filepath
timestamp:
parse_from: attributes.time
layout: '%Y-%m-%dT%H:%M:%S.%LZ'
# Parse Docker format
- type: json_parser
id: parser-docker
output: extract_metadata_from_filepath
timestamp:
parse_from: attributes.time
layout: '%Y-%m-%dT%H:%M:%S.%LZ'
- type: move
from: attributes.log
to: body
# Extract metadata from file path
- type: regex_parser
id: extract_metadata_from_filepath
regex: '^.*\/(?P<namespace>[^_]+)_(?P<pod_name>[^_]+)_(?P<uid>[a-f0-9\-]{36})\/(?P<container_name>[^\._]+)\/(?P<restart_count>\d+)\.log$'
parse_from: attributes["log.file.path"]
cache:
size: 128 # default maximum amount of Pods per Node is 110
# Rename attributes
- type: move
from: attributes.stream
to: attributes["log.iostream"]
- type: move
from: attributes.container_name
to: resource["k8s.container.name"]
- type: move
from: attributes.namespace
to: resource["k8s.namespace.name"]
- type: move
from: attributes.pod_name
to: resource["k8s.pod.name"]
- type: move
from: attributes.restart_count
to: resource["k8s.container.restart_count"]
- type: move
from: attributes.uid
to: resource["k8s.pod.uid"]
# parse container logs
- type: container
id: container-parser
```

For Filelog Receiver configuration details, see
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/go/instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ OpenTelemetry Go currently supports the following instruments:
- Histogram, a synchronous instrument that supports arbitrary values that are
statistically meaningful, such as histograms, summaries, or percentile
- Synchronous Gauge, a synchronous instrument that supports non-additive values,
such as room temperature.
such as room temperature
- Asynchronous Gauge, an asynchronous instrument that supports non-additive
values, such as room temperature
- UpDownCounter, a synchronous instrument that supports increments and
Expand Down
27 changes: 27 additions & 0 deletions content/zh/docs/concepts/signals/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
title: 信号
description: 了解 OpenTelemetry 支持的遥测类别
aliases:
- /docs/concepts/data-sources
- /docs/concepts/otel-concepts
weight: 11
default_lang_commit: e7c30e9
---

OpenTelemetry 的目的是收集、处理和导出 **[信号][]**
信号是系统输出,描述了操作系统和平台上运行的应用程序的底层活动。
信号可以是你希望在特定时间点测量的某项指标,如温度或内存使用率,
也可以是贯穿分布式系统组件的事件,你希望对其进行跟踪。
你可以将不同的信号组合在一起,从不同角度观察同一种技术的内部运作方式。

目前,OpenTelemetry 支持以下类型的信号:

- [追踪(Trace)](/docs/concepts/signals/traces)
- [指标 (Metric)](/docs/concepts/signals/metrics)
- [日志 (Log)](/docs/concepts/signals/logs)
- [行李 (Baggage)](/docs/concepts/signals/baggage)

**事件**是一种特定类型的日志,而
[**profiles** 正在由 Profiling 工作组开发](https://github.com/open-telemetry/oteps/blob/main/text/profiles/0212-profiling-vision.md)

[信号]: /docs/specs/otel/glossary/#signals
3 changes: 3 additions & 0 deletions data/ecosystem/adopters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
url: https://bureau.id/
components: [Collector, Python, Go, Lambda]
reference: 'https://tech.bureau.id/connecting-the-dots-with-opentelemetry-part-ii-5ea5f6b06c29'
referenceTitle: blog post
contact: https://github.com/ethicalmohit
- name: Care.com
url: https://www.care.com
Expand All @@ -28,6 +29,7 @@
url: https://dyte.io
components: [Go, Javascript]
reference: 'https://dyte.io/blog/opentelemetry-at-dyte-part-i/'
referenceTitle: blog post
contact: https://github.com/ethicalmohit
- name: eBay
url: https://www.ebay.com
Expand Down Expand Up @@ -127,6 +129,7 @@
url: https://www.vtex.com/
components: [Collector, Go, JavaScript, .NET]
reference: 'https://colocatedeventseu2023.sched.com/event/1Jo8E/ingesting-65-tb-of-telemetry-data-daily-through-open-telemetry-protocol-and-collectors-gustavo-pantuza-vtex'
referenceTitle: presentation
contact: '[email protected]'
- name: Wandera
url: https://www.wandera.com/
Expand Down
6 changes: 6 additions & 0 deletions data/ecosystem/vendors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,12 @@
contact: https://github.com/adnanrahic
oss: true
commercial: true
- name: Alauda
nativeOTLP: true
url: https://www.alauda.io/community/143237
contact: [email protected]
oss: false
commercial: true
- name: Alibaba Cloud
nativeOTLP: true
url: https://www.alibabacloud.com/help/en/arms/tracing-analysis/get-started-with-tracing-analysis
Expand Down
2 changes: 1 addition & 1 deletion data/registry-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
"description": "The type of the entry",
"enum": [
"application integration",
"confmap provider",
"core",
"exporter",
"extension",
"instrumentation",
"log-bridge",
"processor",
"provider",
"receiver",
"resource-detector",
"utilities"
Expand Down
2 changes: 1 addition & 1 deletion data/registry/collector-confmap-provider-envprovider.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# cSpell:ignore confmap, envprovider
title: Collector Environment Variable Provider
registryType: confmap provider
registryType: provider
language: collector
tags:
- go
Expand Down
2 changes: 1 addition & 1 deletion data/registry/collector-confmap-provider-fileprovider.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# cSpell:ignore confmap, fileprovider
title: Collector File Provider
registryType: confmap provider
registryType: provider
language: collector
tags:
- go
Expand Down
2 changes: 1 addition & 1 deletion data/registry/collector-confmap-provider-httpprovider.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# cSpell:ignore confmap, httpprovider
title: Collector HTTP Provider
registryType: confmap provider
registryType: provider
language: collector
tags:
- go
Expand Down
2 changes: 1 addition & 1 deletion data/registry/collector-confmap-provider-httpsprovider.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# cSpell:ignore confmap, httpsprovider
title: Collector HTTPS Provider
registryType: confmap provider
registryType: provider
language: collector
tags:
- go
Expand Down
2 changes: 1 addition & 1 deletion data/registry/collector-confmap-provider-yamlprovider.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# cSpell:ignore confmap, yamlprovider
title: Collector YAML Provider
registryType: confmap provider
registryType: provider
language: collector
tags:
- go
Expand Down
21 changes: 12 additions & 9 deletions layouts/shortcodes/es/docs/languages/instrumentation-intro.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
[Instrumentar](/docs/concepts/instrumentation/) consiste en añadir el código de observabilidad a una app.
[Instrumentar](/docs/concepts/instrumentation/) consiste en añadir el código de
observabilidad a una app.

Si estás instrumentando una app, necesitas usar el SDK de OpenTelemetry para tu lenguaje.
Luego debes usar el SDK para inicializar OpenTelemetry y la API para instrumentar tu código.
Esto emitirá telemetría desde tu app, y de cualquier librería que hayas instalado que
también esté instrumentada.
Si estás instrumentando una app, necesitas usar el SDK de OpenTelemetry para tu
lenguaje. Luego debes usar el SDK para inicializar OpenTelemetry y la API para
instrumentar tu código. Esto emitirá telemetría desde tu app, y de cualquier
librería que hayas instalado que también esté instrumentada.

Si estás instrumentando una librería, tan solo instala el paquete de OpenTelemetry API para tu lenguaje.
Tu librería no emitirá telemetría por si sola. Solo lo hará cuando sea parte de una app que use el SDK
de OpenTelemetry. Para más información sobre instrumentación de librerías, consulta
Si estás instrumentando una librería, tan solo instala el paquete de
OpenTelemetry API para tu lenguaje. Tu librería no emitirá telemetría por si
sola. Solo lo hará cuando sea parte de una app que use el SDK de OpenTelemetry.
Para más información sobre instrumentación de librerías, consulta
[Librerías](/docs/concepts/instrumentation/libraries/).

Para más información sobre la API y el SDK de OpenTelemetry, consulta la [especificación](/docs/specs/otel/).
Para más información sobre la API y el SDK de OpenTelemetry, consulta la
[especificación](/docs/specs/otel/).
16 changes: 9 additions & 7 deletions layouts/shortcodes/pt/docs/languages/index-intro.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/*
default_lang_commit: 2e21274a01a24a62c67595591d8f4255bef640fc
*/ -}}
{{ $prettier_ignore := `
*/ -}} {{ $prettier_ignore := `

<!-- prettier-ignore -->
` -}}
Expand All @@ -13,15 +12,18 @@ default_lang_commit: 2e21274a01a24a62c67595591d8f4255bef640fc
{{ $metricsStatus := partial "docs/get-signal-status.html" (dict "lang" $lang "signal" "metrics") -}}
{{ $logsStatus := partial "docs/get-signal-status.html" (dict "lang" $lang "signal" "logs") -}}

Esta é a documentação do OpenTelemetry para a linguagem {{ $name }}. O OpenTelemetry é um
framework de observabilidade -- API, SDKs, e ferramentas que são desenvolvidas para auxiliar na
geração e coleta de dados de telemetria de aplicações, como métricas, logs e rastros. Esta documentação foi criada para te auxiliar a entender como começar a utilizar o OpenTelemetry em {{ $name }}.
Esta é a documentação do OpenTelemetry para a linguagem {{ $name }}. O
OpenTelemetry é um framework de observabilidade -- API, SDKs, e ferramentas que
são desenvolvidas para auxiliar na geração e coleta de dados de telemetria de
aplicações, como métricas, logs e rastros. Esta documentação foi criada para te
auxiliar a entender como começar a utilizar o OpenTelemetry em {{ $name }}.

## Estado e Lançamentos

O estado atual dos principais componentes funcionais do OpenTelemetry para {{ $name }} é o seguinte:
O estado atual dos principais componentes funcionais do OpenTelemetry para
{{ $name }} é o seguinte:

| Rastros | Métricas | Logs |
| Rastros | Métricas | Logs |
| ------------------- | -------------------- | ----------------- |
| {{ $tracesStatus }} | {{ $metricsStatus }} | {{ $logsStatus }} |

Expand Down
13 changes: 11 additions & 2 deletions layouts/shortcodes/pt/docs/languages/resources-intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ default_lang_commit: a1740fd934e595f1396f2eb82a58a80824369b09
{{ $resourceHRef = "/docs/specs/otel/resource/sdk/" -}}
{{ end -}}

Um [recurso]({{ $resourceHRef }}) representa a entidade que está gerando telemetria como atributos do recurso. Por exemplo, um {{ $processWord }} que está gerando telemetria e que está sendo executado em um _container_ no Kubernetes tem o nome de um {{ $processWord }}, um nome de _pod_, um _namespace_ e possivelmente um nome de _deployment_. Todos esses quatro atributos podem ser incluídos em um recurso.
Um [recurso]({{ $resourceHRef }}) representa a entidade que está gerando
telemetria como atributos do recurso. Por exemplo, um {{ $processWord }} que
está gerando telemetria e que está sendo executado em um _container_ no
Kubernetes tem o nome de um {{ $processWord }}, um nome de _pod_, um _namespace_
e possivelmente um nome de _deployment_. Todos esses quatro atributos podem ser
incluídos em um recurso.

No seu _backend_ de observabilidade, você pode usar as informações de um recurso para refinar a investigação de comportamentos relevantes. Por exemplo, se seus dados de rastros ou métricas indicarem latência no seu sistema, você pode restringir a investigação para um determinado _container_, _pod_ ou _deployment_ do Kubernetes.
No seu _backend_ de observabilidade, você pode usar as informações de um recurso
para refinar a investigação de comportamentos relevantes. Por exemplo, se seus
dados de rastros ou métricas indicarem latência no seu sistema, você pode
restringir a investigação para um determinado _container_, _pod_ ou _deployment_
do Kubernetes.
4 changes: 4 additions & 0 deletions static/refcache.json
Original file line number Diff line number Diff line change
Expand Up @@ -13147,6 +13147,10 @@
"StatusCode": 206,
"LastSeen": "2024-01-30T16:14:59.93877-05:00"
},
"https://www.alauda.io/community/143237": {
"StatusCode": 200,
"LastSeen": "2024-11-28T11:47:57.828593+01:00"
},
"https://www.alibabacloud.com/": {
"StatusCode": 200,
"LastSeen": "2024-01-18T19:36:43.889402-05:00"
Expand Down

0 comments on commit 58eaa35

Please sign in to comment.