Skip to content

Adding spring data es metadata to runtime info #1058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
+35 −1
Draft

Adding spring data es metadata to runtime info #1058

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ce5560
adding spring data es metadata to runtime info
l-trotta Aug 18, 2025
69553c2
change field name
l-trotta Aug 19, 2025
aaab335
change field name
l-trotta Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion java-client/src/main/java/co/elastic/clients/util/LanguageRuntimeVersions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@

package co.elastic.clients.util;

// Copied verbatim from https://github.com/elastic/jvm-languages-sniffer
// Based on https://github.com/elastic/jvm-languages-sniffer

import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Properties;

public class LanguageRuntimeVersions {

Expand Down Expand Up @@ -59,6 +60,11 @@ public static String getRuntimeMetadata() {
s.append(",jrb=").append(version);
}

version = springDataVersion();
if (version != null) {
s.append(",sde=").append(version);
}

return s.toString();
}

Expand Down Expand Up @@ -89,6 +95,18 @@ public static String jRubyVersion() {
return keepMajorMinor(getStaticField("org.jruby.runtime.Constants", "VERSION"));
}

public static String springDataVersion() {
// org.springframework.data.elasticsearch.support.VersionInfo.versionProperties()
Properties springProp = (Properties) callStaticMethodObject(
"org.springframework.data.elasticsearch.support.VersionInfo",
"versionProperties");
if (springProp != null) {
return keepMajorMinor(springProp.getProperty("version.spring-data-elasticsearch"));
}
return "";

}

private static String getStaticField(String className, String fieldName) {
Class<?> clazz;
try {
Expand Down Expand Up @@ -121,6 +139,22 @@ private static String callStaticMethod(String className, String methodName) {
}
}

private static Object callStaticMethodObject(String className, String methodName) {
Class<?> clazz;
try {
clazz = Class.forName(className);
} catch (ClassNotFoundException e) {
return null;
}

try {
Method m = clazz.getMethod(methodName);
return m.invoke(null);
} catch (Exception e) {
return null; // can't get version information
}
}

static String keepMajorMinor(String version) {
if (version == null) {
return null;
Expand Down