diff --git a/Dockerfile b/Dockerfile
index e0192f2..f1942dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,6 +16,8 @@ WORKDIR /springApplication/app
 # Copy the jar file from the builder stage
 COPY --from=JARBUILDER /build/target/*.jar app.jar
 
+# Copy Datadog Java Agent
+COPY dd-java-agent.jar dd-java-agent.jar
 
-# Use entrypoint
-ENTRYPOINT ["java", "-jar", "app.jar"]
+# Use entrypoint with Datadog agent
+ENTRYPOINT ["java", "-javaagent:/springApplication/app/dd-java-agent.jar", "-Ddd.service=spring-app", "-Ddd.env=dev", "-Ddd.version=1.0.0", "-jar", "app.jar"]
diff --git a/dd-java-agent.jar b/dd-java-agent.jar
new file mode 100644
index 0000000..cc1865d
Binary files /dev/null and b/dd-java-agent.jar differ
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 40487c4..60a6c3d 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -55,6 +55,23 @@ services:
     networks:
       - spring-network
 
+  datadog:
+    image: gcr.io/datadoghq/agent:latest
+    container_name: datadog
+    environment:
+      DD_API_KEY: d68a86f0c4fdac50f33266be3a532f53
+      DD_SITE: datadoghq.eu
+      DD_APM_ENABLED: true
+      DD_LOGS_ENABLED: true
+      DD_CONTAINER_EXCLUDE: "name:datadog"
+      DD_APM_RECEIVER_SOCKET: ""
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    ports:
+      - "8126:8126"
+    networks:
+      - spring-network
+
   springApplication-service:
     build: .
     image: userserviceimage:v1
@@ -62,8 +79,18 @@ services:
       - "8080:8080"
     environment:
       spring.datasource.url: "jdbc:mysql://mysql-service:3306/userManagementDb?useSSL=false&allowPublicKeyRetrieval=true"
+      DD_AGENT_HOST: datadog
+      DD_TRACE_AGENT_PORT: 8126
+      DD_ENV: dev
+      DD_SERVICE: spring-app
+      DD_VERSION: 1.0.0
+      DD_TRACE_ENABLED: true
+      DD_API_KEY: d68a86f0c4fdac50f33266be3a532f53
+      DD_LOGS_ENABLED: true
+      DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL: true
     depends_on:
       - mysql-service
+      - datadog
     profiles:
       - entireApp
     networks: