[GitHub] wu-sheng closed pull request #1903: Fix the carrier item order is incorrect

[GitBox <gi...@apache.org>]

wu-sheng closed pull request #1903: Fix the carrier item order is incorrect
URL: https://github.com/apache/incubator-skywalking/pull/1903
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextCarrier.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextCarrier.java
index 52c6a6c3f..8ff218de1 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextCarrier.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextCarrier.java
@@ -79,9 +79,9 @@
     public CarrierItem items() {
         CarrierItemHead head;
         if (Config.Agent.ACTIVE_V2_HEADER && Config.Agent.ACTIVE_V1_HEADER) {
-            SW6CarrierItem sw6CarrierItem = new SW6CarrierItem(this, null);
-            SW3CarrierItem carrierItem = new SW3CarrierItem(this, sw6CarrierItem);
-            head = new CarrierItemHead(carrierItem);
+            SW3CarrierItem  carrierItem = new SW3CarrierItem(this, null);
+            SW6CarrierItem sw6CarrierItem = new SW6CarrierItem(this, carrierItem);
+            head = new CarrierItemHead(sw6CarrierItem);
         } else if (Config.Agent.ACTIVE_V2_HEADER) {
             SW6CarrierItem sw6CarrierItem = new SW6CarrierItem(this, null);
             head = new CarrierItemHead(sw6CarrierItem);


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services