尝试修复ci (#2)

* fix: 尝试修复ci

* fix: 尝试修复ci

* fix: 尝试修复ci

* fix: 修复ci

* fix: 修复ci

.github/workflows/go-fmt.yml

@@ -1,4 +1,4 @@
-# Copyright 2021 ecodeclub
+# Copyright 2023 ecodeclub
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,11 +24,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ">=1.20.0"
+          go-version: '>=1.21.0'
 
       - name: Install goimports
         run: go install golang.org/x/tools/cmd/goimports@latest

.github/workflows/go.yml

@@ -1,4 +1,4 @@
-# Copyright 2021 ecodeclub
+# Copyright 2023 ecodeclub
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,19 +16,19 @@ name: Go
 
 on:
   push:
-    branches: [ dev ]
+    branches: [ dev,main ]
   pull_request:
-    branches: [ dev ]
+    branches: [ dev,main ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.20.0
+          go-version: '1.21.0'
 
       - name: Build
         run: go build -v ./...

.github/workflows/golangci-lint.yml

@@ -1,4 +1,4 @@
-# Copyright 2021 ecodeclub
+# Copyright 2023 ecodeclub
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -33,8 +33,8 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.0
-      - uses: actions/checkout@v3
+          go-version: '1.21.0'
+      - uses: actions/checkout@v4
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:

.github/pre-commit → .github/workflows/integration_test.yml

@@ -1,5 +1,4 @@
-#!/bin/sh
-# Copyright 2021 ecodeclub
+# Copyright 2023 ecodeclub
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,20 +11,24 @@
 # 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.
-#
-# To use, store as .git/hooks/pre-commit inside your repository and make sure
-# it has execute permissions.
-#
-# This script does not handle file names that contain spaces.
 
-# Pre-commit configuration
+name: Integration Test
 
-make check
-printf "执行检查中...\n"
+on:
+  push:
+    branches: [ main, dev]
+  pull_request:
+    branches: [ main, dev]
 
-if [ $? -ne 0 ]; then
-  echo >&2 "[ERROR]: 有文件发生变更，请将变更文件添加到本次提交中"
-  exit 1
-fi
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: '1.21.0'
 
-exit 0
+      - name: Test
+        run: make e2e

.github/workflows/license.yml

@@ -1,4 +1,4 @@
-# Copyright 2021 ecodeclub
+# Copyright 2023 ecodeclub
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,6 +24,9 @@ jobs:
   check-license-lines:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
-      - name: Check License Lines
-        uses: kt3k/[email protected]
+      - uses: denoland/setup-deno@v1
+        with:
+          deno-version: "1.40.4"
+      - uses: actions/checkout@v4
+      - name: Check license
+        run: deno run --allow-read https://deno.land/x/[email protected]/main.ts

.github/workflows/stale.yml

@@ -1,4 +1,4 @@
-# Copyright 2021 ecodeclub
+# Copyright 2023 ecodeclub
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,4 +30,4 @@ jobs:
           stale-issue-message: 'This issue is inactive for a long time.'
           stale-pr-message: 'This PR is inactive for a long time'
           stale-issue-label: 'inactive-issue'
-          stale-pr-label: 'inactive-pr'
+          stale-pr-label: 'inactive-pr'

.golangci.yml

@@ -0,0 +1,18 @@
+# Copyright 2023 ecodeclub
+#
+# 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.
+
+run:
+  go: '1.21'
+  skip-dirs:
+    - .idea

.license_header

@@ -0,0 +1,13 @@
+Copyright 2023 ecodeclub
+
+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.

.licenserc.json

@@ -0,0 +1,5 @@
+{
+  "**/*.go": "// Copyright 2023 ecodeclub",
+  "**/*.{yml,toml}": "# Copyright 2023 ecodeclub",
+  "**/*.sh": "# Copyright 2023 ecodeclub"
+}

.script/goimports.sh

@@ -1,4 +1,4 @@
-# Copyright 2021 ecodeclub
+# Copyright 2023 ecodeclub
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.script/integrate_test.sh

@@ -0,0 +1,21 @@
+# Copyright 2023 ecodeclub
+#
+# 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.
+
+#!/usr/bin/env bash
+
+set -e
+docker compose -f .script/integration_test_compose.yml down
+docker compose -f .script/integration_test_compose.yml up -d
+go test  ./...  -tags=e2e
+docker compose -f .script/integration_test_compose.yml down

.script/integration_test_compose.yml

@@ -0,0 +1,21 @@
+# Copyright 2023 ecodeclub
+#
+# 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.
+
+version: '3.0'
+
+services:
+  redis:
+    image: redis:latest
+    ports:
+      - "16379:6379"

.script/setup.sh

@@ -1,4 +1,4 @@
-# Copyright 2021 ecodeclub
+# Copyright 2023 ecodeclub
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Makefile

@@ -25,4 +25,17 @@ tidy:
 .PHONY: check
 check:
 	@$(MAKE) fmt
-	@$(MAKE) tidy
+	@$(MAKE) tidy
+
+# e2e 测试
+.PHONY: e2e
+e2e:
+	sh ./.script/integrate_test.sh
+
+.PHONY: e2e_up
+e2e_up:
+	docker compose -f .script/integration_test_compose.yml up -d
+
+.PHONY: e2e_down
+e2e_down:
+	docker compose -f .script/integration_test_compose.yml down

balancer/doc.go

@@ -1,2 +1,16 @@
+// Copyright 2023 ecodeclub
+//
+// 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.
+
 // Package balancer 集中存放各种负载均衡算法实现
 package balancer

go.mod

@@ -1,3 +1,3 @@
 module github.com/ecodeclub/grpcx
 
-go 1.21.5
+go 1.21

go_test.go

@@ -1,3 +1,17 @@
+// Copyright 2023 ecodeclub
+//
+// 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.
+
 package grpcx
 
 import "testing"

interceptor/otel/doc.go

@@ -1,2 +1,16 @@
+// Copyright 2023 ecodeclub
+//
+// 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.
+
 // Package otel 支持接入 opentelemetry 的各种度量
 package otel

interceptor/prometheus/doc.go

@@ -1,2 +1,16 @@
+// Copyright 2023 ecodeclub
+//
+// 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.
+
 // Package prometheus 接入 prometheus
 package prometheus