[skywalking-satellite] branch main updated: change go api package (#43)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git


The following commit(s) were added to refs/heads/main by this push:
     new 9c030b9  change go api package (#43)
9c030b9 is described below

commit 9c030b91f9e550b5fdb250c99cc9ef6ffcdfa544
Author: Evan <31...@users.noreply.github.com>
AuthorDate: Thu Jun 3 14:14:28 2021 +0800

    change go api package (#43)
---
 .github/workflows/build-and-test.yaml                       |  2 +-
 Makefile                                                    | 13 ++-----------
 .../satellite-protocol/{event => satellite}/Event.proto     |  3 +--
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index 26b5d80..4e0abee 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -55,7 +55,7 @@ jobs:
         run: make build
       - name: Check CI Consistency
         if: matrix.go-version == '1.15' && matrix.runner == 'ubuntu'
-        run: make gen-docs && make check
+        run: make check
       - name: Build Docker
         if: matrix.runner == 'ubuntu'
         run: make docker
diff --git a/Makefile b/Makefile
index 6902866..cbbf9c9 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ ARCH = amd64
 
 SHELL = /bin/bash
 
-all: deps verify build gen-docs check
+all: deps verify build check
 
 .PHONY: tools
 tools:
@@ -54,15 +54,6 @@ tools:
 deps: tools
 	$(GO_GET) -v -t -d ./...
 
-.PHONY: gen-codes
-gen-codes:
-	$(PROTOC) --version || sh tools/install_protoc.sh
-	/bin/sh tools/protocol_gen.sh
-
-.PHONY: gen-docs
-gen-docs: build
-	rm -rf $(PLUGIN_DOC_DIR)
-	$(OUT_DIR)/$(BINARY)-$(VERSION)-$(OSNAME)-$(ARCH) docs --output=$(PLUGIN_DOC_DIR)
 
 .PHONY: lint
 lint: tools
@@ -80,7 +71,7 @@ clean: tools
 	-rm -rf coverage.txt
 
 .PHONY: build
-build: clean gen-codes deps linux darwin windows
+build: clean deps linux darwin windows
 
 .PHONY: check
 check: clean
diff --git a/protocol/satellite-protocol/event/Event.proto b/protocol/satellite-protocol/satellite/Event.proto
similarity index 96%
rename from protocol/satellite-protocol/event/Event.proto
rename to protocol/satellite-protocol/satellite/Event.proto
index 69efbbc..34a8592 100644
--- a/protocol/satellite-protocol/event/Event.proto
+++ b/protocol/satellite-protocol/satellite/Event.proto
@@ -20,8 +20,7 @@ syntax = "proto3";
 
 package skywalking.v3;
 
-option go_package = "satellite/protocol";
-
+option go_package = "skywalking.apache.org/repo/goapi/satellite/event/v1";
 
 import "language-agent/CLRMetric.proto";
 import "language-agent/JVMMetric.proto";