Skip to content

Commit

Permalink
Merge branch 'main' into kafka-queue-problems-featureflag
Browse files Browse the repository at this point in the history
  • Loading branch information
austinlparker authored Apr 23, 2024
2 parents e8d09bc + 05982b2 commit ded6d88
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ the release.
([#1522](https://github.com/open-telemetry/opentelemetry-demo/pull/1522))
* [kafka] add kafkaQueueProblems feature flag
([#1528](https://github.com/open-telemetry/opentelemetry-demo/pull/1528))
* [otelcollector] Add `redisreceiver`
([#1537](https://github.com/open-telemetry/opentelemetry-demo/pull/1537))

## 1.9.0

Expand Down
5 changes: 4 additions & 1 deletion src/otelcollector/otelcol-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ receivers:
httpcheck/frontendproxy:
targets:
- endpoint: http://frontendproxy:${env:ENVOY_PORT}
redis:
endpoint: "redis-cart:6379"
collection_interval: 10s

exporters:
debug:
Expand Down Expand Up @@ -44,7 +47,7 @@ service:
processors: [batch]
exporters: [otlp, debug, spanmetrics]
metrics:
receivers: [httpcheck/frontendproxy, otlp, spanmetrics]
receivers: [httpcheck/frontendproxy, redis, otlp, spanmetrics]
processors: [batch]
exporters: [otlphttp/prometheus, debug]
logs:
Expand Down
7 changes: 5 additions & 2 deletions src/productcatalogservice/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,12 @@ func main() {
}
log.Println("Shutdown meter provider")
}()
openfeature.SetProvider(flagd.NewProvider())
err := openfeature.SetProvider(flagd.NewProvider())
if err != nil {
log.Fatal(err)
}

err := runtime.Start(runtime.WithMinimumReadMemStatsInterval(time.Second))
err = runtime.Start(runtime.WithMinimumReadMemStatsInterval(time.Second))
if err != nil {
log.Fatal(err)
}
Expand Down

0 comments on commit ded6d88

Please sign in to comment.