1.Load all defined context propagators.

2.Change the user defined file name suffix to 'sampling'.

Author: chenyijiang

examples/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.10.11.RELEASE</version>
+        <version>1.10.12.RELEASE</version>
     </parent>
 
     <artifactId>capa-examples</artifactId>

pom.xml

@@ -23,7 +23,7 @@
     <groupId>group.rxcloud</groupId>
     <artifactId>capa-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.10.11.RELEASE</version>
+    <version>1.10.12.RELEASE</version>
     <name>capa-sdk-parent</name>
     <description>SDK for Capa.</description>
     <url>https://github.com/reactivegroup</url>

sdk-component/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>group.rxcloud</groupId>
         <artifactId>capa-parent</artifactId>
-        <version>1.10.11.RELEASE</version>
+        <version>1.10.12.RELEASE</version>
     </parent>
 
     <artifactId>capa-sdk-component</artifactId>

sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/SamplerConfig.java

@@ -49,7 +49,7 @@ public class SamplerConfig implements Serializable {
 
     static {
         Mixer.configurationHooksNullable().ifPresent(hooks -> {
-            String fileName = "capa-component-telemetry-sample.properties";
+            String fileName = "capa-component-telemetry-sampling.properties";
             try {
                 // TODO: 2021/12/3 Move this to SPI module.
                 // TODO: 2021/12/3 And use Configuration extension api to get merged file.

sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/context/CapaContextPropagatorBuilder.java

@@ -61,28 +61,34 @@ public CapaContextPropagatorBuilder addContextPropagators(TextMapPropagator proc
      * @return context propagators.
      */
     public ContextPropagators buildContextPropagators() {
-        if (contextPropagatorsInstance != null && !contextPropagatorsInstance.isEmpty()) {
-            return ContextPropagators
-                    .create(TextMapPropagator.composite(contextPropagatorsInstance.toArray(new TextMapPropagator[0])));
-        }
-
+        List<TextMapPropagator> propagators = new ArrayList<>();
         initContextConfig();
         if (contextConfig != null) {
             List<String> types = contextConfig.getContextPropagators();
             if (types != null && !types.isEmpty()) {
-                return ContextPropagators
-                        .create(TextMapPropagator.composite(types.stream()
-                                                                 .map(path -> SpiUtils
-                                                                         .newInstanceWithConstructorCache(path, TextMapPropagator.class))
-                                                                 .toArray(TextMapPropagator[]::new)));
+                types.stream()
+                     .map(path -> SpiUtils
+                             .newInstanceWithConstructorCache(path, TextMapPropagator.class))
+                     .forEach(propagator -> propagators.add(propagator));
             }
         }
 
+        if (contextPropagatorsInstance != null && !contextPropagatorsInstance.isEmpty()) {
+            propagators.addAll(contextPropagatorsInstance);
+        }
+
         ContextPropagatorLoader loader = SpiUtils.loadFromSpiComponentFileNullable(ContextPropagatorLoader.class, "telemetry");
-        if (loader == null) {
-            loader = ContextPropagatorLoader.DEFAULT;
+        if (loader != null) {
+            List<TextMapPropagator> loaded = loader.load();
+            if (loaded != null) {
+                propagators.addAll(loaded);
+            }
+        }
+
+        if (propagators.isEmpty()) {
+            return ContextPropagators.noop();
         }
-        return loader.load();
+        return ContextPropagators.create(TextMapPropagator.composite(propagators.toArray(new TextMapPropagator[0])));
     }
 
     private void initContextConfig() {

sdk-component/src/main/java/group/rxcloud/capa/component/telemetry/context/ContextPropagatorLoader.java

@@ -16,7 +16,10 @@
  */
 package group.rxcloud.capa.component.telemetry.context;
 
-import io.opentelemetry.context.propagation.ContextPropagators;
+import io.opentelemetry.context.propagation.TextMapPropagator;
+
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Load default context propagator.
@@ -31,7 +34,7 @@ public interface ContextPropagatorLoader {
      *
      * @return default context propagator.
      */
-    default ContextPropagators load() {
-        return ContextPropagators.noop();
+    default List<TextMapPropagator> load() {
+        return Collections.emptyList();
     }
 }

sdk-component/src/test/java/group/rxcloud/capa/component/telemetry/context/CapaContextPropagatorBuilderTest.java

@@ -86,7 +86,7 @@ public void set(@Nullable Object carrier, String key, String value) {
             }
         });
 
-        assertEquals(2, TestPropagator.getCalled());
+        assertEquals(5, TestPropagator.getCalled());
     }
 
 

sdk-component/src/test/resources/capa-component-telemetry-sampling.properties

@@ -0,0 +1,2 @@
+traceEnable=true
+metricsEnable=true

sdk-infrastructure/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.10.11.RELEASE</version>
+        <version>1.10.12.RELEASE</version>
     </parent>
 
     <artifactId>capa-sdk-infrastructure</artifactId>

sdk-spi-demo/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.10.11.RELEASE</version>
+        <version>1.10.12.RELEASE</version>
     </parent>
 
     <artifactId>capa-sdk-spi-demo</artifactId>