This is an automated email from the ASF dual-hosted git repository.
wu-sheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 277f19bcce Clear test-fixture CVE Dependabot alerts: drop log4j 1.x +
modernize Go fixtures (#13915)
277f19bcce is described below
commit 277f19bcce913c7aed66c13178d7b29f252ed729
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Thu Jun 18 17:07:58 2026 +0800
Clear test-fixture CVE Dependabot alerts: drop log4j 1.x + modernize Go
fixtures (#13915)
### Clear test-scope CVE Dependabot alerts (log4j 1.x + Go e2e fixtures)
Follow-up to #13913. Clears ~18 of the remaining open Dependabot alerts,
all in e2e **test fixtures** (no production code).
**log4j 1.x** — `e2e-service-provider` (2 alerts; log4j 1.x is EOL, one CVE
has no patched release):
- Removed `log4j:log4j` 1.2.17 + `apm-toolkit-log4j-1.x` and
`log4j.properties`. The provider already exercises log-to-OAP through
**log4j2** (`apm-toolkit-log4j-2.x`, grpc appender) and **logback** in
parallel, so log-reporting coverage is preserved. The log4j2 loggers now use
the imported `org.apache.logging.log4j.Logger` (no inline FQCN). Dropped the
log4j-1.x `fileLogger` items from the filebeat/fluentd expected files.
**Go fixtures** — `grpc`/`golang.org/x/net`/`x/crypto`/`protobuf` (~16
alerts; the patched releases require Go ≥ 1.23):
- `cases/go/service`: `go 1.24`; x/crypto 0.46, x/net 0.48, grpc 1.79.3,
protobuf 1.36.10; Dockerfile base `-go1.19` → `-go1.24`. `SW_AGENT_GO_COMMIT` →
`19a9fa9` (the skywalking-go commit that ships the go1.24 images; go1.19 images
were dropped). All 5 shared go cases (go/service, profiling/trace/go,
pprof/{mysql,es,banyandb}) build from this one Dockerfile.
- `cases/profiling/ebpf/network`: **migrated off the legacy go2sky SDK to
the skywalking-go toolchain agent** (auto-instruments net/http server+client).
The app exit span is now auto-instrumented (`GET:/provider`, `GoHttpClient`,
layer `Http`, peer `proxy`, http tags, spanid 1/parent 0) —
`expected/skywalking-trace.yml` updated, derived from the skywalking-go
net/http plugin. The eBPF sampled-record name (`skywalking-<path>`) is
network-derived and unchanged, so the verify query and t [...]
---
test/e2e-v2/cases/go/service/Dockerfile | 2 +-
test/e2e-v2/cases/go/service/go.mod | 20 ++++++-------
.../cases/kafka/log/expected/logs-filebeat.yml | 31 --------------------
.../cases/kafka/log/expected/logs-fluentd.yml | 21 -------------
.../profiling/ebpf/network/Dockerfile.service | 21 +++++++++----
.../ebpf/network/expected/skywalking-trace.yml | 28 +++++++++++++-----
test/e2e-v2/cases/profiling/ebpf/network/go.mod | 26 ++++++++++-------
.../e2e-v2/cases/profiling/ebpf/network/service.go | 34 ++++++++--------------
.../cases/profiling/ebpf/network/service.yaml | 4 ++-
.../java-test-service/e2e-service-provider/pom.xml | 20 ++++++-------
.../e2e/controller/FileLogController.java | 6 ++--
.../skywalking/e2e/controller/LogController.java | 7 ++---
.../src/main/resources/log4j.properties | 26 -----------------
test/e2e-v2/script/env | 2 +-
14 files changed, 91 insertions(+), 157 deletions(-)
diff --git a/test/e2e-v2/cases/go/service/Dockerfile
b/test/e2e-v2/cases/go/service/Dockerfile
index 79dc8b1a83..204518df49 100644
--- a/test/e2e-v2/cases/go/service/Dockerfile
+++ b/test/e2e-v2/cases/go/service/Dockerfile
@@ -14,7 +14,7 @@
# limitations under the License.
ARG SW_AGENT_GO_COMMIT=
-FROM ghcr.io/apache/skywalking-go/skywalking-go:${SW_AGENT_GO_COMMIT}-go1.19
as base
+FROM ghcr.io/apache/skywalking-go/skywalking-go:${SW_AGENT_GO_COMMIT}-go1.24
as base
ENV CGO_ENABLED=0
ENV GO111MODULE=on
diff --git a/test/e2e-v2/cases/go/service/go.mod
b/test/e2e-v2/cases/go/service/go.mod
index 2197662dbd..dfa4071c86 100644
--- a/test/e2e-v2/cases/go/service/go.mod
+++ b/test/e2e-v2/cases/go/service/go.mod
@@ -17,7 +17,7 @@
module sw-e2e
-go 1.19
+go 1.24.0
require (
github.com/apache/skywalking-go v0.6.1-0.20251023090254-afa75a3cc8c3
@@ -30,15 +30,15 @@ require (
github.com/bytedance/sonic/loader v0.1.1 // indirect
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
+ github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
+ github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.20.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
- github.com/golang/protobuf v1.5.3 // indirect
- github.com/google/go-cmp v0.5.9 // indirect
- github.com/google/uuid v1.3.0 // indirect
+ github.com/google/uuid v1.6.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.9 // indirect
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
@@ -53,12 +53,12 @@ require (
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
golang.org/x/arch v0.8.0 // indirect
- golang.org/x/crypto v0.23.0 // indirect
- golang.org/x/net v0.25.0 // indirect
- golang.org/x/sys v0.20.0 // indirect
- golang.org/x/text v0.15.0 // indirect
+ golang.org/x/crypto v0.46.0 // indirect
+ golang.org/x/net v0.48.0 // indirect
+ golang.org/x/sys v0.39.0 // indirect
+ golang.org/x/text v0.32.0 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 //
indirect
- google.golang.org/grpc v1.55.0 // indirect
- google.golang.org/protobuf v1.34.1 // indirect
+ google.golang.org/grpc v1.79.3 // indirect
+ google.golang.org/protobuf v1.36.10 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/test/e2e-v2/cases/kafka/log/expected/logs-filebeat.yml
b/test/e2e-v2/cases/kafka/log/expected/logs-filebeat.yml
index d7cf95622a..238aedb209 100644
--- a/test/e2e-v2/cases/kafka/log/expected/logs-filebeat.yml
+++ b/test/e2e-v2/cases/kafka/log/expected/logs-filebeat.yml
@@ -48,37 +48,6 @@ logs:
- key: agentName
value: {{ notEmpty .value }}
{{- end }}
-- servicename: e2e-service-provider
- serviceid: {{ b64enc "e2e-service-provider" }}.1
- serviceinstancename: provider1
- serviceinstanceid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc
"provider1" }}
- endpointname: null
- endpointid: null
- traceid: {{ .traceid }}
- timestamp: {{ gt .timestamp 0 }}
- contenttype: TEXT
- content: {{ regexp .content "log4j fileLogger.+"}}
- tags:
- {{- contains .tags }}
- - key: level
- value: INFO
- - key: logger
- value: fileLogger
- - key: thread
- value: {{ notEmpty .value }}
- - key: logfile
- value: /tmp/skywalking-logs/log4j1/e2e-service-provider.log
- - key: hostname
- value: {{ notEmpty .value }}
- - key: agent
- value: filebeat
- - key: agentVersion
- value: {{ notEmpty .value }}
- - key: agentId
- value: {{ notEmpty .value }}
- - key: agentName
- value: {{ notEmpty .value }}
- {{- end }}
- servicename: e2e-service-provider
serviceid: {{ b64enc "e2e-service-provider" }}.1
serviceinstancename: provider1
diff --git a/test/e2e-v2/cases/kafka/log/expected/logs-fluentd.yml
b/test/e2e-v2/cases/kafka/log/expected/logs-fluentd.yml
index 827f51d97a..29db321612 100644
--- a/test/e2e-v2/cases/kafka/log/expected/logs-fluentd.yml
+++ b/test/e2e-v2/cases/kafka/log/expected/logs-fluentd.yml
@@ -38,27 +38,6 @@ logs:
- key: agent
value: fluentd
{{- end }}
-- servicename: e2e-service-provider
- serviceid: {{ b64enc "e2e-service-provider" }}.1
- serviceinstancename: provider1
- serviceinstanceid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc
"provider1" }}
- endpointname: null
- endpointid: null
- traceid: {{ .traceid }}
- timestamp: {{ gt .timestamp 0 }}
- contenttype: TEXT
- content: {{ regexp .content "log4j fileLogger.+"}}
- tags:
- {{- contains .tags }}
- - key: level
- value: INFO
- - key: logger
- value: fileLogger
- - key: thread
- value: {{ notEmpty .value }}
- - key: agent
- value: fluentd
- {{- end }}
- servicename: e2e-service-provider
serviceid: {{ b64enc "e2e-service-provider" }}.1
serviceinstancename: provider1
diff --git a/test/e2e-v2/cases/profiling/ebpf/network/Dockerfile.service
b/test/e2e-v2/cases/profiling/ebpf/network/Dockerfile.service
index b57a491501..19050c883c 100644
--- a/test/e2e-v2/cases/profiling/ebpf/network/Dockerfile.service
+++ b/test/e2e-v2/cases/profiling/ebpf/network/Dockerfile.service
@@ -14,13 +14,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM golang:1.17
+# Default keeps the generic "Build test image" CI step (which passes no
+# build-args) working; keep it in sync with SW_AGENT_GO_COMMIT in
+# test/e2e-v2/script/env.
+ARG SW_AGENT_GO_COMMIT=19a9fa9bf058329281aa611f176cf5b7e5cbda8f
+FROM ghcr.io/apache/skywalking-go/skywalking-go:${SW_AGENT_GO_COMMIT}-go1.24
as base
-WORKDIR /
-COPY service.go /service/service.go
-COPY go.mod /service/go.mod
+ENV CGO_ENABLED=0
+ENV GO111MODULE=on
WORKDIR /service
-RUN go get test && go build -o service .
+COPY service.go go.mod ./
-CMD ["/service/service"]
\ No newline at end of file
+RUN go mod tidy && go build -toolexec="skywalking-go-agent" -a -o service .
+
+FROM alpine:3.10
+
+COPY --from=base /service/service /service/service
+
+CMD ["/service/service"]
diff --git
a/test/e2e-v2/cases/profiling/ebpf/network/expected/skywalking-trace.yml
b/test/e2e-v2/cases/profiling/ebpf/network/expected/skywalking-trace.yml
index a2ecf5e9d8..27b83a5b85 100644
--- a/test/e2e-v2/cases/profiling/ebpf/network/expected/skywalking-trace.yml
+++ b/test/e2e-v2/cases/profiling/ebpf/network/expected/skywalking-trace.yml
@@ -16,22 +16,34 @@
debuggingtrace: null
spans:
{{- contains .spans}}
+# The exit span for the consumer -> proxy/provider call, auto-instrumented by
+# skywalking-go's net/http client plugin. It is a child of the GET:/consumer
+# entry span (spanid 0) in the same segment, and carries the eBPF rover's
+# "HTTP Request Sampling" attached event.
- traceid: {{ notEmpty .traceid }}
segmentid: {{ notEmpty .segmentid }}
- spanid: 0
- parentspanid: -1
+ spanid: 1
+ parentspanid: 0
refs: []
servicecode: service
serviceinstancename: {{ notEmpty .serviceinstancename }}
starttime: {{ gt .starttime 0 }}
endtime: {{ gt .endtime 0 }}
- endpointname: /provider
+ endpointname: GET:/provider
type: Exit
- peer: http://proxy/provider
- component: Unknown
+ peer: proxy
+ component: GoHttpClient
iserror: false
- layer: Unknown
- tags: []
+ layer: Http
+ tags:
+ {{- contains .tags }}
+ - key: http.method
+ value: GET
+ - key: url
+ value: proxy/provider
+ - key: status_code
+ value: "200"
+ {{- end }}
logs: []
attachedevents:
{{- contains .attachedevents}}
@@ -49,4 +61,4 @@ spans:
value: {{ notEmpty .value }}
{{- end }}
{{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/test/e2e-v2/cases/profiling/ebpf/network/go.mod
b/test/e2e-v2/cases/profiling/ebpf/network/go.mod
index 366c72f21f..9642f88084 100644
--- a/test/e2e-v2/cases/profiling/ebpf/network/go.mod
+++ b/test/e2e-v2/cases/profiling/ebpf/network/go.mod
@@ -17,18 +17,22 @@
module test
-go 1.17
+go 1.24.0
+
+require github.com/apache/skywalking-go v0.6.1-0.20251023090254-afa75a3cc8c3
require (
- github.com/SkyAPM/go2sky v1.5.0 // indirect
- github.com/golang/protobuf v1.5.2 // indirect
- github.com/google/uuid v1.3.0 // indirect
+ github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
+ github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
+ github.com/google/uuid v1.6.0 // indirect
+ github.com/klauspost/compress v1.15.9 // indirect
+ github.com/pierrec/lz4/v4 v4.1.15 // indirect
github.com/pkg/errors v0.9.1 // indirect
- golang.org/x/net v0.7.0 // indirect
- golang.org/x/sys v0.5.0 // indirect
- golang.org/x/text v0.7.0 // indirect
- google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71 //
indirect
- google.golang.org/grpc v1.50.1 // indirect
- google.golang.org/protobuf v1.28.1 // indirect
- skywalking.apache.org/repo/goapi v0.0.0-20221019074310-53ebda305187 //
indirect
+ github.com/segmentio/kafka-go v0.4.43 // indirect
+ golang.org/x/net v0.48.0 // indirect
+ golang.org/x/sys v0.39.0 // indirect
+ golang.org/x/text v0.32.0 // indirect
+ google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 //
indirect
+ google.golang.org/grpc v1.79.3 // indirect
+ google.golang.org/protobuf v1.36.10 // indirect
)
diff --git a/test/e2e-v2/cases/profiling/ebpf/network/service.go
b/test/e2e-v2/cases/profiling/ebpf/network/service.go
index e6d4b98999..cd2444484e 100644
--- a/test/e2e-v2/cases/profiling/ebpf/network/service.go
+++ b/test/e2e-v2/cases/profiling/ebpf/network/service.go
@@ -21,15 +21,14 @@ import (
"io/ioutil"
"log"
"net/http"
- "os"
"time"
- "github.com/SkyAPM/go2sky"
- "github.com/SkyAPM/go2sky/reporter"
+ // skywalking-go auto-instruments net/http server (*ServeMux.ServeHTTP)
and
+ // client (*Transport.RoundTrip) at build time via -toolexec; trace
context is
+ // propagated automatically, so no manual span creation is needed.
+ _ "github.com/apache/skywalking-go"
)
-var skyWalkingTracer *go2sky.Tracer
-
func provider(w http.ResponseWriter, req *http.Request) {
time.Sleep(time.Second * 1)
if req.URL.Query().Get("error") == "true" {
@@ -50,13 +49,16 @@ func consumer(w http.ResponseWriter, req *http.Request) {
}
request, err := http.NewRequest("GET", addr, nil)
- exitSpan, err := skyWalkingTracer.CreateExitSpan(req.Context(),
"/provider", addr, func(headerKey, headerValue string) error {
- request.Header.Set(headerKey, headerValue)
- return nil
- })
+ if err != nil {
+ log.Printf("new request error: %v", err)
+ w.WriteHeader(http.StatusInternalServerError)
+ return
+ }
get, err := http.DefaultClient.Do(request)
if err != nil {
log.Printf("send request error: %v", err)
+ w.WriteHeader(http.StatusInternalServerError)
+ return
}
all, err := ioutil.ReadAll(get.Body)
_ = get.Body.Close()
@@ -66,24 +68,12 @@ func consumer(w http.ResponseWriter, req *http.Request) {
w.Header().Set("Content-Type", "text/plain")
_, _ = w.Write(all)
- exitSpan.End()
}
func main() {
- // init skywalking tracer
- r, err := reporter.NewGRPCReporter(os.Getenv("OAP_BACKEND_ADDR"))
- if err != nil {
- log.Fatalf("new reporter error %v \n", err)
- }
- defer r.Close()
- skyWalkingTracer, err = go2sky.NewTracer("service",
go2sky.WithReporter(r))
- if err != nil {
- log.Fatalf("init skyWalkingTracer failure: %v", err)
- }
-
http.HandleFunc("/provider", provider)
http.HandleFunc("/consumer", consumer)
- err = http.ListenAndServe(":80", nil)
+ err := http.ListenAndServe(":80", nil)
log.Fatal(err)
}
diff --git a/test/e2e-v2/cases/profiling/ebpf/network/service.yaml
b/test/e2e-v2/cases/profiling/ebpf/network/service.yaml
index 5bb0a7dd1a..c5bc33ed83 100644
--- a/test/e2e-v2/cases/profiling/ebpf/network/service.yaml
+++ b/test/e2e-v2/cases/profiling/ebpf/network/service.yaml
@@ -31,7 +31,9 @@ spec:
- name: service
image: ${IMAGE_NAME}
env:
- - name: OAP_BACKEND_ADDR
+ - name: SW_AGENT_NAME
+ value: "service"
+ - name: SW_AGENT_REPORTER_GRPC_BACKEND_SERVICE
value: "skywalking-oap.istio-system:11800"
---
diff --git a/test/e2e-v2/java-test-service/e2e-service-provider/pom.xml
b/test/e2e-v2/java-test-service/e2e-service-provider/pom.xml
index 74b73f137c..122151f3df 100644
--- a/test/e2e-v2/java-test-service/e2e-service-provider/pom.xml
+++ b/test/e2e-v2/java-test-service/e2e-service-provider/pom.xml
@@ -34,7 +34,6 @@
<artifactId>e2e-service-provider</artifactId>
<properties>
- <log4j.version>1.2.17</log4j.version>
<log4j2.version>2.25.4</log4j2.version>
<logback.version>1.2.13</logback.version>
</properties>
@@ -65,11 +64,6 @@
<artifactId>apm-toolkit-micrometer-registry</artifactId>
<version>8.2.0</version>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
@@ -86,13 +80,19 @@
<version>${logback.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.skywalking</groupId>
- <artifactId>apm-toolkit-logback-1.x</artifactId>
- <version>${sw.version}</version>
+ <!-- Pin logback-core to the same version as logback-classic.
Spring Boot's
+ dependency management otherwise holds logback-core at an
older version
+ (1.2.6), and logback-classic 1.2.13's ThrowableProxy calls
+ OptionHelper.isNotEmtpy() which only exists in the matching
core, so
+ logging any exception throws NoSuchMethodError and kills the
request
+ thread. -->
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback.version}</version>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
- <artifactId>apm-toolkit-log4j-1.x</artifactId>
+ <artifactId>apm-toolkit-logback-1.x</artifactId>
<version>${sw.version}</version>
</dependency>
<dependency>
diff --git
a/test/e2e-v2/java-test-service/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/controller/FileLogController.java
b/test/e2e-v2/java-test-service/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/controller/FileLogController.java
index b02295ad45..81df2b6801 100644
---
a/test/e2e-v2/java-test-service/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/controller/FileLogController.java
+++
b/test/e2e-v2/java-test-service/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/controller/FileLogController.java
@@ -17,8 +17,8 @@
package org.apache.skywalking.e2e.controller;
-import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.skywalking.apm.toolkit.trace.TraceContext;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,13 +27,11 @@ import
org.springframework.web.bind.annotation.RestController;
@RestController
public class FileLogController {
- private static final Logger LOG4J_LOGGER = Logger.getLogger("fileLogger");
- private static final org.apache.logging.log4j.Logger LOG4J2_LOGGER =
LogManager.getLogger("fileLogger");
+ private static final Logger LOG4J2_LOGGER =
LogManager.getLogger("fileLogger");
private static final org.slf4j.Logger LOGBACK_LOGGER =
LoggerFactory.getLogger("fileLogger");
@RequestMapping(value = "/file/logs/trigger")
public String trigger() {
- LOG4J_LOGGER.info("log4j fileLogger ==> mills-> " +
System.currentTimeMillis());
LOG4J2_LOGGER.info("log4j2 fileLogger ==> mills->" +
System.currentTimeMillis());
LOGBACK_LOGGER.info("logback fileLogger ==> mills-> {}",
System.currentTimeMillis());
return TraceContext.traceId();
diff --git
a/test/e2e-v2/java-test-service/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/controller/LogController.java
b/test/e2e-v2/java-test-service/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/controller/LogController.java
index 16970f106d..0b21967c5d 100644
---
a/test/e2e-v2/java-test-service/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/controller/LogController.java
+++
b/test/e2e-v2/java-test-service/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/controller/LogController.java
@@ -17,8 +17,8 @@
package org.apache.skywalking.e2e.controller;
-import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.skywalking.apm.toolkit.trace.TraceContext;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,14 +27,11 @@ import
org.springframework.web.bind.annotation.RestController;
@RestController
public class LogController {
- private static final Logger LOG4J_LOGGER =
Logger.getLogger(LogController.class);
- private static final org.apache.logging.log4j.Logger LOG4J2_LOGGER =
LogManager.getLogger(
- LogController.class);
+ private static final Logger LOG4J2_LOGGER =
LogManager.getLogger(LogController.class);
private static final org.slf4j.Logger LOGBACK_LOGGER =
LoggerFactory.getLogger(LogController.class);
@RequestMapping(value = "/logs/trigger")
public String trigger() {
- LOG4J_LOGGER.info("log4j message==> now-> " +
System.currentTimeMillis());
LOG4J2_LOGGER.info("log4j2 message==> now-> " +
System.currentTimeMillis());
LOGBACK_LOGGER.info("logback message==> now-> {}",
System.currentTimeMillis());
return TraceContext.traceId();
diff --git
a/test/e2e-v2/java-test-service/e2e-service-provider/src/main/resources/log4j.properties
b/test/e2e-v2/java-test-service/e2e-service-provider/src/main/resources/log4j.properties
deleted file mode 100644
index 56a721e0ad..0000000000
---
a/test/e2e-v2/java-test-service/e2e-service-provider/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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.
-log4j.rootLogger=info,CustomAppender
-log4j.appender.CustomAppender=org.apache.skywalking.apm.toolkit.log.log4j.v1.x.log.GRPCLogClientAppender
-log4j.appender.CustomAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.CustomAppender.layout.ConversionPattern=[%t] %-5p %c %x - %m%n
-
-log4j.logger.fileLogger=info,FileAppender
-log4j.appender.FileAppender=org.apache.log4j.FileAppender
-log4j.appender.FileAppender.ImmediateFlush=true
-log4j.appender.FileAppender.Append=true
-log4j.appender.FileAppender.File=/tmp/skywalking-logs/log4j1/e2e-service-provider.log
-log4j.appender.FileAppender.layout=org.apache.skywalking.apm.toolkit.log.log4j.v1.x.TraceIdPatternLayout
-log4j.appender.FileAppender.layout.ConversionPattern=[%T{SW_CTX}] [%p]
%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c:%L - %m%n
\ No newline at end of file
diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env
index 8f9401faa2..ced8ba857f 100644
--- a/test/e2e-v2/script/env
+++ b/test/e2e-v2/script/env
@@ -17,7 +17,7 @@ SW_AGENT_JAVA_COMMIT=ac0df43d7140e726eba9e5e5b1b75cf364c71dff
SW_AGENT_SATELLITE_COMMIT=ea27a3f4e126a24775fe12e2aa2695bcb23d99c3
SW_AGENT_NGINX_LUA_COMMIT=c3cee4841798a147d83b96a10914d4ac0e11d0aa
SW_AGENT_NODEJS_COMMIT=4f9a91dad3dfd8cfe5ba8f7bd06b39e11eb5e65e
-SW_AGENT_GO_COMMIT=afa75a3cc8c31f142102443af6164b825d63d8fc
+SW_AGENT_GO_COMMIT=19a9fa9bf058329281aa611f176cf5b7e5cbda8f
SW_AGENT_PYTHON_COMMIT=b91ebc46010ba6a46b251d4df54190c3b64f2db8
SW_AGENT_CLIENT_JS_COMMIT=f08776d909eb1d9bc79c600e493030651b97e491
SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016
