feat(add data collect proto in go agent) (#231)

Author: cqhasy

.github/workflows/e2e.yaml

@@ -61,4 +61,4 @@ jobs:
       - name: Run E2E Tests
         uses: apache/skywalking-infra-e2e@7e4b5b68716fdb7b79b21fa8908f9db497e1b115
         with:
-          e2e-file: ${{ matrix.case.path }}
+          e2e-file: ${{ matrix.case.path }}

.github/workflows/plugin-tests.yaml

@@ -80,7 +80,7 @@ jobs:
           - go-redisv9
           - go-restfulv3
           - gorm
-#          - kratosv2 temporary disable because it's not stable
+          #          - kratosv2 temporary disable because it's not stable
           - microv4
           - mongo
           - mysql
@@ -205,4 +205,4 @@ jobs:
         run: |
           if [[ ${{ needs.test.result }} != 'success' ]]; then
             exit -1
-          fi
+          fi

.gitignore

@@ -8,6 +8,6 @@ coverage.txt
 /test/e2e/dist/
 /test/plugins/workspace
 /test/plugins/dist/
-*.pb.go
+/tools/protocols/temp/
 vendor/
 VERSION

.gitmodules

@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
+[submodule "tools/protocols/skywalking-data-collect-protocol"]
+	path = tools/protocols/skywalking-data-collect-protocol
+	url = https://github.com/apache/skywalking-data-collect-protocol.git

.licenserc.yaml

@@ -36,6 +36,9 @@ header:
     - '**/*.tmpl'
     - 'tools/go-agent/tools/testdata/*'
     - 'VERSION'
+    - 'protocols'
+    - 'tools/protocols/temp'
+    - 'tools/protocols/skywalking-data-collect-protocol'
 
   comment: on-failure
 

CHANGES.md

@@ -10,11 +10,10 @@ Release Notes.
 * Support Kafka reporter.
 * Add recover to goroutine to prevent unexpected panics.
 * Add mutex to fix some data race. 
-
+* Replace external `goapi` dependency with in-repo generated protocols. 
 #### Plugins
 
 #### Documentation
-
 #### Bug Fixes
 
 * Fix plugin interceptors bypassed on Windows.

Makefile

@@ -57,6 +57,12 @@ deps:
 linter:
 	$(GO_LINT) version || curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GO_PATH)/bin v1.50.0
 
+##@ General
+
+.PHONY: generate
+generate: ## generate data collect proto
+	$(SH) $(REPODIR)tools/protocols/generate.sh
+
 
 ##@ Golang
 

agent/core/compile.go

@@ -50,9 +50,9 @@ import (
 	_ "github.com/pkg/errors"
 
 	//go:nolint
-	_ "skywalking.apache.org/repo/goapi/collect/common/v3"
-	_ "skywalking.apache.org/repo/goapi/collect/event/v3"
-	_ "skywalking.apache.org/repo/goapi/collect/language/agent/v3"
-	_ "skywalking.apache.org/repo/goapi/collect/language/profile/v3"
-	_ "skywalking.apache.org/repo/goapi/collect/logging/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/common/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/event/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/language/agent/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/language/profile/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/logging/v3"
 )

agent/core/tracing/compile.go

@@ -30,6 +30,6 @@ import (
 	_ "github.com/apache/skywalking-go/agent/reporter"
 
 	//go:nolint
-	_ "skywalking.apache.org/repo/goapi/collect/common/v3"
-	_ "skywalking.apache.org/repo/goapi/collect/language/agent/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/common/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/language/agent/v3"
 )

agent/reporter/imports.go

@@ -62,14 +62,14 @@ import (
 	_ "google.golang.org/protobuf/proto"
 
 	// imports protocols between agent and backend
-	_ "skywalking.apache.org/repo/goapi/collect/agent/configuration/v3"
-	_ "skywalking.apache.org/repo/goapi/collect/common/v3"
-	_ "skywalking.apache.org/repo/goapi/collect/ebpf/profiling/process/v3"
-	_ "skywalking.apache.org/repo/goapi/collect/ebpf/profiling/v3"
-	_ "skywalking.apache.org/repo/goapi/collect/event/v3"
-	_ "skywalking.apache.org/repo/goapi/collect/language/agent/v3"
-	_ "skywalking.apache.org/repo/goapi/collect/language/profile/v3"
-	_ "skywalking.apache.org/repo/goapi/collect/logging/v3"
-	_ "skywalking.apache.org/repo/goapi/collect/management/v3"
-	_ "skywalking.apache.org/repo/goapi/collect/servicemesh/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/agent/configuration/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/common/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/ebpf/profiling/process/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/ebpf/profiling/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/event/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/language/agent/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/language/profile/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/logging/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/management/v3"
+	_ "github.com/apache/skywalking-go/protocols/collect/servicemesh/v3"
 )