Merge branch 'upstream-main'

Author: tae898

.github/workflows/test-python-bindings.yml

@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Set up Python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -62,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
@@ -170,7 +170,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Set up Python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0

.github/workflows/test-python-examples.yml

@@ -56,7 +56,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
@@ -160,7 +160,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Download JARs artifact
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1

.pre-commit-config.yaml

@@ -48,12 +48,12 @@ repos:
         args: ["-i", "4", "-ci", "-sr", "-w"]
         files: ^bindings/python/.*\.sh$
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.8.3
+    rev: v3.8.4
     hooks:
       - id: prettier
         types: [ java, xml ]
         additional_dependencies:
-          - prettier@3.8.3
+          - prettier@3.8.4
           - prettier-plugin-java@2.9.7
           - prettier-plugin-xml
         args:

ATTRIBUTIONS.md

@@ -234,10 +234,36 @@ The following table lists runtime dependencies bundled with ArcadeDB distributio
 
 | Group ID | Artifact ID | Version | License | Homepage |
 |----------|-------------|---------|---------|----------|
-| io.micrometer | micrometer-core | 1.16.2 | Apache 2.0 | https://micrometer.io/ |
-| io.micrometer | micrometer-observation | 1.16.2 | Apache 2.0 | https://micrometer.io/ |
+| io.micrometer | micrometer-core | 1.16.5 | Apache 2.0 | https://micrometer.io/ |
+| io.micrometer | micrometer-observation | 1.16.5 | Apache 2.0 | https://micrometer.io/ |
+| io.micrometer | micrometer-registry-otlp | 1.16.5 | Apache 2.0 | https://micrometer.io/ |
 | org.hdrhistogram | HdrHistogram | 2.2.2 | Public Domain / CC0 | https://hdrhistogram.github.io/HdrHistogram/ |
 
+### Distributed Tracing (Optional)
+
+Used only by the optional `tracing` module (OpenTelemetry distributed tracing). Confined to that
+plugin; not on the core/server compile classpath.
+
+| Group ID | Artifact ID | Version | License | Homepage |
+|----------|-------------|---------|---------|----------|
+| io.micrometer | micrometer-tracing | 1.7.0 | Apache 2.0 | https://micrometer.io/ |
+| io.micrometer | micrometer-tracing-bridge-otel | 1.7.0 | Apache 2.0 | https://micrometer.io/ |
+| io.opentelemetry | opentelemetry-sdk | 1.62.0 | Apache 2.0 | https://opentelemetry.io/ |
+| io.opentelemetry | opentelemetry-api | 1.62.0 | Apache 2.0 | https://opentelemetry.io/ |
+| io.opentelemetry | opentelemetry-context | 1.62.0 | Apache 2.0 | https://opentelemetry.io/ |
+| io.opentelemetry | opentelemetry-sdk-trace | 1.62.0 | Apache 2.0 | https://opentelemetry.io/ |
+| io.opentelemetry | opentelemetry-sdk-common | 1.62.0 | Apache 2.0 | https://opentelemetry.io/ |
+| io.opentelemetry | opentelemetry-exporter-otlp | 1.62.0 | Apache 2.0 | https://opentelemetry.io/ |
+| io.opentelemetry | opentelemetry-exporter-otlp-common | 1.62.0 | Apache 2.0 | https://opentelemetry.io/ |
+| io.opentelemetry | opentelemetry-exporter-common | 1.62.0 | Apache 2.0 | https://opentelemetry.io/ |
+| io.opentelemetry | opentelemetry-exporter-sender-okhttp | 1.62.0 | Apache 2.0 | https://opentelemetry.io/ |
+| io.opentelemetry | opentelemetry-extension-trace-propagators | 1.62.0 | Apache 2.0 | https://opentelemetry.io/ |
+| io.opentelemetry.semconv | opentelemetry-semconv | 1.41.1 | Apache 2.0 | https://opentelemetry.io/ |
+| com.squareup.okhttp3 | okhttp | 5.3.2 | Apache 2.0 | https://square.github.io/okhttp/ |
+| com.squareup.okio | okio | 3.16.4 | Apache 2.0 | https://square.github.io/okio/ |
+| org.jetbrains.kotlin | kotlin-stdlib | 2.2.21 | Apache 2.0 | https://kotlinlang.org/ |
+| org.jetbrains | annotations | 13.0 | Apache 2.0 | https://github.com/JetBrains/java-annotations |
+
 ---
 
 ## Test Dependencies

NOTICE

@@ -173,5 +173,29 @@ This product includes software developed by FasterXML, LLC.
 
 ================================================================================
 
