feat: add hikari logs to otel (#1181)

* feat: add hikari logs to otel * fix: add env name annotations * fix: update core config and config mapper to load from env * chore: update build version and changelog * fix: config test * fix: config json from env * fix: changelog * fix: storage class loader --------- Co-authored-by: Sattvik Chakravarthy <sattvik@gmail.com>

Author: tamassoltesz

CHANGELOG.md

@@ -7,6 +7,11 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [11.1.0]
+
+- Adds hikari logs to opentelemetry
+- Fetches core and plugin config from env
+
 ## [11.0.5]
 
 - Adds all logs to telemetry which were logged with `io/supertokens/output/Logging.java`

build.gradle

@@ -26,7 +26,7 @@ java {
  }
 }
 
-version = "11.0.5"
+version = "11.1.0"
 
 repositories {
  mavenCentral()

pluginInterfaceSupported.json

@@ -1,6 +1,6 @@
 {
  "_comment": "contains a list of plugin interfaces branch names that this core supports",
  "versions": [
- "8.0"
+ "8.1"
  ]
 }

src/main/java/io/supertokens/Main.java

@@ -157,24 +157,24 @@ private void init() throws IOException, StorageQueryException {
  // Handle kill signal gracefully
  handleKillSignalForWhenItHappens();
 
+ StorageLayer.loadStorageUCL(CLIOptions.get(this).getInstallationPath() + "plugin/");
+
  // loading configs for core from config.yaml file.
  try {
  Config.loadBaseConfig(this);
+ Logging.info(this, TenantIdentifier.BASE_TENANT, "Completed config.yaml loading.", true);
  } catch (InvalidConfigException e) {
  throw new QuitProgramException(e);
  }
 
  // loading version file
  Version.loadVersion(this, CLIOptions.get(this).getInstallationPath() + "version.yaml");
 
- Logging.info(this, TenantIdentifier.BASE_TENANT, "Completed config.yaml loading.", true);
-
  TelemetryProvider.initialize(this);
 
  // loading storage layer
  try {
- StorageLayer.initPrimary(this, CLIOptions.get(this).getInstallationPath() + "plugin/",
- Config.getBaseConfigAsJsonObject(this));
+ StorageLayer.initPrimary(this, Config.getBaseConfigAsJsonObject(this));
  } catch (InvalidConfigException e) {
  throw new QuitProgramException(e);
  }

src/main/java/io/supertokens/config/Config.java

@@ -52,6 +52,8 @@ private Config(Main main, String configFilePath) throws InvalidConfigException,
  final ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
  Object configObj = mapper.readValue(new File(configFilePath), Object.class);
  JsonObject jsonConfig = new GsonBuilder().serializeNulls().create().toJsonTree(configObj).getAsJsonObject();
+ CoreConfig.updateConfigJsonFromEnv(jsonConfig);
+ StorageLayer.updateConfigJsonFromEnv(main, jsonConfig);
  CoreConfig config = ConfigMapper.mapConfig(jsonConfig, CoreConfig.class);
  config.normalizeAndValidate(main, true);
  this.core = config;
@@ -91,7 +93,10 @@ public static JsonObject getBaseConfigAsJsonObject(Main main) throws IOException
  // omit them from the output json.
  ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory());
  Object obj = yamlReader.readValue(new File(getConfigFilePath(main)), Object.class);
- return new GsonBuilder().serializeNulls().create().toJsonTree(obj).getAsJsonObject();
+ JsonObject configJson = new GsonBuilder().serializeNulls().create().toJsonTree(obj).getAsJsonObject();
+ CoreConfig.updateConfigJsonFromEnv(configJson);
+ StorageLayer.updateConfigJsonFromEnv(main, configJson);
+ return configJson;
  }
 
  private static String getConfigFilePath(Main main) {