Merge branch '1.5.x' into 1.6.x

Author: shakuzen

micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/main/java/io/micrometer/tracing/brave/bridge/W3CPropagation.java

@@ -254,20 +254,19 @@ List<AbstractMap.SimpleEntry<Baggage, String>> addBaggageToContext(String baggag
             if (beginningOfMetadata > 0) {
                 entry = entry.substring(0, beginningOfMetadata);
             }
-            String[] keyAndValue = entry.split("=");
-            if (keyAndValue.length % 2 == 0) {
-                for (int i = 0; i < keyAndValue.length - 1; i += 2) {
-                    try {
-                        String key = keyAndValue[i].trim();
-                        String value = keyAndValue[i + 1].trim();
-                        Baggage baggage = this.braveBaggageManager.createBaggage(key);
-                        pairs.add(new AbstractMap.SimpleEntry<>(baggage, value));
-                    }
-                    catch (Exception e) {
-                        if (log.isDebugEnabled()) {
-                            log.debug("Exception occurred while trying to parse baggage with key value "
-                                    + Arrays.toString(keyAndValue) + ". Will ignore that entry.", e);
-                        }
+            String[] keyAndValue = entry.split("=", 2);
+            boolean hasValue = keyAndValue.length == 2 && !keyAndValue[1].isEmpty();
+            if (hasValue) {
+                try {
+                    String key = keyAndValue[0].trim();
+                    String value = keyAndValue[1].trim();
+                    Baggage baggage = this.braveBaggageManager.createBaggage(key);
+                    pairs.add(new AbstractMap.SimpleEntry<>(baggage, value));
+                }
+                catch (Exception e) {
+                    if (log.isDebugEnabled()) {
+                        log.debug("Exception occurred while trying to parse baggage with key value "
+                                + Arrays.toString(keyAndValue) + ". Will ignore that entry.", e);
                     }
                 }
             }

micrometer-tracing-bridges/micrometer-tracing-bridge-brave/src/test/java/io/micrometer/tracing/brave/bridge/W3CBaggagePropagatorTest.java

@@ -114,6 +114,19 @@ void extract_keyValuesNotinPairBaggageHeader() {
         assertThat(baggageEntries(contextWithBaggage)).containsExactly(entry("a", "b"));
     }
 
+    @Test
+    // gh-1350
+    void extract_valueWithEquals() {
+        TraceContextOrSamplingFlags context = context();
+        Map<String, String> carrier = new HashMap<>();
+        carrier.put("baggage", "key=value=with=equals");
+
+        TraceContextOrSamplingFlags contextWithBaggage = propagator.contextWithBaggage(carrier, context, Map::get);
+
+        Map<String, String> baggageEntries = baggageEntries(contextWithBaggage);
+        assertThat(baggageEntries).hasSize(1).containsEntry("key", "value=with=equals");
+    }
+
     @Test
     void extract_singleEntry() {
         TraceContextOrSamplingFlags context = context();