Skip to content

Commit e149ea1

Browse files
vandonrvandonr
committed
add netty version floor for spark to the build.gradle
1 parent 12fc2a0 commit e149ea1

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

‎dd-java-agent/instrumentation/spark/spark_2.12/build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ dependencies {
4848
test_spark32Implementation group: 'org.apache.spark', name: "spark-core_$scalaVersion", version: "3.2.4"
4949
test_spark32Implementation group: 'org.apache.spark', name: "spark-sql_$scalaVersion", version: "3.2.4"
5050
test_spark32Implementation group: 'org.apache.spark', name: "spark-yarn_$scalaVersion", version: "3.2.4"
51+
// We do not support netty versions older than this because of a change to the number of parameters to the
52+
// PooledByteBufAllocator constructor. See this PR where the new constructor (the only one we support) was introduced:
53+
// https://github.com/netty/netty/pull/10267
54+
test_spark32Implementation group: 'io.netty', name: 'netty-buffer', version: '4.1.52.Final'
5155

5256
latestDepTestImplementation group: 'org.apache.spark', name: "spark-core_$scalaVersion", version: '+'
5357
latestDepTestImplementation group: 'org.apache.spark', name: "spark-sql_$scalaVersion", version: '+'

‎dd-java-agent/instrumentation/spark/spark_2.12/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,14 @@ io.netty:netty-all:4.1.17.Final=compileClasspath,testCompileClasspath,testRuntim
131131
io.netty:netty-all:4.1.47.Final=test_spark24CompileClasspath,test_spark24RuntimeClasspath
132132
io.netty:netty-all:4.1.68.Final=test_spark32CompileClasspath,test_spark32RuntimeClasspath
133133
io.netty:netty-all:4.1.96.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
134-
io.netty:netty-buffer:4.1.50.Final=test_spark32CompileClasspath,test_spark32RuntimeClasspath
134+
io.netty:netty-buffer:4.1.52.Final=test_spark32CompileClasspath,test_spark32RuntimeClasspath
135135
io.netty:netty-buffer:4.1.96.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
136136
io.netty:netty-codec-http2:4.1.96.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
137137
io.netty:netty-codec-http:4.1.96.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
138138
io.netty:netty-codec-socks:4.1.96.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
139139
io.netty:netty-codec:4.1.50.Final=test_spark32CompileClasspath,test_spark32RuntimeClasspath
140140
io.netty:netty-codec:4.1.96.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
141-
io.netty:netty-common:4.1.50.Final=test_spark32CompileClasspath,test_spark32RuntimeClasspath
141+
io.netty:netty-common:4.1.52.Final=test_spark32CompileClasspath,test_spark32RuntimeClasspath
142142
io.netty:netty-common:4.1.96.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
143143
io.netty:netty-handler-proxy:4.1.96.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
144144
io.netty:netty-handler:4.1.50.Final=test_spark32CompileClasspath,test_spark32RuntimeClasspath

0 commit comments

Comments
 (0)