Skip to content

Commit 0a81be3

Browse files
authored
SOLR-15324 Upgrade Jaeger dependency from 1.1.0 to 1.6.0 (#268)
1 parent d97f9f2 commit 0a81be3

10 files changed

+12
-8
lines changed

solr/CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,8 @@ Other Changes
435435
* SOLR-15486: During node shutdown pausing of updates and waiting for in-flight update requests to finish
436436
before closing cores is no longer SolrCloud specific. (Christine Poerschke, David Smiley)
437437

438+
* SOLR-15324: Upgrade Jaeger dependency from 1.1.0 to 1.6.0 and thus also libthrift to 0.14.1 (janhoy)
439+
438440
================== 8.9.0 ==================
439441

440442
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

solr/contrib/jaegertracer-configurator/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ dependencies {
2626
exclude group: "com.squareup.okhttp3", module: "okhttp"
2727
exclude group: "com.google.code.gson", module: "gson" // for "RemoteControlledSampler", optional
2828
exclude group: "javax.annotation", module: "javax.annotation-api"
29+
exclude group: "org.apache.tomcat", module: "tomcat-annotations-api"
30+
exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-core"
2931
})
3032

3133
testImplementation project(':solr:test-framework')

solr/licenses/jaeger-core-1.1.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
001c572eb0ab754577b5856c63a3771f85def25c

solr/licenses/jaeger-thrift-1.1.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2db813970bcc462fbf7c7fbd87a8adff0af54fe7

solr/licenses/libthrift-0.13.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
85348a0c44c298bbec5ae747e67ae12e60b3aef6

versions.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ io.dropwizard.metrics:metrics-jetty9:4.1.5 (1 constraints: 0c050736)
7373
io.dropwizard.metrics:metrics-jmx:4.1.5 (1 constraints: 0c050736)
7474
io.dropwizard.metrics:metrics-jvm:4.1.5 (1 constraints: 0c050736)
7575
io.grpc:grpc-context:1.36.0 (3 constraints: 5a22231e)
76-
io.jaegertracing:jaeger-core:1.1.0 (1 constraints: 5c0d6c26)
77-
io.jaegertracing:jaeger-thrift:1.1.0 (1 constraints: 0405f335)
76+
io.jaegertracing:jaeger-core:1.6.0 (1 constraints: 610d7b26)
77+
io.jaegertracing:jaeger-thrift:1.6.0 (1 constraints: 09050236)
7878
io.netty:netty-buffer:4.1.59.Final (6 constraints: 32558a4d)
7979
io.netty:netty-codec:4.1.59.Final (2 constraints: f9136481)
8080
io.netty:netty-common:4.1.59.Final (8 constraints: ac6e00d5)
@@ -174,7 +174,7 @@ org.apache.poi:poi:4.1.1 (1 constraints: 08050336)
174174
org.apache.poi:poi-ooxml:4.1.1 (1 constraints: 08050336)
175175
org.apache.poi:poi-ooxml-schemas:4.1.1 (1 constraints: 08050336)
176176
org.apache.poi:poi-scratchpad:4.1.1 (1 constraints: 08050336)
177-
org.apache.thrift:libthrift:0.13.0 (1 constraints: 8e0dfd33)
177+
org.apache.thrift:libthrift:0.14.1 (1 constraints: 900d0134)
178178
org.apache.tika:tika-core:1.24 (1 constraints: db04f730)
179179
org.apache.tika:tika-java7:1.24 (1 constraints: db04f730)
180180
org.apache.tika:tika-parsers:1.24 (1 constraints: db04f730)
@@ -235,7 +235,7 @@ org.openjdk.jmh:jmh-core:1.32 (1 constraints: da04f730)
235235
org.ow2.asm:asm:7.2 (3 constraints: a325a35c)
236236
org.ow2.asm:asm-commons:7.2 (1 constraints: 6b0f7267)
237237
org.slf4j:jcl-over-slf4j:1.7.24 (1 constraints: 4005473b)
238-
org.slf4j:slf4j-api:1.7.24 (20 constraints: dc0114d2)
238+
org.slf4j:slf4j-api:1.7.24 (20 constraints: df018ed6)
239239
org.tallison:jmatio:1.5 (1 constraints: aa041f2c)
240240
org.threeten:threetenbp:1.5.0 (4 constraints: f82b9e86)
241241
org.tukaani:xz:1.8 (1 constraints: ad04222c)

versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ commons-logging:commons-logging=1.1.3
5555
de.l3s.boilerpipe:boilerpipe=1.1.0
5656
io.dropwizard.metrics:*=4.1.5
5757
io.grpc:grpc-context=1.19.0
58-
io.jaegertracing:*=1.1.0
58+
io.jaegertracing:*=1.6.0
5959
io.netty:*=4.1.50.Final
6060
io.opencensus:opencensus-api=0.21.0
6161
io.opencensus:opencensus-contrib-http-util=0.21.0

0 commit comments

Comments
 (0)