From 8d8792fdf57faf99e6f21e9b46b95894d4ef4797 Mon Sep 17 00:00:00 2001 From: samugi Date: Wed, 27 Mar 2024 17:40:54 +0100 Subject: [PATCH] fix(plugins): compatibility with older data planes added compatibility with older data planes for the new tracing headers propagation configuration options --- kong/clustering/compat/removed_fields.lua | 10 ++++++++++ .../09-hybrid_mode/09-config-compat_spec.lua | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/kong/clustering/compat/removed_fields.lua b/kong/clustering/compat/removed_fields.lua index e0083de8a9b1..9c20b5d93ca5 100644 --- a/kong/clustering/compat/removed_fields.lua +++ b/kong/clustering/compat/removed_fields.lua @@ -116,4 +116,14 @@ return { "sampling_rate", }, }, + + -- Any dataplane older than 3.7.0 + [3007000000] = { + opentelemetry = { + "propagation", + }, + zipkin = { + "propagation", + }, + }, } diff --git a/spec/02-integration/09-hybrid_mode/09-config-compat_spec.lua b/spec/02-integration/09-hybrid_mode/09-config-compat_spec.lua index f1180b6884a5..b64af4cf5c6f 100644 --- a/spec/02-integration/09-hybrid_mode/09-config-compat_spec.lua +++ b/spec/02-integration/09-hybrid_mode/09-config-compat_spec.lua @@ -251,6 +251,7 @@ describe("CP/DP config compat transformations #" .. strategy, function() local expected_otel_prior_35 = utils.cycle_aware_deep_copy(opentelemetry) expected_otel_prior_35.config.header_type = "preserve" expected_otel_prior_35.config.sampling_rate = nil + expected_otel_prior_35.config.propagation = nil do_assert(utils.uuid(), "3.4.0", expected_otel_prior_35) -- cleanup @@ -271,6 +272,7 @@ describe("CP/DP config compat transformations #" .. strategy, function() local expected_otel_prior_34 = utils.cycle_aware_deep_copy(opentelemetry) expected_otel_prior_34.config.header_type = "preserve" expected_otel_prior_34.config.sampling_rate = nil + expected_otel_prior_34.config.propagation = nil do_assert(utils.uuid(), "3.3.0", expected_otel_prior_34) -- cleanup @@ -296,6 +298,7 @@ describe("CP/DP config compat transformations #" .. strategy, function() local expected_zipkin_prior_35 = utils.cycle_aware_deep_copy(zipkin) expected_zipkin_prior_35.config.header_type = "preserve" expected_zipkin_prior_35.config.default_header_type = "b3" + expected_zipkin_prior_35.config.propagation = nil do_assert(utils.uuid(), "3.4.0", expected_zipkin_prior_35) -- cleanup @@ -316,6 +319,7 @@ describe("CP/DP config compat transformations #" .. strategy, function() local expected_zipkin_prior_34 = utils.cycle_aware_deep_copy(zipkin) expected_zipkin_prior_34.config.header_type = "preserve" expected_zipkin_prior_34.config.default_header_type = "b3" + expected_zipkin_prior_34.config.propagation = nil do_assert(utils.uuid(), "3.3.0", expected_zipkin_prior_34) -- cleanup