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-graalvm-distro.git
The following commit(s) were added to refs/heads/main by this push:
new a470287 Sync upstream to 2709c94: LAL LogMetadata refactor
a470287 is described below
commit a470287e234747478fbda8a07e9258db70535f53
Author: Wu Sheng <[email protected]>
AuthorDate: Fri Mar 13 09:50:39 2026 +0800
Sync upstream to 2709c94: LAL LogMetadata refactor
Update skywalking submodule to pick up LAL LogMetadata decoupling
(#13741, #13742). Key changes:
- Update LAL DSL.java replacement: ctx.log() removed upstream,
use ctx.metadata() (LogMetadata) for debug logging
- Add LAL SPI implementations to reflect-config: EnvoyAccessLogBuilder,
EnvoyHTTPLALSourceTypeProvider (ServiceLoader needs reflection in
native image)
- Update staleness hash for upstream DSL.java
---
.../oap/server/buildtools/precompiler/Precompiler.java | 3 +++
.../src/test/resources/replacement-source-sha256.properties | 2 +-
.../org/apache/skywalking/oap/log/analyzer/v2/dsl/DSL.java | 10 +++++-----
skywalking | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git
a/build-tools/precompiler/src/main/java/org/apache/skywalking/oap/server/buildtools/precompiler/Precompiler.java
b/build-tools/precompiler/src/main/java/org/apache/skywalking/oap/server/buildtools/precompiler/Precompiler.java
index 004e4de..25e4878 100644
---
a/build-tools/precompiler/src/main/java/org/apache/skywalking/oap/server/buildtools/precompiler/Precompiler.java
+++
b/build-tools/precompiler/src/main/java/org/apache/skywalking/oap/server/buildtools/precompiler/Precompiler.java
@@ -1375,6 +1375,9 @@ public class Precompiler {
// LALOutputBuilder SPI: ServiceLoader instantiates to call name()
for short-name resolution
"org.apache.skywalking.oap.server.analyzer.provider.trace.parser.listener.DatabaseSlowStatementBuilder",
"org.apache.skywalking.oap.server.analyzer.provider.trace.parser.listener.SampledTraceBuilder",
+
"org.apache.skywalking.oap.server.receiver.envoy.persistence.EnvoyAccessLogBuilder",
+ // LALSourceTypeProvider SPI: ServiceLoader instantiates for
per-layer input/output type resolution
+
"org.apache.skywalking.oap.server.receiver.envoy.EnvoyHTTPLALSourceTypeProvider",
// TTL status REST endpoint: Jackson serializes TTLDefinition
returned by /status/config/ttl
"org.apache.skywalking.oap.server.core.storage.ttl.TTLDefinition"
};
diff --git
a/oap-graalvm-server/src/test/resources/replacement-source-sha256.properties
b/oap-graalvm-server/src/test/resources/replacement-source-sha256.properties
index bc0217f..53a6da6 100644
--- a/oap-graalvm-server/src/test/resources/replacement-source-sha256.properties
+++ b/oap-graalvm-server/src/test/resources/replacement-source-sha256.properties
@@ -49,7 +49,7 @@
skywalking/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalkin
# --- log-analyzer-for-graalvm ---
# LAL DSL v2: loads pre-compiled LalExpression from v2 manifest
-skywalking/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/DSL.java
= 35f767ea84c6e03b569bef66f5ebfec83d2533c12f384c91a555baf53ac67f8d
+skywalking/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/DSL.java
= 1542d8d2e3ace50eb83298da39904e13b13e1b7cb10d31da3f654ba5edf365a7
# Added @Setter at class level
skywalking/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/LogAnalyzerModuleConfig.java
= 91335e7fbfb452a3522d01c3c1498d954028842c038b7d77233547c36586d0de
# Config loader: load from JSON manifests instead of filesystem YAML
diff --git
a/oap-libs-for-graalvm/log-analyzer-for-graalvm/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/DSL.java
b/oap-libs-for-graalvm/log-analyzer-for-graalvm/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/DSL.java
index d1002f5..56714ba 100644
---
a/oap-libs-for-graalvm/log-analyzer-for-graalvm/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/DSL.java
+++
b/oap-libs-for-graalvm/log-analyzer-for-graalvm/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/DSL.java
@@ -28,8 +28,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.apm.network.logging.v3.LogData;
import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.filter.FilterSpec;
+import org.apache.skywalking.oap.server.core.source.LogMetadata;
import
org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.library.module.ModuleStartException;
@@ -131,11 +131,11 @@ public class DSL {
public void evaluate(final ExecutionContext ctx) {
if (log.isDebugEnabled()) {
- final LogData.Builder logData = ctx.log();
- log.debug("[LAL] rule={}, class={}, service={}, instance={},
endpoint={}, bodyType={}",
+ final LogMetadata metadata = ctx.metadata();
+ log.debug("[LAL] rule={}, class={}, service={}, instance={},
endpoint={}",
ruleName, expression.getClass().getName(),
- logData.getService(), logData.getServiceInstance(),
- logData.getEndpoint(), logData.getBody().getContentCase());
+ metadata.getService(), metadata.getServiceInstance(),
+ metadata.getEndpoint());
}
expression.execute(filterSpec, ctx);
}
diff --git a/skywalking b/skywalking
index 5865250..2709c94 160000
--- a/skywalking
+++ b/skywalking
@@ -1 +1 @@
-Subproject commit 58652507b633d8783b4d9dbfce609bccb5bd11ef
+Subproject commit 2709c94ab3cc8997fd45c2ff38f3059cb0120074
