From e84a260ff8b8b1421bd19261894432ce413d0dd2 Mon Sep 17 00:00:00 2001 From: Serena Zamarripa Date: Wed, 14 Dec 2022 14:21:38 -0600 Subject: [PATCH 1/3] Update config file --- talaria.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/talaria.yaml b/talaria.yaml index e9b29fca..2c246ffb 100644 --- a/talaria.yaml +++ b/talaria.yaml @@ -573,7 +573,7 @@ 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" @@ -581,7 +581,8 @@ tracing: # 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" From 7cab5b3fdce74d6305734cf0cd887b60f06d6578 Mon Sep 17 00:00:00 2001 From: Serena Zamarripa Date: Wed, 14 Dec 2022 14:24:27 -0600 Subject: [PATCH 2/3] Update Spruce config file --- .release/docker/talaria_spruce.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.release/docker/talaria_spruce.yaml b/.release/docker/talaria_spruce.yaml index 71538955..34446262 100644 --- a/.release/docker/talaria_spruce.yaml +++ b/.release/docker/talaria_spruce.yaml @@ -495,7 +495,7 @@ 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" )) @@ -503,5 +503,6 @@ tracing: # 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" )) From 5b6469dcf77395cf06cd2a9c108517afffa562b1 Mon Sep 17 00:00:00 2001 From: Serena Zamarripa Date: Thu, 15 Dec 2022 10:07:34 -0600 Subject: [PATCH 3/3] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2aacb22..9792307c 100644 --- a/CHANGELOG.md +++ b/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)