Skip to content

Commit

Permalink
Add kafka traces receiver (#489)
Browse files Browse the repository at this point in the history
  • Loading branch information
mapno authored Mar 29, 2021
1 parent 95f7741 commit 8ce3bb5
Show file tree
Hide file tree
Showing 432 changed files with 72,468 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ cross-compilation issue, but will return in v0.13.0.
`GrafanaAgent/<version>` (@rfratto)

- [ENHANCEMENT] Upgrade `go.opentelemetry.io/collector` to v0.21.0 (@mapno)

- [ENHANCEMENT] Add kafka trace receiver (@mapno)

# v0.13.0 (2021-02-25)

Expand Down
4 changes: 2 additions & 2 deletions docs/configuration-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -2019,8 +2019,8 @@ push_config:
[ retry_on_failure: <otlpexporter.retry_on_failure> ]

# Receiver configurations are mapped directly into the OpenTelmetry receivers block.
# At least one receiver is required.
# https://github.com/open-telemetry/opentelemetry-collector/blob/7d7ae2eb34b5d387627875c498d7f43619f37ee3/receiver/README.md
# At least one receiver is required. Supported receivers: otlp, jaeger, kafka, opencensus and zipkin.
# Documentation for each receiver can be found at https://github.com/open-telemetry/opentelemetry-collector/blob/7d7ae2eb34b5d387627875c498d7f43619f37ee3/receiver/README.md
receivers:

# A list of prometheus scrape configs. Targets discovered through these scrape configs have their __address__ matched against the ip on incoming spans.
Expand Down
2 changes: 1 addition & 1 deletion docs/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ developer team.

Grafana Agent supports collecting traces and sending them to Tempo using its
`tempo` subsystem. This is done by utilizing the upstream [OpenTelmetry Collector](https://github.com/open-telemetry/opentelemetry-collector).
The agent is capable of ingesting OpenTelemetry, OpenCensus, Jaeger or Zipkin spans.
The agent is capable of ingesting OpenTelemetry, OpenCensus, Jaeger, Zipkin or Kafka spans.
See documentation on how to configure [receivers](./configuration-reference.md#tempo_config).
The agent is capable of exporting to any OpenTelemetry GRPC compatible system.

Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -777,8 +777,6 @@ github.com/grafana/prometheus v1.8.2-0.20210218144103-50bc1c15f0c7 h1:Zq7JXdYsCH
github.com/grafana/prometheus v1.8.2-0.20210218144103-50bc1c15f0c7/go.mod h1:dv3B1syqmkrkmo665MPCU6L8PbTXIiUeg/OEQULLNxA=
github.com/grafana/tail v0.0.0-20201004203643-7aa4e4a91f03 h1:fGgFrAraMB0BaPfYumu+iulfDXwHm+GFyHA4xEtBqI8=
github.com/grafana/tail v0.0.0-20201004203643-7aa4e4a91f03/go.mod h1:GIMXMPB/lRAllP5rVDvcGif87ryO2hgD7tCtHMdHrho=
github.com/grafana/windows_exporter v0.15.1-0.20210322180643-3fd7f2178962 h1:QCmiK4yBLpLsdC7iVLhA6AmJei7ARkSg0CRR1us/0Tw=
github.com/grafana/windows_exporter v0.15.1-0.20210322180643-3fd7f2178962/go.mod h1:FZy59lGh3jUzgaaS6jYzzTfk1NTNrH5+UK3NCeQF4Ao=
github.com/grafana/windows_exporter v0.15.1-0.20210325142439-9e8f66d53433 h1:3WaMH1VOp8T2gCwjM5iHtH2SW3BpN8pAmRhzy9TYVAA=
github.com/grafana/windows_exporter v0.15.1-0.20210325142439-9e8f66d53433/go.mod h1:FZy59lGh3jUzgaaS6jYzzTfk1NTNrH5+UK3NCeQF4Ao=
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
Expand Down
2 changes: 2 additions & 0 deletions pkg/tempo/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"go.opentelemetry.io/collector/processor/attributesprocessor"
"go.opentelemetry.io/collector/processor/batchprocessor"
"go.opentelemetry.io/collector/receiver/jaegerreceiver"
"go.opentelemetry.io/collector/receiver/kafkareceiver"
"go.opentelemetry.io/collector/receiver/opencensusreceiver"
"go.opentelemetry.io/collector/receiver/otlpreceiver"
"go.opentelemetry.io/collector/receiver/zipkinreceiver"
Expand Down Expand Up @@ -238,6 +239,7 @@ func tracingFactories() (component.Factories, error) {
zipkinreceiver.NewFactory(),
otlpreceiver.NewFactory(),
opencensusreceiver.NewFactory(),
kafkareceiver.NewFactory(),
)
if err != nil {
return component.Factories{}, err
Expand Down
29 changes: 29 additions & 0 deletions vendor/github.com/Shopify/sarama/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

77 changes: 77 additions & 0 deletions vendor/github.com/Shopify/sarama/.golangci.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8ce3bb5

Please sign in to comment.