Skip to content

Commit

Permalink
[collector] - allow for an extras configuration (open-telemetry#246)
Browse files Browse the repository at this point in the history
* use extras configuration for collector

* add extras collector config

* add extras collector config
  • Loading branch information
puckpuck authored Aug 3, 2022
1 parent d97eaa6 commit 26f98f6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ significant modifications will be credited to OpenTelemetry Authors.
([#189](https://github.com/open-telemetry/opentelemetry-demo/pull/189))
* Simplified repo name and dropped the '-webstore' suffix in every place
([#225](https://github.com/open-telemetry/opentelemetry-demo/pull/225))
* Added ability for repo forks to specify additional collector settings
([#246](https://github.com/open-telemetry/opentelemetry-demo/pull/246))
* Add metrics endpoint in adservice to send metrics from java agent
([#237](https://github.com/open-telemetry/opentelemetry-demo/pull/237))
* Support override java agent jar
Expand Down
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ services:
otelcol:
image: otel/opentelemetry-collector:0.56.0
container_name: otel-col
command: [ "--config=/etc/otelcol-config.yml" ]
command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
volumes:
- ./src/otelcollector/otelcol-config.yml:/etc/otelcol-config.yml
- ./src/otelcollector/otelcol-config-extras.yml:/etc/otelcol-config-extras.yml
ports:
- "4317"
- "4318"
Expand Down
2 changes: 2 additions & 0 deletions src/otelcollector/otelcol-config-extras.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# extra settings to be merged into OpenTelemetry Collector configuration
# do not delete this file

0 comments on commit 26f98f6

Please sign in to comment.