Skip to content

Commit

Permalink
Merge branch 'main' into firstParty-flag-4-php
Browse files Browse the repository at this point in the history
  • Loading branch information
haidong authored Sep 24, 2024
2 parents cdfe0aa + f7cb8b6 commit 0c5e325
Show file tree
Hide file tree
Showing 10 changed files with 691 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .cspell/pt-palavras.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
desserializa
autoinstrumentação
autoconsistentes
serialização
verbosidade
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
!/layouts/shortcodes
/layouts/shortcodes/*
!/layouts/shortcodes/docs
/layouts/shortcodes/pt

/content/ja
/content/zh
Expand Down
8 changes: 3 additions & 5 deletions content/en/blog/2024/otel-operator-q-and-a/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ is a
that manages OTel for you in your Kubernetes cluster to make life a little
easier. It does the following:

- Manages deployment of the
[OpenTelemetry Collector](http://localhost:1313/docs/collector/), supported by
the
- Manages deployment of the [OpenTelemetry Collector](/docs/collector/),
supported by the
[`OpenTelemetryCollector`](https://github.com/open-telemetry/opentelemetry-operator?tab=readme-ov-file#getting-started)
[custom resource (CR)](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/).
- Manages the configuration of a fleet of OpenTelemetry Collectors via
Expand All @@ -42,8 +41,7 @@ cool things, so I thought it might be helpful to share some little OTel Operator
goodies that I’ve picked up along the way, in the form of a Q&A.

Please note that this post assumes that you have some familiarity with
OpenTelemetry, the
[OpenTelemetry Collector](http://localhost:1313/docs/collector/), the
OpenTelemetry, the [OpenTelemetry Collector](/docs/collector/), the
[OpenTelemetry Operator](https://github.com/open-telemetry/opentelemetry-operator)
(including the
[Target Allocator](https://adri-v.medium.com/prometheus-opentelemetry-better-together-41dc637f2292)),
Expand Down
58 changes: 58 additions & 0 deletions content/en/docs/collector/internal-telemetry.md
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,64 @@ libraries. {{% /alert %}}
| `rpc_server_response_size` | Measures the size of RPC response messages (uncompressed). | Histogram |
| `rpc_server_responses_per_rpc` | Measures the number of messages sent per RPC. Should be 1 for all non-streaming RPCs. | Histogram |

### Telemetry maturity levels

#### Traces

Tracing instrumentation is still under active development, and changes might be
made to span names, attached attributes, instrumented endpoints, or other
aspects of the telemetry. Until this feature graduates to stable, there are no
guarantees of backwards compatibility for tracing instrumentation.

#### Metrics

The Collector's metrics follow a four-stage lifecycle:

> Alpha metric → Stable metric → Deprecated metric → Deleted metric

##### Alpha

Alpha metrics have no stability guarantees. These metrics can be modified or
deleted at any time.

##### Stable

Stable metrics are guaranteed to not change. This means:

- A stable metric without a deprecated signature will not be deleted or renamed.
- A stable metric's type and attributes will not be modified.

##### Deprecated

Deprecated metrics are slated for deletion but are still available for use. The
description of these metrics include an annotation about the version in which
they became deprecated. For example:

Before deprecation:

```sh
# HELP otelcol_exporter_queue_size this counts things
# TYPE otelcol_exporter_queue_size counter
otelcol_exporter_queue_size 0
```

After deprecation:

```sh
# HELP otelcol_exporter_queue_size (Deprecated since 1.15.0) this counts things
# TYPE otelcol_exporter_queue_size counter
otelcol_exporter_queue_size 0
```

##### Deleted

Deleted metrics are no longer published and cannot be used.

#### Logs

Individual log entries and their formatting might change from one release to the
next. There are no stability guarantees at this time.

### Events observable with internal logs

The Collector logs the following internal events:
Expand Down
3 changes: 1 addition & 2 deletions content/en/docs/languages/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ redirects: [{ from: /docs/instrumentation/*, to: ':splat' }]
OpenTelemetry code [instrumentation][] is supported for the languages listed in
the [Statuses and Releases](#status-and-releases) table below. Unofficial
implementations for [other languages](/docs/languages/other) are available as
well. You can find them in the
[registry](http://localhost:1313/ecosystem/registry/).
well. You can find them in the [registry](/ecosystem/registry/).

For Go, .NET, PHP, Python, Java and JavaScript you can use
[zero-code solutions](/docs/zero-code) to add instrumentation to your
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/java/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ Declarative configuration is currently under development. It allows for YAML
file-based configuration as described in
[opentelemetry-configuration](https://github.com/open-telemetry/opentelemetry-configuration)
and
[declarative configuration](http://localhost:1313/docs/specs/otel/configuration/#declarative-configuration).
[declarative configuration](/docs/specs/otel/configuration/#declarative-configuration).

To use, include
`io.opentelemetry:opentelemetry-sdk-extension-incubator:{{% param vers.otel %}}-alpha`
Expand Down
Loading

0 comments on commit 0c5e325

Please sign in to comment.