Support elasticsearch 7 #75
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
pavolloffay
commented
Aug 13, 2019
| @@ -192,6 +192,7 @@ void run(String[] spanIndices, String[] depIndices,String peerServiceTag) { | |||
| .map(new ElasticTupleToSpan()) | |||
| .groupBy(Span::getTraceId); | |||
| List<Dependency> dependencyLinks = DependenciesSparkHelper.derive(traces,peerServiceTag); | |||
| // TODO the type names are deprecated (in ES7) and will be removed in a later release. | |||
There was a problem hiding this comment.
This produces warning messages, however I think it's better than to require a conf parameter to avoid adding a type. Alternatively we could get the version from ES but we would have to use a separate client with security settings etc...
STORAGE=elasticsearch ES_NODES=http://localhost:9200 java -jar jaeger-spark-dependencies/target/jaeger-spark-dependencies-0.0.1-SNAPSHOT.jar 5:23
19/08/13 17:23:06 WARN NativeCodeLoader: Unable to load native-hadoop library for your platform... using builtin-java classes where applicable
19/08/13 17:23:06 INFO ElasticsearchDependenciesJob: Running Dependencies job for 2019-08-13T00:00Z, reading from jaeger-span-2019-08-13 index, result storing to jaeger-dependencies-2019-08-13
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:08 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:09 WARN Resource: Detected type name in resource [jaeger-dependencies-2019-08-13/dependencies]. Type names are deprecated and will be removed in a later release.
19/08/13 17:23:09 INFO ElasticsearchDependenciesJob: Done, 8 dependency objects created
There was a problem hiding this comment.
I have added a mechanism to get the ES version and appropriately add type for older versions. However, the warn message is still present when used with older ES versions.
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #74
Blocked by jaegertracing/jaeger#1690