diff --git a/.github/workflows/publish-dev-docker.yml b/.github/workflows/publish-dev-docker.yml
index 6fc303092..96ba23db1 100644
--- a/.github/workflows/publish-dev-docker.yml
+++ b/.github/workflows/publish-dev-docker.yml
@@ -19,6 +19,8 @@ jobs:
         id: result
         with:
           run-for: PR
+          core-branch: ${{ github.ref_name }}
+
   docker:
     name: Docker
     runs-on: ubuntu-latest
diff --git a/.github/workflows/stress-tests.yml b/.github/workflows/stress-tests.yml
index e2b943b08..51d6a2254 100644
--- a/.github/workflows/stress-tests.yml
+++ b/.github/workflows/stress-tests.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   stress-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Set up Node.js
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 2bd3d3cc9..892572364 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   dependency-branches:
     name: Dependency Branches
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       branches: ${{ steps.result.outputs.branches }}
 
@@ -16,6 +16,7 @@ jobs:
         id: result
         with:
           run-for: PR
+          core-branch: ${{ github.head_ref }}
 
   test:
     name: Unit tests
@@ -30,7 +31,7 @@ jobs:
           # - mysql
           # - mongodb
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Set up JDK 21.0.7
         uses: actions/setup-java@v2
diff --git a/.gitignore b/.gitignore
index d97d2e8d0..2be50678d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ gradle-app.setting
 !cli/jar/**/*.jar
 !downloader/jar/**/*.jar
 !ee/jar/**/*.jar
+!src/main/resources/**/*.jar
 
 *target*
 *.war
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d04c79a4..9d8f639fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [11.1.1]
+
+- Adds opentelemetry-javaagent to the core distribution
+
 ## [11.1.0]
 
 - Adds hikari logs to opentelemetry
diff --git a/build.gradle b/build.gradle
index 4502c5993..8f50fbd88 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,6 +9,7 @@
 plugins {
     id 'application'
     id 'java-library'
+    id "io.freefair.aspectj" version "8.13" //same as gradle version!
 }
 compileJava { options.encoding = "UTF-8" }
 compileTestJava { options.encoding = "UTF-8" }
@@ -26,7 +27,7 @@ java {
     }
 }
 
