fix: test slowness due to invalid otel url (#1184)

* fix: test slowness due to invalid otel url

* fix: domain fix and changelog

Author: sattvikc

CHANGELOG.md

@@ -11,6 +11,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 - Adds hikari logs to opentelemetry
 - Fetches core and plugin config from env
+- Open Telemetry configuration is now optional
+- Migrates API calls from supertokens.io to supertokens.com
 
 ## [11.0.5]
 

config.yaml

@@ -183,6 +183,6 @@ core_config_version: 0
 # account recovery token is valid for.
 # webauthn_recover_account_token_lifetime:
 
-# (OPTIONAL | Default: http://localhost:4317) string value. The URL of the OpenTelemetry collector to which the core
+# (OPTIONAL | Default: null) string value. The URL of the OpenTelemetry collector to which the core
 # will send telemetry data. This should be in the format http://<host>:<port> or https://<host>:<port>.
 # otel_collector_connection_uri:

devConfig.yaml

@@ -183,6 +183,6 @@ disable_telemetry: true
 # account recovery token is valid for.
 # webauthn_recover_account_token_lifetime:
 
-# (OPTIONAL | Default: http://localhost:4317) string value. The URL of the OpenTelemetry collector to which the core
+# (OPTIONAL | Default: null) string value. The URL of the OpenTelemetry collector to which the core
 # will send telemetry data. This should be in the format http://<host>:<port> or https://<host>:<port>.
 # otel_collector_connection_uri:

ee/src/main/java/io/supertokens/ee/EEFeatureFlag.java

@@ -523,7 +523,7 @@ private EE_FEATURES[] doServerCall(String licenseKey)
             ProcessState.getInstance(main)
                     .addState(ProcessState.PROCESS_STATE.LICENSE_KEY_CHECK_NETWORK_CALL, null, json);
             JsonObject licenseCheckResponse = HttpRequest.sendJsonPOSTRequest(this.main, REQUEST_ID,
-                    "https://api.supertokens.io/0/st/license/check",
+                    "https://api.supertokens.com/0/st/license/check",
                     json, 10000, 10000, 0);
             if (licenseCheckResponse.get("status").getAsString().equalsIgnoreCase("OK")) {
                 Logging.debug(main, appIdentifier.getAsPublicTenantIdentifier(), "API returned OK");

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

@@ -409,8 +409,8 @@ public class CoreConfig {
     @ConfigDescription(
             "The URL of the OpenTelemetry collector to which the core will send telemetry data. " +
                     "This should be in the format http://<host>:<port> or https://<host>:<port>. (Default: " +
-                    "http://localhost:4317)")
-    private String otel_collector_connection_uri = "http://localhost:4317";
+                    "null)")
+    private String otel_collector_connection_uri = null;
 
     @IgnoreForAnnotationCheck
     private static boolean disableOAuthValidationForTest = false;

src/main/java/io/supertokens/cronjobs/telemetry/Telemetry.java

@@ -157,7 +157,7 @@ protected void doTaskPerApp(AppIdentifier app) throws Exception {
             json.add("maus", new JsonArray());
         }
 
-        String url = "https://api.supertokens.io/0/st/telemetry";
+        String url = "https://api.supertokens.com/0/st/telemetry";
 
         // we call the API only if we are not testing the core, of if the request can be mocked (in case a test
         // wants

src/main/java/io/supertokens/storageLayer/StorageLayer.java

@@ -54,6 +54,7 @@ public class StorageLayer extends ResourceDistributor.SingletonResource {
     public static final String RESOURCE_KEY = "io.supertokens.storageLayer.StorageLayer";
     private final Storage storage;
     private static URLClassLoader ucl = null;
+    private static Storage storageInstanceForEnv = null;
 
     public Storage getUnderlyingStorage() {
         return storage;
@@ -68,30 +69,34 @@ public static Storage getNewBulkImportProxyStorageInstance(Main main, JsonObject
     }
 
     public static void updateConfigJsonFromEnv(Main main, JsonObject configJson) {
-        Storage result;
-        if (StorageLayer.ucl == null) {
-            result = new Start(main);
-        } else {
-            Storage storageLayer = null;
-            ServiceLoader<Storage> sl = ServiceLoader.load(Storage.class, ucl);
-            for (Storage plugin : sl) {
-                if (storageLayer == null) {
-                    storageLayer = plugin;
+        if (storageInstanceForEnv == null) {
+            Storage result;
+            if (StorageLayer.ucl == null) {
+                result = new Start(main);
+            } else {
+                Storage storageLayer = null;
+                ServiceLoader<Storage> sl = ServiceLoader.load(Storage.class, ucl);
+                for (Storage plugin : sl) {
+                    if (storageLayer == null) {
+                        storageLayer = plugin;
+                    } else {
+                        throw new QuitProgramException(
+                                "Multiple database plugins found. Please make sure that just one plugin is in the "
+                                        + "/plugin" + " "
+                                        + "folder of the installation. Alternatively, please redownload and install "
+                                        + "SuperTokens" + ".");
+                    }
+                }
+                if (storageLayer != null) {
+                    result = storageLayer;
                 } else {
-                    throw new QuitProgramException(
-                            "Multiple database plugins found. Please make sure that just one plugin is in the "
-                                    + "/plugin" + " "
-                                    + "folder of the installation. Alternatively, please redownload and install "
-                                    + "SuperTokens" + ".");
+                    result = new Start(main);
                 }
             }
-            if (storageLayer != null) {
-                result = storageLayer;
-            } else {
-                result = new Start(main);
-            }
+            storageInstanceForEnv = result;
         }
-        result.updateConfigJsonFromEnv(configJson);
+
+        storageInstanceForEnv.updateConfigJsonFromEnv(configJson);
     }
 
     private static Storage getNewInstance(Main main, JsonObject config, TenantIdentifier tenantIdentifier, boolean doNotLog, boolean isBulkImportProxy) throws InvalidConfigException {

src/main/java/io/supertokens/telemetry/TelemetryProvider.java

@@ -74,7 +74,7 @@ public void createLogEvent(TenantIdentifier tenantIdentifier, String logMessage,
     public void createLogEvent(TenantIdentifier tenantIdentifier, String logMessage,
                                String logLevel, Map<String, String> additionalAttributes) {
         if (openTelemetry == null) {
-            throw new IllegalStateException("OpenTelemetry is not initialized. Call initialize() first.");
+            return; // no telemetry provider available
         }
         SpanBuilder spanBuilder = createSpanBuilder(tenantIdentifier, logLevel, additionalAttributes);
 
@@ -143,6 +143,12 @@ public static Span addEventToSpan(Span span, String eventName, Attributes attrib
 
 
     private static OpenTelemetry initializeOpenTelemetry(Main main) {
+        String collectorUri = Config.getBaseConfig(main).getOtelCollectorConnectionURI();
+
+        if (collectorUri == null || collectorUri.isEmpty()) {
+            return null;
+        }
+
         if (getInstance(main) != null && getInstance(main).openTelemetry != null) {
             return getInstance(main).openTelemetry; // already initialized
         }
@@ -151,8 +157,6 @@ private static OpenTelemetry initializeOpenTelemetry(Main main) {
                 .put(SERVICE_NAME, "supertokens-core")
                 .build();
 
-        String collectorUri = Config.getBaseConfig(main).getOtelCollectorConnectionURI();
-
         SdkTracerProvider sdkTracerProvider =
                 SdkTracerProvider.builder()
                         .setResource(resource)

src/main/java/io/supertokens/version/VersionFile.java

@@ -38,7 +38,7 @@ void validate() {
         if (core_version == null || plugin_interface_version == null) {
             throw new QuitProgramException(
                     "version.yaml file seems to be corrupted. Please redownload and install SuperTokens from "
-                            + "https://supertokens.io/dashboard");
+                            + "https://supertokens.com/");
         }
     }