backfills tests for traceparent

openzipkin · Mar 12, 2020 · b7ea224 · b7ea224
1 parent 94aca21
commit b7ea224
Show file tree

Hide file tree

Showing 10 changed files with 412 additions and 81 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,3 +1,17 @@
+#
+# Copyright 2013-2020 The OpenZipkin Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+# in compliance with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License
+# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+# or implied. See the License for the specific language governing permissions and limitations under
+# the License.
+#
+
 blank_issues_enabled: false
 contact_links:
   - name: Question

diff --git a/instrumentation/p6spy/src/main/java/brave/p6spy/TracingJdbcEventListener.java b/instrumentation/p6spy/src/main/java/brave/p6spy/TracingJdbcEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 The OpenZipkin Authors
+ * Copyright 2013-2020 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at

diff --git a/propagation/w3c/pom.xml b/propagation/w3c/pom.xml
@@ -31,6 +31,22 @@
     <main.signature.artifact>java16</main.signature.artifact>
   </properties>
 
+  <dependencies>
+    <!-- to mock Platform calls -->
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>${powermock.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito2</artifactId>
+      <version>${powermock.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>

diff --git a/propagation/w3c/src/main/java/brave/propagation/w3c/TraceContextExtractor.java b/propagation/w3c/src/main/java/brave/propagation/w3c/TraceContextExtractor.java
@@ -22,9 +22,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import static brave.propagation.w3c.TraceparentFormat.FORMAT_LENGTH;
-import static brave.propagation.w3c.TraceparentFormat.maybeExtractParent;
-import static brave.propagation.w3c.TraceparentFormat.validateFormat;
+import static brave.propagation.w3c.TraceparentFormat.parseTraceparentFormat;
 
 final class TraceContextExtractor<C, K> implements Extractor<C> {
   final Getter<C, K> getter;
@@ -57,22 +55,20 @@ final class TraceContextExtractor<C, K> implements Extractor<C> {
     if (handler.context == null) {
       if (extra == DEFAULT_EXTRA) return EMPTY;
       return TraceContextOrSamplingFlags.newBuilder()
-          .extra(extra)
-          .samplingFlags(SamplingFlags.EMPTY)
-          .build();
+        .extra(extra)
+        .samplingFlags(SamplingFlags.EMPTY)
+        .build();
     }
     return TraceContextOrSamplingFlags.newBuilder().context(handler.context).extra(extra).build();
   }
 
   static final class TraceparentFormatHandler implements TracestateFormat.Handler {
     TraceContext context;
 
-    @Override public boolean onThisState(CharSequence tracestateString, int pos) {
-      if (validateFormat(tracestateString, pos) < FORMAT_LENGTH) {
-        return false;
-      }
-      context = maybeExtractParent(tracestateString, pos);
-      return true;
+    @Override
+    public boolean onThisState(CharSequence tracestateString, int beginIndex, int endIndex) {
+      context = parseTraceparentFormat(tracestateString, beginIndex, endIndex);
+      return context != null;
     }
   }
 
@@ -81,5 +77,5 @@ static final class TraceparentFormatHandler implements TracestateFormat.Handler
 
   static final List<Object> DEFAULT_EXTRA = Collections.singletonList(MARKER);
   static final TraceContextOrSamplingFlags EMPTY =
-      TraceContextOrSamplingFlags.EMPTY.toBuilder().extra(DEFAULT_EXTRA).build();
+    TraceContextOrSamplingFlags.EMPTY.toBuilder().extra(DEFAULT_EXTRA).build();
 }
diff --git a/propagation/w3c/src/main/java/brave/propagation/w3c/TraceContextInjector.java b/propagation/w3c/src/main/java/brave/propagation/w3c/TraceContextInjector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 The OpenZipkin Authors
+ * Copyright 2013-2018 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at

diff --git a/propagation/w3c/src/main/java/brave/propagation/w3c/TraceContextPropagation.java b/propagation/w3c/src/main/java/brave/propagation/w3c/TraceContextPropagation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 The OpenZipkin Authors
+ * Copyright 2013-2018 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at