kezhenxu94 commented on a change in pull request #74:
URL:
https://github.com/apache/skywalking-satellite/pull/74#discussion_r725557534
##########
File path: go.mod
##########
@@ -20,9 +19,9 @@ require (
go.uber.org/automaxprocs v1.4.0
golang.org/x/mod v0.4.2
golang.org/x/tools v0.1.6 // indirect
- google.golang.org/grpc v1.38.0
- google.golang.org/protobuf v1.27.0
+ google.golang.org/grpc v1.40.0
Review comment:
These version changes are not reflected in license files
##########
File path: test/e2e/case/envoy/e2e.yaml
##########
@@ -0,0 +1,72 @@
+# 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.
+
+# This file is used to show how to write configuration files and can be used
to test.
+
+setup:
+ env: compose
+ file: docker-compose.yml
+ timeout: 1200
+ steps:
+ - name: install yq
+ command: |
+ if ! command -v yq &> /dev/null; then
+ mkdir -p /tmp/skywalking-infra-e2e/bin && cd
/tmp/skywalking-infra-e2e
+ mkdir -p yq && cd yq
+ curl -kLo yq.tar.gz
https://github.com/mikefarah/yq/archive/v4.11.1.tar.gz
+ tar -zxf yq.tar.gz --strip=1
+ go install && go build -ldflags -s && mv yq ../bin/yq
+ export PATH="$PATH:/tmp/skywalking-infra-e2e/bin"
+ echo "success to install yq"
+ fi
+ - name: install swctl
+ command: |
+ if ! command -v swctl &> /dev/null; then
+ mkdir -p /tmp/skywalking-infra-e2e/bin && cd
/tmp/skywalking-infra-e2e
+ mkdir -p swctl && cd swctl
+ curl -kLo skywalking-cli.tar.gz
https://github.com/apache/skywalking-cli/archive/76f9f848b3142d14c6ab6fa7910d408b92bced64.tar.gz
+ tar -zxf skywalking-cli.tar.gz --strip=1
+ make install DESTDIR=/usr/local/bin
+ echo "success to install swctl"
+ fi
+
+cleanup:
+ # always never success failure
+ on: no
+
+trigger:
+ action: http
+ interval: 3s
+ times: 5
+ url: http://${consumer_host}:${consumer_9090}/info
+ method: POST
+
+verify:
+ # verify with retry strategy
+ retry:
+ # max retry count
+ count: 20
+ # the interval between two retries, in millisecond.
+ interval: 10000
Review comment:
Use 10s
##########
File path: plugins/forwarder/grpc/envoyalsv2/forwarder.go
##########
@@ -0,0 +1,121 @@
+// Licensed to 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. Apache Software Foundation (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.
+
+package envoyalsv2
+
+import (
+ "context"
+ "fmt"
+ "io"
+ "reflect"
+
+ v2 "skywalking.apache.org/repo/goapi/proto/envoy/service/accesslog/v2"
+ v1 "skywalking.apache.org/repo/goapi/satellite/data/v1"
+
+ "google.golang.org/grpc"
+
+ "github.com/apache/skywalking-satellite/internal/pkg/config"
+ "github.com/apache/skywalking-satellite/internal/pkg/log"
+ "github.com/apache/skywalking-satellite/internal/satellite/event"
+)
+
+const Name = "envoyals-v2-grpc-forwarder"
+
+type Forwarder struct {
+ config.CommonFields
+ alsClient v2.AccessLogServiceClient
+}
+
+func (f *Forwarder) Name() string {
+ return Name
+}
+
+func (f *Forwarder) Description() string {
+ return "This is a synchronization ALS v2 grpc forwarder with the Envoy
ALS protocol."
+}
+
+func (f *Forwarder) DefaultConfig() string {
+ return ``
+}
+
+func (f *Forwarder) Prepare(connection interface{}) error {
+ client, ok := connection.(*grpc.ClientConn)
+ if !ok {
+ return fmt.Errorf("the %s is only accepet the grpc client, but
receive a %s",
Review comment:
```suggestion
return fmt.Errorf("the %s only accepts a grpc client, but
received a %s",
```
##########
File path: test/e2e/case/envoy/e2e.yaml
##########
@@ -0,0 +1,72 @@
+# 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.
+
+# This file is used to show how to write configuration files and can be used
to test.
+
+setup:
+ env: compose
+ file: docker-compose.yml
+ timeout: 1200
+ steps:
+ - name: install yq
+ command: |
+ if ! command -v yq &> /dev/null; then
+ mkdir -p /tmp/skywalking-infra-e2e/bin && cd
/tmp/skywalking-infra-e2e
+ mkdir -p yq && cd yq
+ curl -kLo yq.tar.gz
https://github.com/mikefarah/yq/archive/v4.11.1.tar.gz
+ tar -zxf yq.tar.gz --strip=1
+ go install && go build -ldflags -s && mv yq ../bin/yq
+ export PATH="$PATH:/tmp/skywalking-infra-e2e/bin"
+ echo "success to install yq"
+ fi
+ - name: install swctl
+ command: |
+ if ! command -v swctl &> /dev/null; then
+ mkdir -p /tmp/skywalking-infra-e2e/bin && cd
/tmp/skywalking-infra-e2e
+ mkdir -p swctl && cd swctl
+ curl -kLo skywalking-cli.tar.gz
https://github.com/apache/skywalking-cli/archive/76f9f848b3142d14c6ab6fa7910d408b92bced64.tar.gz
+ tar -zxf skywalking-cli.tar.gz --strip=1
+ make install DESTDIR=/usr/local/bin
+ echo "success to install swctl"
+ fi
+
+cleanup:
+ # always never success failure
+ on: no
Review comment:
???
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
