Skip to content

Commit

Permalink
Merge pull request #346 from xmidt-org/renaz6/updateCandlelight
Browse files Browse the repository at this point in the history
Update Configs for OTLP support
  • Loading branch information
denopink committed Jan 10, 2023
2 parents 7ddae3e + ea4e303 commit 1aad8e7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
- Updated tracing configuration documentation in tr1d1um.yaml to reflect changes in Candlelight [#346](https://github.com/xmidt-org/tr1d1um/pull/346)
- [https://github.com/xmidt-org/tr1d1um/issues/340](https://github.com/xmidt-org/tr1d1um/issues/340)
- [v2 & v3 endpoints are not enforcing capabilities xmidt-org/tr1d1um#342](https://github.com/xmidt-org/tr1d1um/issues/342)
- [v3 endpoint is not validating webhooks #341](https://github.com/xmidt-org/tr1d1um/issues/341)
Expand Down
9 changes: 5 additions & 4 deletions tr1d1um.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -379,19 +379,20 @@ requestMaxRetries: 2
# tracing provides configuration around traces using OpenTelemetry.
# (Optional). By default, a 'noop' tracer provider is used and tracing is disabled.
tracing:
# provider is the provider name. Currently, stdout, jaegar and zipkin are supported.
# provider is the name of the trace provider to use. Currently, otlp/grpc, otlp/http, stdout, jaeger and zipkin are supported.
# 'noop' can also be used as provider to explicitly disable tracing.
provider: "noop"

# skipTraceExport only applies when provider is stdout. Set skipTraceExport to true
# so that trace information is not written to stdout.
# skipTraceExport: true

# endpoint is where trace information should be routed. Applies to zipkin and jaegar.
# endpoint: "http://localhost:9411/api/v2/spans"
# endpoint is where trace information should be routed. Applies to otlp, zipkin, and jaegar. OTLP/gRPC uses port 4317 by default.
# OTLP/HTTP uses port 4318 by default.
# endpoint: "localhost:4317"

# previousVersionSupport allows us to support two different major versions of
# the API at the same time from the same application. When this is true,
# tr1d1um will support both "/v2" and "/v3" endpoints. When false, only "/v3"
# endpoints will be supported.
previousVersionSupport: true
previousVersionSupport: true

0 comments on commit 1aad8e7

Please sign in to comment.