Skip to content

Some refactoring to how we determine the Data Prepper version and log it #6196

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

Merged
graytaylor0 merged 1 commit into from
Oct 23, 2025
Merged

Some refactoring to how we determine the Data Prepper version and log it #6196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions data-prepper-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ plugins {
id 'data-prepper.publish'
}

def dataPrepperVersion = version
def generatedSourcesDir = "${project.buildDir}/generated/sources/version/java"

sourceSets {
Expand Down Expand Up @@ -87,7 +88,7 @@ configurations {
}

task generateVersionProvider {
inputs.property('version', version)
inputs.property('version', dataPrepperVersion)
inputs.file('src/main/java/org/opensearch/dataprepper/core/CoreVersionProvider.java.template')
outputs.dir(generatedSourcesDir)

Expand All @@ -97,7 +98,7 @@ task generateVersionProvider {

def templateFile = file('src/main/java/org/opensearch/dataprepper/core/CoreVersionProvider.java.template')
def versionProviderFile = file("$outputDir/CoreVersionProvider.java")
versionProviderFile.text = templateFile.text.replace('${version}', version)
versionProviderFile.text = templateFile.text.replace('${version}', dataPrepperVersion)
}
}

Expand Down
2 changes: 2 additions & 0 deletions data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperExecute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package org.opensearch.dataprepper;

import org.opensearch.dataprepper.core.DataPrepper;
import org.opensearch.dataprepper.model.configuration.DataPrepperVersion;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.ComponentScan;
Expand All @@ -20,6 +21,7 @@ public class DataPrepperExecute {
private static final Logger LOG = LoggerFactory.getLogger(DataPrepperExecute.class);

public static void main(final String ... args) {
LOG.info("Data Prepper {}", DataPrepperVersion.getCurrentVersion());
java.security.Security.setProperty("networkaddress.cache.ttl", "60");
System.setProperty("software.amazon.awssdk.http.service.impl", "software.amazon.awssdk.http.apache.ApacheSdkHttpService");

Expand Down
Loading