+This product includes Micrometer Tracing (optional tracing module only).
+
+  Micrometer Tracing
+  Copyright (c) 2017-Present VMware, Inc. All Rights Reserved.
+
+  https://micrometer.io/
+
+  Micrometer Tracing contains modified portions of:
+    - 'io.netty.util.internal.logging' from Netty (Copyright 2013 The Netty Project, Apache 2.0, https://netty.io)
+    - 'StringUtils.isBlank()' from Apache Commons Lang (Copyright 2001-2019 The Apache Software Foundation, Apache 2.0)
+    - 'JsonUtf8Writer' from Moshi (Copyright 2010 Google Inc., Apache 2.0, https://github.com/square/moshi)
+    - the 'org.springframework.lang' package from the Spring Framework (Copyright 2002-2019 the original author or authors, Apache 2.0)
+
+================================================================================
+
+This product includes OpenTelemetry Java (optional tracing module only).
+
+  OpenTelemetry Java
+  Copyright The OpenTelemetry Authors
+
+  https://opentelemetry.io/
+
+================================================================================
+
 For the complete list of third-party components and their licenses, see the
 ATTRIBUTIONS.md file in the root directory of this distribution.

bolt/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.arcadedb</groupId>
         <artifactId>arcadedb-parent</artifactId>
-        <version>26.6.1</version>
+        <version>26.7.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

bolt/src/main/java/com/arcadedb/bolt/BoltNetworkExecutor.java

@@ -38,6 +38,7 @@
 import com.arcadedb.database.Database;
 import com.arcadedb.database.DatabaseContext;
 import com.arcadedb.database.DatabaseInternal;
+import com.arcadedb.database.ProtocolContext;
 import com.arcadedb.exception.CommandParsingException;
 import com.arcadedb.index.Index;
 import com.arcadedb.index.TypeIndex;
@@ -123,6 +124,9 @@ private enum State {
   // Transaction state
   private boolean explicitTransaction = false;
 
+  // GQL session state for this connection (SESSION SET/RESET/CLOSE parameters).
+  private final BoltSession session = new BoltSession();
+
   /**
    * Current result set for streaming results.
    * Thread-safety: This class is designed to handle a single connection in a dedicated thread.
@@ -162,6 +166,7 @@ public BoltNetworkExecutor(final ArcadeDBServer server, final Socket socket, fin
 
   @Override
   public void run() {
+    ProtocolContext.set("bolt");
     try {
       state = State.NEGOTIATION;
 
@@ -215,6 +220,7 @@ public void run() {
     } catch (final Exception e) {
       LogManager.instance().log(this, Level.SEVERE, "BOLT connection error", e);
     } finally {
+      ProtocolContext.clear();
       cleanup();
     }
   }
@@ -479,6 +485,11 @@ private void handleReset() throws IOException {
       }
     }
 
+    // NOTE: do not clear the GQL session parameters here. The Bolt RESET message is connection-level
+    // housekeeping the driver sends when recycling a pooled connection, not a user request to reset GQL
+    // session state; clearing here would drop SESSION SET parameters between auto-commit queries. GQL
+    // session parameters are cleared only by an explicit SESSION RESET / SESSION CLOSE statement.
+
     explicitTransaction = false;
     currentResultSet = null;
     currentFields = null;
@@ -530,7 +541,8 @@ private void handleRun(final RunMessage message) throws IOException {
     firstRecordTime = 0;
     syntheticResults = null;
 
-    // Ensure database is open (maps "system"/"neo4j" to default database)
+    // Ensure database is open (maps "system"/"neo4j" to default database). This also attaches the
+    // connection's GQL session to the thread context, which the engine reads for SESSION statements.
     if (!ensureDatabase())
       return;
 
@@ -944,8 +956,11 @@ private boolean ensureDatabase() throws IOException {
         if (user != null) {
           final DatabaseContext.DatabaseContextTL ctx =
               DatabaseContext.INSTANCE.getContextIfExists(((DatabaseInternal) database).getDatabasePath());
-          if (ctx != null)
+          if (ctx != null) {
             ctx.setCurrentUser(user.getDatabaseUser(database));
+            // Attach this connection's GQL session so SESSION statements and param merging can reach it.
+            ctx.setQuerySession(session);
+          }
         }
         return true;
       }
@@ -976,8 +991,12 @@ private boolean ensureDatabase() throws IOException {
         state = State.FAILED;
         return false;
       }
-      if (user != null)
-        DatabaseContext.INSTANCE.init((DatabaseInternal) database).setCurrentUser(user.getDatabaseUser(database));
+      if (user != null) {
+        final DatabaseContext.DatabaseContextTL ctx = DatabaseContext.INSTANCE.init((DatabaseInternal) database);
+        ctx.setCurrentUser(user.getDatabaseUser(database));
+        // Attach this connection's GQL session so SESSION statements and param merging can reach it.
+        ctx.setQuerySession(session);
+      }
       return true;
     } catch (final Exception e) {
       final String message = e.getMessage() != null ? e.getMessage() : "Unknown error";

bolt/src/main/java/com/arcadedb/bolt/BoltSession.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2021-present Arcade Data Ltd (info@arcadedata.com)
+ *
+ * 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.
+ *
+ * SPDX-FileCopyrightText: 2021-present Arcade Data Ltd (info@arcadedata.com)
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.arcadedb.bolt;
+
+import com.arcadedb.query.QuerySession;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * The per-connection {@link QuerySession} for the Bolt protocol: it carries the session parameters set with
+ * GQL {@code SESSION SET} so later commands on the same connection see them.
+ * <p>
+ * A Bolt connection runs in a single dedicated thread, so this state needs no synchronization. The Bolt
+ * connection and its transaction lifecycle are governed by the Bolt protocol (BEGIN/COMMIT/ROLLBACK/RESET
+ * messages and the driver's own session), so here {@code SESSION CLOSE} only clears the session parameters -
+ * it does not tear down the connection or its transaction.
+ *
+ * @author Luca Garulli (l.garulli@arcadedata.com)
+ */
+public class BoltSession implements QuerySession {
+  private final Map<String, Object> parameters = new HashMap<>();
+  // Cached live read-only view over 'parameters' (reflects mutations), so getParameters() allocates nothing.
+  private final Map<String, Object> parametersView = Collections.unmodifiableMap(parameters);
+
+  @Override
+  public void setParameter(final String name, final Object value) {
+    parameters.put(name, value);
+  }
+
+  @Override
+  public Map<String, Object> getParameters() {
+    return parametersView;
+  }
+
+  @Override
+  public void reset() {
+    parameters.clear();
+  }
+
+  @Override
+  public void close() {
+    // The Bolt connection/transaction lifecycle is governed by the protocol; the session only owns its
+    // parameters, so closing it clears them.
+    parameters.clear();
+  }
+}

bolt/src/test/java/com/arcadedb/bolt/BoltQueryMetricsIT.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2021-present Arcade Data Ltd (info@arcadedata.com)
+ *
+ * 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.
+ *
+ * SPDX-FileCopyrightText: 2021-present Arcade Data Ltd (info@arcadedata.com)
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.arcadedb.bolt;
+
+import com.arcadedb.GlobalConfiguration;
+import com.arcadedb.server.BaseGraphServerTest;
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Timer;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.neo4j.driver.AuthTokens;
+import org.neo4j.driver.Config;
+import org.neo4j.driver.Driver;
+import org.neo4j.driver.GraphDatabase;
+import org.neo4j.driver.Session;
+import org.neo4j.driver.SessionConfig;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Verifies that queries executed over a Bolt connection are tagged with protocol="bolt"
+ * in the arcadedb.query.duration Micrometer timer.
+ */
+public class BoltQueryMetricsIT extends BaseGraphServerTest {
+
+  @Override
+  public void setTestConfiguration() {
+    super.setTestConfiguration();
+    GlobalConfiguration.SERVER_PLUGINS.setValue("Bolt:com.arcadedb.bolt.BoltProtocolPlugin");
+  }
+
+  @AfterEach
+  @Override
+  public void endTest() {
+    GlobalConfiguration.SERVER_PLUGINS.setValue("");
+    super.endTest();
+  }
+
+  private Driver getDriver() {
+    return GraphDatabase.driver(
+        "bolt://localhost:7687",
+        AuthTokens.basic("root", DEFAULT_PASSWORD_FOR_TESTS),
+        Config.builder()
+            .withoutEncryption()
+            .build()
+    );
+  }
+
+  @Test
+  void boltQueriesTaggedWithBoltProtocol() {
+    try (Driver driver = getDriver()) {
+      try (Session session = driver.session(SessionConfig.forDatabase(getDatabaseName()))) {
+        session.run("RETURN 1 AS one").consume();
+      }
+    }
+
+    final Timer timer = Metrics.globalRegistry.find("arcadedb.query.duration").tag("protocol", "bolt").timer();
+    assertThat(timer).isNotNull();
+    assertThat(timer.count()).isGreaterThanOrEqualTo(1L);
+  }
+}