Skip to content

Commit

Permalink
Merge branch 'open-telemetry:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
horovits authored Dec 3, 2024
2 parents 76e994b + 4807346 commit 96d3720
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 5 deletions.
2 changes: 1 addition & 1 deletion content/en/blog/2024/scaling-collectors.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Create a file named `deploy-opentelemetry.yml` in the same directory as your
tasks:
- name: Install OpenTelemetry Collector
ansible.builtin.include_role:
name: opentelemetry_collectorr
name: opentelemetry_collector
vars:
otel_collector_receivers:
hostmetrics:
Expand Down
26 changes: 24 additions & 2 deletions content/en/docs/collector/internal-telemetry.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,21 @@ journalctl | grep otelcol | grep Error

{{% /tab %}} {{< /tabpane >}}

The following configuration can be used to emit internal logs from the Collector
to an OTLP/gRPC backend:

```yaml
service:
telemetry:
logs:
processors:
- batch:
exporter:
otlp:
protocol: grpc/protobuf
endpoint: https://backend:4317
```

### Configure internal traces

The Collector does not expose traces by default, but it can be configured to.
Expand Down Expand Up @@ -141,8 +156,8 @@ Note that the `tracer_provider` section there corresponds to `traces` here.
The Collector can be configured to push its own telemetry to an
[OTLP receiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver)
and send the data through configured pipelines. In the following example, the
Collector is configured to push metrics and traces every 10s using OTLP gRPC to
`localhost:14317`:
Collector is configured to push metrics, traces, and logs every 10s using OTLP
gRPC to `localhost:14317`:

```yaml
receivers:
Expand Down Expand Up @@ -176,6 +191,13 @@ service:
otlp:
protocol: grpc/protobuf
endpoint: http://localhost:14317
logs:
processors:
- batch:
exporter:
otlp:
protocol: grpc/protobuf
endpoint: http://localhost:14317
```

{{% alert title="Caution" color="warning" %}}
Expand Down
4 changes: 2 additions & 2 deletions data/instrumentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ rust:
name: Rust
status:
traces: beta
metrics: alpha
logs: alpha
metrics: beta
logs: beta
swift:
name: Swift
status:
Expand Down

0 comments on commit 96d3720

Please sign in to comment.