File tree Expand file tree Collapse file tree 3 files changed +22
-2
lines changed Expand file tree Collapse file tree 3 files changed +22
-2
lines changed Original file line number Diff line number Diff line change @@ -13,6 +13,8 @@ the release.
13
13
([ #1707 ] ( https://github.com/open-telemetry/opentelemetry-demo/pull/1707 ) )
14
14
* [ chore] Fix gen-proto for accountingservice
15
15
([ #1709 ] ( https://github.com/open-telemetry/opentelemetry-demo/pull/1709 ) )
16
+ * [ chore] Add depends on to otelcol to wait on healthy opensearch
17
+ ([ #1724 ] ( https://github.com/open-telemetry/opentelemetry-demo/pull/1724 ) )
16
18
* [ accountingservice] bump OpenTelemetry .NET Automatic Instrumentation
17
19
to 1.8.0 together with other dependencies
18
20
([ #1727 ] ( https://github.com/open-telemetry/opentelemetry-demo/pull/1727 ) )
Original file line number Diff line number Diff line change @@ -593,7 +593,10 @@ services:
593
593
- " ${OTEL_COLLECTOR_PORT_GRPC}"
594
594
- " ${OTEL_COLLECTOR_PORT_HTTP}"
595
595
depends_on :
596
- - jaeger
596
+ jaeger :
597
+ condition : service_started
598
+ opensearch :
599
+ condition : service_healthy
597
600
logging : *logging
598
601
environment :
599
602
- ENVOY_PORT
@@ -653,4 +656,10 @@ services:
653
656
hard : 65536
654
657
ports :
655
658
- " 9200"
659
+ healthcheck :
660
+ test : curl -s http://localhost:9200/_cluster/health | grep status | grep -q '\\(green\\|yellow\\)'
661
+ start_period : 10s
662
+ interval : 5s
663
+ timeout : 10s
664
+ retries : 10
656
665
logging : *logging
Original file line number Diff line number Diff line change @@ -704,7 +704,10 @@ services:
704
704
- " ${OTEL_COLLECTOR_PORT_GRPC}"
705
705
- " ${OTEL_COLLECTOR_PORT_HTTP}"
706
706
depends_on :
707
- - jaeger
707
+ jaeger :
708
+ condition : service_started
709
+ opensearch :
710
+ condition : service_healthy
708
711
logging : *logging
709
712
environment :
710
713
- ENVOY_PORT
@@ -764,4 +767,10 @@ services:
764
767
hard : 65536
765
768
ports :
766
769
- " 9200"
770
+ healthcheck :
771
+ test : curl -s http://localhost:9200/_cluster/health | grep -q '"status":"green"'
772
+ start_period : 10s
773
+ interval : 5s
774
+ timeout : 10s
775
+ retries : 10
767
776
logging : *logging
You can’t perform that action at this time.
0 commit comments