-version = "11.1.0"
+version = "11.1.1"
 
 repositories {
     mavenCentral()
@@ -47,7 +48,6 @@ dependencies {
     // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.18.2'
 
-
     // https://mvnrepository.com/artifact/org.apache.tomcat.embed/tomcat-embed-core
     api group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '11.0.8'
 
@@ -99,6 +99,7 @@ dependencies {
 
     implementation("io.opentelemetry.semconv:opentelemetry-semconv")
 
+    implementation('org.aspectj:aspectjrt:1.9.24')
 
     compileOnly project(":supertokens-plugin-interface")
 
diff --git a/cli/build.gradle b/cli/build.gradle
index ace15859e..d5fa41c69 100644
--- a/cli/build.gradle
+++ b/cli/build.gradle
@@ -19,10 +19,10 @@ dependencies {
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.13.1'
 
     // https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml
-    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.16.1'
+    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.18.2'
 
     // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.1'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.18.2'
 
     // https://mvnrepository.com/artifact/de.mkammerer/argon2-jvm
     implementation group: 'de.mkammerer', name: 'argon2-jvm', version: '2.11'
diff --git a/cli/implementationDependencies.json b/cli/implementationDependencies.json
index f6a70637d..25fcbb696 100644
--- a/cli/implementationDependencies.json
+++ b/cli/implementationDependencies.json
@@ -12,19 +12,19 @@
 		"src":"https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.38.0/error_prone_annotations-2.38.0-sources.jar"
 	},
 	{
-		"jar":"https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.16.1/jackson-dataformat-yaml-2.16.1.jar",
-		"name":"jackson-dataformat-yaml 2.16.1",
-		"src":"https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.16.1/jackson-dataformat-yaml-2.16.1-sources.jar"
+		"jar":"https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.18.2/jackson-dataformat-yaml-2.18.2.jar",
+		"name":"jackson-dataformat-yaml 2.18.2",
+		"src":"https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.18.2/jackson-dataformat-yaml-2.18.2-sources.jar"
 	},
 	{
-		"jar":"https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/2.2/snakeyaml-2.2.jar",
-		"name":"snakeyaml 2.2",
-		"src":"https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/2.2/snakeyaml-2.2-sources.jar"
+		"jar":"https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/2.3/snakeyaml-2.3.jar",
+		"name":"snakeyaml 2.3",
+		"src":"https://repo.maven.apache.org/maven2/org/yaml/snakeyaml/2.3/snakeyaml-2.3-sources.jar"
 	},
 	{
-		"jar":"https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.16.1/jackson-databind-2.16.1.jar",
-		"name":"jackson-databind 2.16.1",
-		"src":"https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.16.1/jackson-databind-2.16.1-sources.jar"
+		"jar":"https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.18.2/jackson-databind-2.18.2.jar",
+		"name":"jackson-databind 2.18.2",
+		"src":"https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.18.2/jackson-databind-2.18.2-sources.jar"
 	},
 	{
 		"jar":"https://repo.maven.apache.org/maven2/de/mkammerer/argon2-jvm/2.11/argon2-jvm-2.11.jar",
diff --git a/cli/src/main/java/io/supertokens/cli/commandHandler/start/StartHandler.java b/cli/src/main/java/io/supertokens/cli/commandHandler/start/StartHandler.java
index 5bf579567..30c6145c9 100644
--- a/cli/src/main/java/io/supertokens/cli/commandHandler/start/StartHandler.java
+++ b/cli/src/main/java/io/supertokens/cli/commandHandler/start/StartHandler.java
@@ -43,12 +43,38 @@ public void doCommand(String installationDir, boolean viaInstaller, String[] arg
         String host = CLIOptionsParser.parseOption("--host", args);
         boolean foreground = CLIOptionsParser.hasKey("--foreground", args);
         boolean forceNoInMemDB = CLIOptionsParser.hasKey("--no-in-mem-db", args);
+        boolean javaagentEnabled = CLIOptionsParser.hasKey("--javaagent", args);
+        boolean jmxEnabled = CLIOptionsParser.hasKey("--jmx", args);
+        String jmxPort = CLIOptionsParser.parseOption("--jmx-port", args);
+        String jmxAuthenticate = CLIOptionsParser.parseOption("--jmx-authenticate", args);
+        String jmxSSL = CLIOptionsParser.parseOption("--jmx-ssl", args);
 
         List<String> commands = new ArrayList<>();
         if (OperatingSystem.getOS() == OperatingSystem.OS.WINDOWS) {
             commands.add(installationDir + "jre\\bin\\java.exe");
             commands.add("-classpath");
             commands.add("\"" + installationDir + "core\\*\";\"" + installationDir + "plugin-interface\\*\"");
+            if (javaagentEnabled) {
+                commands.add("-javaagent:\"" + installationDir + "agent\\opentelemetry-javaagent.jar\"");
+            }
+            if (jmxEnabled) {
+                commands.add("-Dcom.sun.management.jmxremote");
+                if (jmxPort != null) {
+                    commands.add("-Dcom.sun.management.jmxremote.port=" + jmxPort);
+                } else {
+                    commands.add("-Dcom.sun.management.jmxremote.port=9010");
+                }
+                if (jmxAuthenticate != null) {
+                    commands.add("-Dcom.sun.management.jmxremote.authenticate=" + jmxAuthenticate);
+                } else {
+                    commands.add("-Dcom.sun.management.jmxremote.authenticate=false");
+                }
+                if (jmxSSL != null) {
+                    commands.add("-Dcom.sun.management.jmxremote.ssl=" + jmxSSL);
+                } else {
+                    commands.add("-Dcom.sun.management.jmxremote.ssl=false");
+                }
+            }
             if (space != null) {
                 commands.add("-Xmx" + space + "M");
             }
@@ -77,6 +103,27 @@ public void doCommand(String installationDir, boolean viaInstaller, String[] arg
             commands.add("-classpath");
             commands.add(
                     installationDir + "core/*:" + installationDir + "plugin-interface/*:" + installationDir + "ee/*");
+            if (javaagentEnabled) {
+                commands.add("-javaagent:" + installationDir + "agent/opentelemetry-javaagent.jar");
+            }
+            if (jmxEnabled) {
+                commands.add("-Dcom.sun.management.jmxremote");
+                if (jmxPort != null) {
+                    commands.add("-Dcom.sun.management.jmxremote.port=" + jmxPort);
+                } else {
+                    commands.add("-Dcom.sun.management.jmxremote.port=9010");
+                }
+                if (jmxAuthenticate != null) {
+                    commands.add("-Dcom.sun.management.jmxremote.authenticate=" + jmxAuthenticate);
+                } else {
+                    commands.add("-Dcom.sun.management.jmxremote.authenticate=false");
+                }
+                if (jmxSSL != null) {
+                    commands.add("-Dcom.sun.management.jmxremote.ssl=" + jmxSSL);
+                } else {
+                    commands.add("-Dcom.sun.management.jmxremote.ssl=false");
+                }
+            }
             if (space != null) {
                 commands.add("-Xmx" + space + "M");
             }
@@ -101,6 +148,7 @@ public void doCommand(String installationDir, boolean viaInstaller, String[] arg
         if (!foreground) {
             try {
                 ProcessBuilder pb = new ProcessBuilder(commands);
+                Logging.info("Command to be run: " + String.join(" ", pb.command()));
                 pb.redirectErrorStream(true);
                 Process process = pb.start();
                 try (InputStreamReader in = new InputStreamReader(process.getInputStream());
@@ -181,6 +229,13 @@ protected List<Option> getOptionsAndDescription() {
                 new Option("--foreground", "Runs this instance of SuperTokens in the foreground (not as a daemon)"));
         options.add(
                 new Option("--with-temp-dir", "Uses the passed dir as temp dir, instead of the internal default."));
+        options.add(new Option("--javaagent", "Enables the OpenTelemetry Javaagent for tracing and metrics."));
+        options.add(new Option("--jmx", "Enables JMX management and monitoring."));
+        options.add(new Option("--jmx-port", "Sets the port for JMX. Defaults to 9010 if --jmx is passed."));
+        options.add(new Option("--jmx-authenticate",
+                "Sets whether JMX authentication is enabled or not. Defaults to false if --jmx is passed."));
+        options.add(new Option("--jmx-ssl",
+                "Sets whether JMX SSL is enabled or not. Defaults to false if --jmx is passed."));
         return options;
     }
 
diff --git a/implementationDependencies.json b/implementationDependencies.json
index 3d04d04af..816fdcbbc 100644
--- a/implementationDependencies.json
+++ b/implementationDependencies.json
@@ -111,6 +111,11 @@
 		"name":"logback-classic 1.5.18",
 		"src":"https://repo.maven.apache.org/maven2/ch/qos/logback/logback-classic/1.5.18/logback-classic-1.5.18-sources.jar"
 	},
+	{
+		"jar":"https://repo.maven.apache.org/maven2/org/aspectj/aspectjrt/1.9.24/aspectjrt-1.9.24.jar",
+		"name":"aspectjrt 1.9.24",
+		"src":"https://repo.maven.apache.org/maven2/org/aspectj/aspectjrt/1.9.24/aspectjrt-1.9.24-sources.jar"
+	},
 	{
 		"jar":"https://repo.maven.apache.org/maven2/io/opentelemetry/opentelemetry-api/1.51.0/opentelemetry-api-1.51.0.jar",
 		"name":"opentelemetry-api 1.51.0",
diff --git a/src/main/java/io/supertokens/cronjobs/syncCoreConfigWithDb/SyncCoreConfigWithDb.java b/src/main/java/io/supertokens/cronjobs/syncCoreConfigWithDb/SyncCoreConfigWithDb.java
index ba74509be..3e5bc194d 100644
--- a/src/main/java/io/supertokens/cronjobs/syncCoreConfigWithDb/SyncCoreConfigWithDb.java
+++ b/src/main/java/io/supertokens/cronjobs/syncCoreConfigWithDb/SyncCoreConfigWithDb.java
@@ -19,12 +19,9 @@
 import io.supertokens.Main;
 import io.supertokens.cronjobs.CronTask;
 import io.supertokens.cronjobs.CronTaskTest;
-import io.supertokens.cronjobs.deleteExpiredSessions.DeleteExpiredSessions;
-import io.supertokens.multitenancy.Multitenancy;
 import io.supertokens.multitenancy.MultitenancyHelper;
 import io.supertokens.pluginInterface.multitenancy.TenantIdentifier;
-
-import java.util.List;
+import io.supertokens.pluginInterface.opentelemetry.WithinOtelSpan;
 
 public class SyncCoreConfigWithDb extends CronTask {
 
@@ -62,6 +59,7 @@ public int getInitialWaitTimeSeconds() {
         return 60;
     }
 
+    @WithinOtelSpan
     @Override
     protected void doTaskForTargetTenant(TenantIdentifier targetTenant) throws Exception {
         MultitenancyHelper.getInstance(main).refreshTenantsInCoreBasedOnChangesInCoreConfigOrIfTenantListChanged(true);
diff --git a/src/main/java/io/supertokens/multitenancy/MultitenancyHelper.java b/src/main/java/io/supertokens/multitenancy/MultitenancyHelper.java
index ee9ec977e..3dfb9e102 100644
--- a/src/main/java/io/supertokens/multitenancy/MultitenancyHelper.java
+++ b/src/main/java/io/supertokens/multitenancy/MultitenancyHelper.java
@@ -33,6 +33,7 @@
 import io.supertokens.pluginInterface.exceptions.StorageQueryException;
 import io.supertokens.pluginInterface.multitenancy.*;
 import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
+import io.supertokens.pluginInterface.opentelemetry.WithinOtelSpan;
 import io.supertokens.session.refreshToken.RefreshTokenKey;
 import io.supertokens.signingkeys.AccessTokenSigningKey;
 import io.supertokens.signingkeys.JWTSigningKey;
@@ -116,6 +117,7 @@ null, null, new JsonObject()
         return StorageLayer.getMultitenancyStorage(main).getAllTenants();
     }
 
+    @WithinOtelSpan
     public List<TenantIdentifier> refreshTenantsInCoreBasedOnChangesInCoreConfigOrIfTenantListChanged(
             boolean reloadAllResources) {
         try {
diff --git a/src/main/java/io/supertokens/storageLayer/StorageLayer.java b/src/main/java/io/supertokens/storageLayer/StorageLayer.java
index a55102a41..eea5fbf47 100644
--- a/src/main/java/io/supertokens/storageLayer/StorageLayer.java
+++ b/src/main/java/io/supertokens/storageLayer/StorageLayer.java
@@ -36,6 +36,7 @@
 import io.supertokens.pluginInterface.multitenancy.TenantConfig;
 import io.supertokens.pluginInterface.multitenancy.TenantIdentifier;
 import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
+import io.supertokens.pluginInterface.opentelemetry.WithinOtelSpan;
 import io.supertokens.pluginInterface.useridmapping.UserIdMapping;
 import io.supertokens.telemetry.TelemetryProvider;
 import io.supertokens.useridmapping.UserIdType;
@@ -49,6 +50,7 @@
 import java.net.URLClassLoader;
 import java.util.*;
 
+@WithinOtelSpan
 public class StorageLayer extends ResourceDistributor.SingletonResource {
 
     public static final String RESOURCE_KEY = "io.supertokens.storageLayer.StorageLayer";
@@ -386,6 +388,7 @@ public static Storage getBaseStorage(Main main) {
         }
     }
 
+    @WithinOtelSpan
     public static Storage getStorage(TenantIdentifier tenantIdentifier, Main main)
             throws TenantOrAppNotFoundException {
         return getInstance(tenantIdentifier, main).storage;
diff --git a/src/main/java/io/supertokens/telemetry/MethodSpanner.java b/src/main/java/io/supertokens/telemetry/MethodSpanner.java
new file mode 100644
index 000000000..40a582599
--- /dev/null
+++ b/src/main/java/io/supertokens/telemetry/MethodSpanner.java
@@ -0,0 +1,76 @@
+/*
+ *    Copyright (c) 2025, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ *    This software is licensed under the Apache License, Version 2.0 (the
+ *    "License") as published by the Apache Software Foundation.
+ *
+ *    You may not use this file except in compliance with the License. You may
+ *    obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *    License for the specific language governing permissions and limitations
+ *    under the License.
+ */
+
+package io.supertokens.telemetry;
+
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.context.Scope;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Aspect
+public class MethodSpanner {
+
+    @Around("execution(* (@io.supertokens.pluginInterface.opentelemetry.WithinOtelSpan *).*(..))")
+    public Object anyMethodInClassAnnotatedWithWithinOtelSpan(ProceedingJoinPoint joinPoint) throws Throwable {
+        return withinOtelSpan(joinPoint);
+    }
+
+    @Around("execution(@io.supertokens.pluginInterface.opentelemetry.WithinOtelSpan * *(..))")
+    public Object withinOtelSpan(ProceedingJoinPoint joinPoint) throws Throwable {
+        Span span = GlobalOpenTelemetry.get().getTracer("core-tracer")
+                .spanBuilder(joinPoint.getSignature().getDeclaringTypeName() + "." + joinPoint.getSignature().getName())
+                .startSpan();
+        try (Scope spanScope = span.makeCurrent()) {
+            Map<String, String> methodArguments = new HashMap<>();
+            for (Object argument : joinPoint.getArgs()) {
+                if (argument != null) {
+                    methodArguments.put(argument.getClass().getCanonicalName(), String.valueOf(argument));
+                } else {
+                    methodArguments.put("null", "null");
+                }
+
+            }
+            span.setAttribute("method.arguments", methodArguments.keySet().stream().map(key -> key + ": " + methodArguments.get(key))
+                    .collect(Collectors.joining(", ", "{", "}")));
+            try {
+                Object result = joinPoint.proceed(); //run the actual method
+                if (result != null) {
+                    span.setAttribute("method.returns",
+                            result.getClass().getCanonicalName() + " -> " + result);
+                } else {
+                    span.setAttribute("method.returns", "void/null");
+                }
+                span.setStatus(StatusCode.OK);
+                return result;
+            } catch (Throwable e) {
+                span.recordException(e);
+                span.setStatus(StatusCode.ERROR);
+                throw e;
+            }
+        } finally {
+            span.end();
+        }
+    }
+
+}
diff --git a/src/main/java/io/supertokens/telemetry/TelemetryAppender.java b/src/main/java/io/supertokens/telemetry/TelemetryAppender.java
new file mode 100644
index 000000000..59f96cfe4
--- /dev/null
+++ b/src/main/java/io/supertokens/telemetry/TelemetryAppender.java
@@ -0,0 +1,54 @@
+/*
+ *    Copyright (c) 2025, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ *    This software is licensed under the Apache License, Version 2.0 (the
+ *    "License") as published by the Apache Software Foundation.
+ *
+ *    You may not use this file except in compliance with the License. You may
+ *    obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *    License for the specific language governing permissions and limitations
+ *    under the License.
+ */
+
+package io.supertokens.telemetry;
+
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.common.AttributesBuilder;
+import io.opentelemetry.api.trace.Span;
+
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+public class TelemetryAppender {
+
+    private final static TelemetryAppender instance = new TelemetryAppender();
+
+    public static TelemetryAppender getInstance() {
+        return instance;
+    }
+
+    private TelemetryAppender() {
+    }
+
+    public void appendEventToCurrentSpan(String eventName, Map<String, String> eventData, long timestamp) {
+        Span.current().addEvent(eventName, fromMap(eventData), timestamp, TimeUnit.MILLISECONDS);
+    }
+
+    public void appendAttributesToCurrentSpan(Map<String, String> attributes) {
+        Span.current().setAllAttributes(fromMap(attributes));
+    }
+
+    private Attributes fromMap(Map<String, String> map) {
+        AttributesBuilder ab = Attributes.builder();
+        if(map != null) {
+            for (Map.Entry<String, String> e : map.entrySet()) {
+                ab.put(e.getKey(), e.getValue());
+            }
+        }
+        return ab.build();
+    }
+}
diff --git a/src/main/java/io/supertokens/telemetry/TelemetryProvider.java b/src/main/java/io/supertokens/telemetry/TelemetryProvider.java
index 0acf5e386..cf9450c86 100644
--- a/src/main/java/io/supertokens/telemetry/TelemetryProvider.java
+++ b/src/main/java/io/supertokens/telemetry/TelemetryProvider.java
@@ -19,7 +19,6 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.common.Attributes;
-import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
 import io.opentelemetry.context.Context;
@@ -114,37 +113,13 @@ private SpanBuilder addAttributesToSpanBuilder(SpanBuilder spanBuilder, TenantId
         return spanBuilder;
     }
 
-    public static Span startSpan(Main main, TenantIdentifier tenantIdentifier, String spanName) {
-        Span span = getInstance(main).openTelemetry.getTracer("core-tracer")
-                .spanBuilder(spanName)
-                .setParent(Context.current())
-                .setAttribute("tenant.connectionUriDomain", tenantIdentifier.getConnectionUriDomain())
-                .setAttribute("tenant.appId", tenantIdentifier.getAppId())
-                .setAttribute("tenant.tenantId", tenantIdentifier.getTenantId())
-                .startSpan();
-
-        span.makeCurrent(); // Set the span as the current context
-        return span;
-    }
-
-    public static Span endSpan(Span span) {
-        if (span != null) {
-            span.end();
-        }
-        return span;
-    }
-
-    public static Span addEventToSpan(Span span, String eventName, Attributes attributes) {
-        if (span != null) {
-            span.addEvent(eventName, attributes, System.currentTimeMillis(), TimeUnit.MILLISECONDS);
-        }
-        return span;
-    }
-
-
     private static OpenTelemetry initializeOpenTelemetry(Main main) {
         String collectorUri = Config.getBaseConfig(main).getOtelCollectorConnectionURI();
 
+        if (GlobalOpenTelemetry.get() != null) {
+            return GlobalOpenTelemetry.get(); // already initialized
+        }
+
         if (collectorUri == null || collectorUri.isEmpty()) {
             return null;
         }
@@ -152,7 +127,8 @@ private static OpenTelemetry initializeOpenTelemetry(Main main) {
         if (getInstance(main) != null && getInstance(main).openTelemetry != null) {
             return getInstance(main).openTelemetry; // already initialized
         }
-        
+
+
         Resource resource = Resource.getDefault().toBuilder()
                 .put(SERVICE_NAME, "supertokens-core")
                 .build();
diff --git a/src/main/java/io/supertokens/webserver/WebserverAPI.java b/src/main/java/io/supertokens/webserver/WebserverAPI.java
index 7be51494c..95959a2f6 100644
--- a/src/main/java/io/supertokens/webserver/WebserverAPI.java
+++ b/src/main/java/io/supertokens/webserver/WebserverAPI.java
@@ -32,6 +32,7 @@
 import io.supertokens.pluginInterface.multitenancy.AppIdentifier;
 import io.supertokens.pluginInterface.multitenancy.TenantIdentifier;
 import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
+import io.supertokens.pluginInterface.opentelemetry.WithinOtelSpan;
 import io.supertokens.storageLayer.StorageLayer;
 import io.supertokens.useridmapping.UserIdType;
 import io.supertokens.utils.SemVer;
@@ -358,6 +359,7 @@ private AppIdentifier getAppIdentifierWithoutVerifying(HttpServletRequest req) t
         return new AppIdentifier(this.getConnectionUriDomain(req), this.getAppId(req));
     }
 
+    @WithinOtelSpan
     protected AppIdentifier getAppIdentifier(HttpServletRequest req)
             throws ServletException, TenantOrAppNotFoundException {
         AppIdentifier appIdentifier = getAppIdentifierWithoutVerifying(req);
diff --git a/src/main/java/io/supertokens/webserver/api/core/HelloAPI.java b/src/main/java/io/supertokens/webserver/api/core/HelloAPI.java
index c0691863a..57d01a253 100644
--- a/src/main/java/io/supertokens/webserver/api/core/HelloAPI.java
+++ b/src/main/java/io/supertokens/webserver/api/core/HelloAPI.java
@@ -21,6 +21,7 @@
 import io.supertokens.pluginInterface.exceptions.StorageQueryException;
 import io.supertokens.pluginInterface.multitenancy.AppIdentifier;
 import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
+import io.supertokens.pluginInterface.opentelemetry.WithinOtelSpan;
 import io.supertokens.storageLayer.StorageLayer;
 import io.supertokens.utils.RateLimiter;
 import io.supertokens.webserver.WebserverAPI;
@@ -32,6 +33,7 @@
 
 // the point of this API is only to test that the server is up and running.
 
+@WithinOtelSpan
 public class HelloAPI extends WebserverAPI {
 
     private static final long serialVersionUID = 1L;
@@ -75,6 +77,7 @@ protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IO
         handleRequest(req, resp);
     }
 
+
     private void handleRequest(HttpServletRequest req, HttpServletResponse resp) throws IOException, ServletException {
         // API is app specific
 
@@ -84,6 +87,13 @@ private void handleRequest(HttpServletRequest req, HttpServletResponse resp) thr
                     appIdentifier); // throws tenantOrAppNotFoundException
 
             RateLimiter rateLimiter = RateLimiter.getInstance(appIdentifier, super.main, 200);
+//            TelemetryAppender.getInstance()
+//                    .appendEventToCurrentSpan("HelloAPI called", null, System.currentTimeMillis());
+//            TelemetryAppender.getInstance()
+//                    .appendEventToCurrentSpan("HelloAPI called", Map.of("eventKey", "eventValue"),
+//                            System.currentTimeMillis());
+//            TelemetryAppender.getInstance().appendAttributesToCurrentSpan(
+//                    Map.of("rateLimited", String.valueOf(rateLimiter.checkRequest())));
             if (!rateLimiter.checkRequest()) {
                 if (Main.isTesting) {
                     super.sendTextResponse(200, "RateLimitedHello", resp);
@@ -98,6 +108,7 @@ private void handleRequest(HttpServletRequest req, HttpServletResponse resp) thr
                 // idea here is to test that the storage is working
                 storage.getKeyValue(appIdentifier.getAsPublicTenantIdentifier(), "Test");
             }
+
             super.sendTextResponse(200, "Hello", resp);
         } catch (StorageQueryException | TenantOrAppNotFoundException e) {
             // we send 500 status code
diff --git a/src/main/resources/opentelemetry-javaagent.jar b/src/main/resources/opentelemetry-javaagent.jar
new file mode 100644
index 000000000..296134236
Binary files /dev/null and b/src/main/resources/opentelemetry-javaagent.jar differ
diff --git a/src/main/resources/opentelemetry-jmx-metrics.jar b/src/main/resources/opentelemetry-jmx-metrics.jar
new file mode 100644
index 000000000..8c941c167
Binary files /dev/null and b/src/main/resources/opentelemetry-jmx-metrics.jar differ