Skip to content

Commit

Permalink
add advance conf for otel-collector (#212)
Browse files Browse the repository at this point in the history
* add advance conf for otel-collector

* undo not relate change

* Apply suggestions from code review

Co-authored-by: Cijo Thomas <cithomas@microsoft.com>

* apply reviewer's suggestion

* apply reviewer's suggestion

* Apply suggestions from code review

Co-authored-by: Juliano Costa <julianocosta89@outlook.com>

* add changelog entry.

* fix markdown

* Apply suggestions from code review

Co-authored-by: JustWPH <2732352+wph95@users.noreply.github.com>

Co-authored-by: Cijo Thomas <cithomas@microsoft.com>
Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>
Co-authored-by: JustWPH <2732352+wph95@users.noreply.github.com>
  • Loading branch information
5 people authored Aug 4, 2022
1 parent 39d1ee5 commit 3ae87ca
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,5 @@ significant modifications will be credited to OpenTelemetry Authors.
([#253](https://github.com/open-telemetry/opentelemetry-demo/pull/253))
* Added explicit support for Kubernetes.
([#255](https://github.com/open-telemetry/opentelemetry-demo/pull/255))
* Added spanmetrics processor to otelcol
([#212](https://github.com/open-telemetry/opentelemetry-demo/pull/212))
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:

# Collector
otelcol:
image: otel/opentelemetry-collector:0.56.0
image: otel/opentelemetry-collector-contrib:0.56.0
container_name: otel-col
command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
volumes:
Expand Down
11 changes: 10 additions & 1 deletion src/otelcollector/otelcol-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ receivers:
protocols:
grpc:
http:
otlp/spanmetrics:
protocols:
grpc:
endpoint: "localhost:65535"

exporters:
jaeger:
Expand All @@ -16,14 +20,19 @@ exporters:

processors:
batch:
spanmetrics:
metrics_exporter: prometheus

service:
pipelines:
traces:
receivers: [otlp]
processors: [batch]
processors: [spanmetrics, batch]
exporters: [logging, jaeger]
metrics:
receivers: [otlp]
processors: [batch]
exporters: [prometheus, logging]
metrics/spanmetrics:
receivers: [ otlp/spanmetrics ]
exporters: [ prometheus, logging ]

0 comments on commit 3ae87ca

Please sign in to comment.