Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

Commit 3c4b249

Browse files
committed
feat(plugin-neo4j): support for neo4j-driver up to 5.12.0
1 parent c5e6027 commit 3c4b249

File tree

6 files changed

+163
-157
lines changed

6 files changed

+163
-157
lines changed

.github/workflows/plugins.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -738,12 +738,12 @@ jobs:
738738
runs-on: ubuntu-latest
739739
services:
740740
neo4j:
741-
image: neo4j:4.2.3
741+
image: neo4j:5.11.0
742742
env:
743-
NEO4J_AUTH: 'neo4j/test'
743+
NEO4J_AUTH: 'neo4j/test-password'
744744
ports:
745745
- 7474:7474
746-
- 11011:7687
746+
- 7687:7687
747747
env:
748748
PLUGINS: neo4j
749749
SERVICES: neo4j

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ services:
8383
ports:
8484
- "127.0.0.1:8081:8081"
8585
neo4j:
86-
image: neo4j:4.2.3
86+
image: neo4j:5.11.0
8787
environment:
88-
- NEO4J_AUTH=neo4j/test
88+
- NEO4J_AUTH=neo4j/test-password
8989
ports:
9090
- "7474:7474"
91-
- "11011:7687"
91+
- "7687:7687"
9292
localstack:
9393
# TODO: Figure out why SNS doesn't work in >=1.2
9494
# https://github.com/localstack/localstack/issues/7479

packages/datadog-instrumentations/src/helpers/hooks.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ module.exports = {
7171
'mongoose': () => require('../mongoose'),
7272
'mysql': () => require('../mysql'),
7373
'mysql2': () => require('../mysql2'),
74-
'neo4j': () => require('../neo4j'),
74+
'neo4j-driver': () => require('../neo4j'),
75+
'neo4j-driver-core': () => require('../neo4j'),
7576
'net': () => require('../net'),
7677
'next': () => require('../next'),
7778
'oracledb': () => require('../oracledb'),

packages/datadog-instrumentations/src/neo4j.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ function wrapRun (run) {
7070
}
7171
}
7272

73-
function finish (error) {
73+
function finish(error) {
7474
if (error) {
7575
errorCh.publish(error)
7676
}
7777
finishCh.publish()
7878
}
7979

80-
function getAttributesFromNeo4jSession (session) {
80+
function getAttributesFromNeo4jSession(session) {
8181
const connectionHolder =
8282
(session._mode === 'WRITE' ? session._writeConnectionHolder : session._readConnectionHolder) ||
8383
session._connectionHolder ||

0 commit comments

Comments
 (0)