Revert "Revert "fix(hybrid): opentelemetry and zipkin header_type (#1…

…1687)""

This reverts commit 0b47e24.

kong/clustering/compat/checkers.lua

@@ -23,6 +23,40 @@ end
 
 
 local compatible_checkers = {
+  { 3004000000, --[[ 3.4.0.0 ]]
+    function(config_table, dp_version, log_suffix)
+      local has_update
+
+      for _, plugin in ipairs(config_table.plugins or {}) do
+        if plugin.name == 'opentelemetry' or plugin.name == 'zipkin' then
+          local config = plugin.config
+          if config.header_type == 'aws' then
+            config.header_type = 'preserve'
+            log_warn_message('configures ' .. plugin.name .. ' plugin with:' ..
+                             ' header_type == aws',
+                             'overwritten with default value `preserve`',
+                             dp_version, log_suffix)
+            has_update = true
+          end
+        end
+
+        if plugin.name == 'zipkin' then
+          local config = plugin.config
+          if config.default_header_type == 'aws' then
+            config.default_header_type = 'b3'
+            log_warn_message('configures ' .. plugin.name .. ' plugin with:' ..
+                             ' default_header_type == aws',
+                             'overwritten with default value `b3`',
+                             dp_version, log_suffix)
+            has_update = true
+          end
+        end
+      end
+
+      return has_update
+    end,
+  },
+
   { 3003000000, --[[ 3.3.0.0 ]]
     function(config_table, dp_version, log_suffix)
       local has_update

spec/02-integration/09-hybrid_mode/09-config-compat_spec.lua

@@ -108,7 +108,7 @@ describe("CP/DP config compat transformations #" .. strategy, function()
   end)
 
   describe("plugin config fields", function()
-    local rate_limit
+    local rate_limit, opentelemetry, zipkin
 
     lazy_setup(function()
       rate_limit = admin.plugins:insert {
@@ -179,6 +179,58 @@ describe("CP/DP config compat transformations #" .. strategy, function()
       assert.same(rate_limit.config, plugin.config)
       assert.equals(CLUSTERING_SYNC_STATUS.NORMAL, get_sync_status(id))
     end)
+
+    describe("compatibility tests for opentelemetry plugin", function()
+      it("replaces `aws` value of `header_type` property with default `preserve`", function()
+        -- [[ 3.4.x ]] --
+        opentelemetry = admin.plugins:insert {
+          name = "opentelemetry",
+          enabled = true,
+          config = {
+            endpoint = "http://1.1.1.1:12345/v1/trace",
+            -- [[ new value 3.4.0
+            header_type = "aws"
+            -- ]]
+          }
+        }
+
+        local expected_otel_prior_34 = utils.cycle_aware_deep_copy(opentelemetry)
+        expected_otel_prior_34.config.header_type = "preserve"
+        local plugin = get_plugin(utils.uuid(), "3.3.0", expected_otel_prior_34.name)
+        assert.is_not_nil(plugin)
+        assert.same(expected_otel_prior_34.config, plugin.config)
+
+        -- cleanup
+        admin.plugins:remove({ id = opentelemetry.id })
+      end)
+
+    end)
+
+    describe("compatibility tests for zipkin plugin", function()
+      it("replaces `aws` value of `header_type` property with default `preserve`", function()
+        -- [[ 3.4.x ]] --
+        zipkin = admin.plugins:insert {
+          name = "zipkin",
+          enabled = true,
+          config = {
+            http_endpoint = "http://1.1.1.1:12345/v1/trace",
+            -- [[ new value 3.4.0
+            header_type = "aws"
+            -- ]]
+          }
+        }
+
+        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"
+        local plugin = get_plugin(utils.uuid(), "3.3.0", expected_zipkin_prior_34.name)
+        assert.is_not_nil(plugin)
+        assert.same(expected_zipkin_prior_34.config, plugin.config)
+
+        -- cleanup
+        admin.plugins:remove({ id = zipkin.id })
+      end)
+    end)
   end)
 end)