From 78dcc6bc2e27a4100e4b117155edd034bac4fa86 Mon Sep 17 00:00:00 2001 From: Nishchay Malhotra Date: Tue, 26 Mar 2024 22:46:26 +0530 Subject: [PATCH] Added header null check and changelog Signed-off-by: Nishchay Malhotra --- CHANGELOG.md | 1 + .../java/org/opensearch/telemetry/tracing/DefaultTracer.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a56ea61554bfc..9d8eb0032c0fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -116,6 +116,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Make search query counters dynamic to support all query types ([#12601](https://github.com/opensearch-project/OpenSearch/pull/12601)) - [Tiered caching] Add policies controlling which values can enter pluggable caches [EXPERIMENTAL] ([#12542](https://github.com/opensearch-project/OpenSearch/pull/12542)) - [Tiered caching] Add Stale keys Management and CacheCleaner to IndicesRequestCache ([#12625](https://github.com/opensearch-project/OpenSearch/pull/12625)) +- [Tracing Framework] Adds support for inferred sampling ([#12315](https://github.com/opensearch-project/OpenSearch/issues/12315)) ### Dependencies - Bump `peter-evans/find-comment` from 2 to 3 ([#12288](https://github.com/opensearch-project/OpenSearch/pull/12288)) diff --git a/libs/telemetry/src/main/java/org/opensearch/telemetry/tracing/DefaultTracer.java b/libs/telemetry/src/main/java/org/opensearch/telemetry/tracing/DefaultTracer.java index 3c669d6946ad6..ff50d3f450861 100644 --- a/libs/telemetry/src/main/java/org/opensearch/telemetry/tracing/DefaultTracer.java +++ b/libs/telemetry/src/main/java/org/opensearch/telemetry/tracing/DefaultTracer.java @@ -109,7 +109,7 @@ public Span startSpan(SpanCreationContext spanCreationContext, Map> headers) { - if (headers.containsKey(TracerContextStorage.INFERRED_SAMPLER)) { + if (headers !=null && headers.containsKey(TracerContextStorage.INFERRED_SAMPLER)) { spanCreationContext.getAttributes().addAttribute(TracerContextStorage.INFERRED_SAMPLER, true); } }