diff --git a/neverpile-eureka-core/pom.xml b/neverpile-eureka-core/pom.xml
index 930b488..9f75c4e 100644
--- a/neverpile-eureka-core/pom.xml
+++ b/neverpile-eureka-core/pom.xml
@@ -20,7 +20,7 @@
     </dependency>
     <dependency>
       <groupId>com.neverpile.commons</groupId>
-      <artifactId>neverpile-commons-opentracing</artifactId>
+      <artifactId>neverpile-commons-opentelemetry</artifactId>
     </dependency>
 
     <!-- Spring -->
diff --git a/neverpile-eureka-core/src/main/java/com/neverpile/eureka/impl/documentservice/DefaultDocumentService.java b/neverpile-eureka-core/src/main/java/com/neverpile/eureka/impl/documentservice/DefaultDocumentService.java
index d3cd622..4402202 100644
--- a/neverpile-eureka-core/src/main/java/com/neverpile/eureka/impl/documentservice/DefaultDocumentService.java
+++ b/neverpile-eureka-core/src/main/java/com/neverpile/eureka/impl/documentservice/DefaultDocumentService.java
@@ -24,7 +24,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.neverpile.common.opentracing.TraceInvocation;
+import com.neverpile.common.opentelemetry.TraceInvocation;
 import com.neverpile.eureka.api.DocumentAssociatedEntityStore;
 import com.neverpile.eureka.api.DocumentService;
 import com.neverpile.eureka.api.ObjectStoreService;
diff --git a/neverpile-eureka-core/src/main/java/com/neverpile/eureka/impl/documentservice/DefaultMultiVersioningDocumentService.java b/neverpile-eureka-core/src/main/java/com/neverpile/eureka/impl/documentservice/DefaultMultiVersioningDocumentService.java
index 8531067..a206695 100644
--- a/neverpile-eureka-core/src/main/java/com/neverpile/eureka/impl/documentservice/DefaultMultiVersioningDocumentService.java
+++ b/neverpile-eureka-core/src/main/java/com/neverpile/eureka/impl/documentservice/DefaultMultiVersioningDocumentService.java
@@ -28,7 +28,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.neverpile.common.opentracing.TraceInvocation;
+import com.neverpile.common.opentelemetry.TraceInvocation;
 import com.neverpile.common.util.VisibleForTesting;
 import com.neverpile.eureka.api.DocumentAssociatedEntityStore;
 import com.neverpile.eureka.api.MultiVersioningDocumentService;
diff --git a/neverpile-eureka-core/src/main/java/com/neverpile/eureka/tx/wal/local/FileBasedWAL.java b/neverpile-eureka-core/src/main/java/com/neverpile/eureka/tx/wal/local/FileBasedWAL.java
index 7787d61..eea3367 100644
--- a/neverpile-eureka-core/src/main/java/com/neverpile/eureka/tx/wal/local/FileBasedWAL.java
+++ b/neverpile-eureka-core/src/main/java/com/neverpile/eureka/tx/wal/local/FileBasedWAL.java
@@ -32,8 +32,8 @@
 import org.springframework.stereotype.Component;
 import org.springframework.util.StreamUtils;
 
-import com.neverpile.common.opentracing.Tag;
-import com.neverpile.common.opentracing.TraceInvocation;
+import com.neverpile.common.opentelemetry.Attribute;
+import com.neverpile.common.opentelemetry.TraceInvocation;
 import com.neverpile.eureka.tx.wal.TransactionWAL.TransactionalAction;
 import com.neverpile.eureka.tx.wal.WALException;
 import com.neverpile.eureka.tx.wal.WriteAheadLog;
