Merge pull request #282 from xmidt-org/addOtlpConfigs

Update Configs for OTLP Support

.release/docker/talaria_spruce.yaml

@@ -495,13 +495,14 @@ service:
 # 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: (( grab $TRACING_PROVIDER_NAME || "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 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: (( grab $TRACING_PROVIDER_ENDPOINT || "http://zipkin:9411/api/v2/spans" ))

CHANGELOG.md

@@ -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]
+- Update configs and documentation for the introduction of OTLP in Candlelight [#282](https://github.com/xmidt-org/talaria/pull/282)
 
 ## [v0.6.10]
 - Remove several unused build files and update the docker images to work. [#272](https://github.com/xmidt-org/talaria/pull/272)

talaria.yaml

@@ -573,15 +573,16 @@ service:
 # 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 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: "http://localhost:9411/api/v2/spans"