@@ -224,7 +224,7 @@ public void stop() throws IOException {
    */
   @Override
   @TraceInvocation
-  public void logAction(final String id, @Tag(name = "action") final ActionType type,
+  public void logAction(final String id, @Attribute(name = "action") final ActionType type,
       final TransactionalAction action) {
     fileLock.writeLock().lock();
     try {
diff --git a/neverpile-eureka-hazelcast/src/main/java/com/neverpile/eureka/hazelcast/wal/HazelcastWAL.java b/neverpile-eureka-hazelcast/src/main/java/com/neverpile/eureka/hazelcast/wal/HazelcastWAL.java
index 0b9e916..870f0d1 100644
--- a/neverpile-eureka-hazelcast/src/main/java/com/neverpile/eureka/hazelcast/wal/HazelcastWAL.java
+++ b/neverpile-eureka-hazelcast/src/main/java/com/neverpile/eureka/hazelcast/wal/HazelcastWAL.java
@@ -24,8 +24,8 @@
 import com.hazelcast.cp.lock.FencedLock;
 import com.hazelcast.map.IMap;
 import com.hazelcast.multimap.MultiMap;
-import com.neverpile.common.opentracing.Tag;
-import com.neverpile.common.opentracing.TraceInvocation;
+import com.neverpile.common.opentelemetry.Attribute;
+import com.neverpile.common.opentelemetry.TraceInvocation;
 import com.neverpile.eureka.tx.wal.TransactionWAL.TransactionalAction;
 import com.neverpile.eureka.tx.wal.WALException;
 import com.neverpile.eureka.tx.wal.WriteAheadLog;
@@ -183,7 +183,7 @@ private void applyActions(final ActionType type, final List<Entry> txEntries) {
    */
   @Override
   @TraceInvocation
-  public void logAction(final String id, @Tag(name="action") final ActionType type, final TransactionalAction action) {
+  public void logAction(final String id, @Attribute(name="action") final ActionType type, final TransactionalAction action) {
     logger.debug("Logging {} action for tx {}: {}", type, id, action);
     ActionEntry entry = new ActionEntry(id, type, action);
     log(id, entry);
diff --git a/neverpile-eureka-ignite/src/main/java/com/neverpile/eureka/ignite/wal/IgniteWAL.java b/neverpile-eureka-ignite/src/main/java/com/neverpile/eureka/ignite/wal/IgniteWAL.java
index bda86c1..5b6ae81 100644
--- a/neverpile-eureka-ignite/src/main/java/com/neverpile/eureka/ignite/wal/IgniteWAL.java
+++ b/neverpile-eureka-ignite/src/main/java/com/neverpile/eureka/ignite/wal/IgniteWAL.java
@@ -30,8 +30,8 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 
-import com.neverpile.common.opentracing.Tag;
-import com.neverpile.common.opentracing.TraceInvocation;
+import com.neverpile.common.opentelemetry.Attribute;
+import com.neverpile.common.opentelemetry.TraceInvocation;
 import com.neverpile.eureka.ignite.IgniteConfigurationProperties;
 import com.neverpile.eureka.tx.wal.TransactionWAL.TransactionalAction;
 import com.neverpile.eureka.tx.wal.WALException;
@@ -250,7 +250,7 @@ private void applyActions(final ActionType type, final List<Entry> txEntries) {
       "subsystem", "ignite.wal"
   }, value = "eureka.ignite.wal.log")
   @TraceInvocation
-  public void logAction(final String id,  @Tag(name="action") final ActionType type, final TransactionalAction action) {
+  public void logAction(final String id,  @Attribute(name="action") final ActionType type, final TransactionalAction action) {
     logger.debug("Logging {} action for tx {}: {}", type, id, action);
     ActionEntry entry = new ActionEntry(id, type, action);
     log(id, entry);
diff --git a/neverpile-eureka-objectstore-s3/src/main/java/com/neverpile/eureka/objectstore/s3/S3ObjectStoreService.java b/neverpile-eureka-objectstore-s3/src/main/java/com/neverpile/eureka/objectstore/s3/S3ObjectStoreService.java
index df54035..28577c7 100644
--- a/neverpile-eureka-objectstore-s3/src/main/java/com/neverpile/eureka/objectstore/s3/S3ObjectStoreService.java
+++ b/neverpile-eureka-objectstore-s3/src/main/java/com/neverpile/eureka/objectstore/s3/S3ObjectStoreService.java
@@ -26,8 +26,8 @@
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.S3Object;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
-import com.neverpile.common.opentracing.Tag;
-import com.neverpile.common.opentracing.TraceInvocation;
+import com.neverpile.common.opentelemetry.Attribute;
+import com.neverpile.common.opentelemetry.TraceInvocation;
 import com.neverpile.eureka.api.ObjectStoreService;
 import com.neverpile.eureka.api.exception.VersionMismatchException;
 import com.neverpile.eureka.model.ObjectName;
@@ -134,8 +134,8 @@ private void init() {
       "subsystem", "s3.object-store"
   }, value = "eureka.s3.object-store.put")
   @TraceInvocation
-  public void put(@Tag(name = "key", valueAdapter = ObjectNameMapper.class) final ObjectName objectName,
-      final String version, final InputStream content, @Tag(name = "length") final long length) {
+  public void put(@Attribute(name = "key", valueAdapter = ObjectNameMapper.class) final ObjectName objectName,
+      final String version, final InputStream content, @Attribute(name = "length") final long length) {
     String bucket = connectionConfiguration.getDefaultBucketName();
     String key = toKey(objectName);
 
@@ -263,7 +263,7 @@ public InputStream getInputStream() {
   @Override
   @TraceInvocation
   public Stream<StoreObject> list(
-      @Tag(name = "prefix", valueAdapter = ObjectNameMapper.class) final ObjectName prefix) {
+      @Attribute(name = "prefix", valueAdapter = ObjectNameMapper.class) final ObjectName prefix) {
     String prefixKey = toKey(prefix);
 
     ListObjectsRequest lor = new ListObjectsRequest();
@@ -280,7 +280,7 @@ public Stream<StoreObject> list(
       "subsystem", "s3.object-store"
   }, value = "eureka.s3.object-store.get")
   @TraceInvocation
-  public StoreObject get(@Tag(name = "key", valueAdapter = ObjectNameMapper.class) final ObjectName objectName) {
+  public StoreObject get(@Attribute(name = "key", valueAdapter = ObjectNameMapper.class) final ObjectName objectName) {
     try {
       final S3Object object = s3client.getObject(connectionConfiguration.getDefaultBucketName(), toKey(objectName));
 
@@ -356,7 +356,7 @@ private void createBackup(final String bucket, final String key) {
   }, value = "eureka.s3.object-store.check-exists")
   @TraceInvocation
   public boolean checkObjectExists(
-      @Tag(name = "key", valueAdapter = ObjectNameMapper.class) final ObjectName objectName) {
+      @Attribute(name = "key", valueAdapter = ObjectNameMapper.class) final ObjectName objectName) {
     String bucket = connectionConfiguration.getDefaultBucketName();
     String key = toKey(objectName);
 
diff --git a/neverpile-eureka-search-elastic/src/main/java/com/neverpile/eureka/search/elastic/ElasticsearchIndexMaintenanceService.java b/neverpile-eureka-search-elastic/src/main/java/com/neverpile/eureka/search/elastic/ElasticsearchIndexMaintenanceService.java
index 4fc0b8d..c547159 100644
--- a/neverpile-eureka-search-elastic/src/main/java/com/neverpile/eureka/search/elastic/ElasticsearchIndexMaintenanceService.java
+++ b/neverpile-eureka-search-elastic/src/main/java/com/neverpile/eureka/search/elastic/ElasticsearchIndexMaintenanceService.java
@@ -5,7 +5,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.neverpile.common.opentracing.TraceInvocation;
+import com.neverpile.common.opentelemetry.TraceInvocation;
 import com.neverpile.eureka.api.index.IndexMaintenanceService;
 import com.neverpile.eureka.model.Document;
 
diff --git a/pom.xml b/pom.xml
index 92f0f5b..b34475f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
     <metrics-core.version>4.2.23</metrics-core.version>
     <modelmapper.version>1.1.3</modelmapper.version>
     <neverpile-commons.version>1.15.0</neverpile-commons.version>
-    <opentracing.version>0.33.0</opentracing.version>
+    <opentelemetry.version>1.33.0</opentelemetry.version>
     <spring-boot.version>3.1.7</spring-boot.version>
     <spring-security-oauth2.version>2.6.8</spring-security-oauth2.version>
     <spring-boot-admin.version>3.1.7</spring-boot-admin.version>
@@ -114,7 +114,7 @@
       </dependency>
       <dependency>
         <groupId>com.neverpile.commons</groupId>
-        <artifactId>neverpile-commons-opentracing</artifactId>
+        <artifactId>neverpile-commons-opentelemetry</artifactId>
         <version>${neverpile-commons.version}</version>
       </dependency>
 
@@ -282,14 +282,9 @@
       </dependency>
 
       <dependency>
-        <groupId>io.opentracing</groupId>
-        <artifactId>opentracing-api</artifactId>
-        <version>${opentracing.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.opentracing</groupId>
-        <artifactId>opentracing-noop</artifactId>
-        <version>${opentracing.version}</version>
+        <groupId>io.opentelemetry</groupId>
+        <artifactId>opentelemetry-api</artifactId>
+        <version>${opentelemetry.version}</version>
       </dependency>
       <dependency>
         <groupId>io.rest-assured</groupId>