From f0c974ad2bd9220e05d6deb40f9c9486d6fd6ba0 Mon Sep 17 00:00:00 2001
From: William Conti <58711692+wconti27@users.noreply.github.com>
Date: Tue, 6 Jun 2023 11:36:27 -0400
Subject: [PATCH] resolve oracledb plugin step failing (#3216)

* Fix OracleDB plugin job on CI to use Github Actions services container for Test-Agent instead of docker-compose
---
 .github/actions/testagent/logs/action.yml | 11 ++++++++++-
 .github/workflows/plugins.yml             | 11 +++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.github/actions/testagent/logs/action.yml b/.github/actions/testagent/logs/action.yml
index bd320a0464c..070e35d19f2 100644
--- a/.github/actions/testagent/logs/action.yml
+++ b/.github/actions/testagent/logs/action.yml
@@ -1,8 +1,17 @@
 name: "Get APM Test Agent Logs"
 description: "Get the APM Test Agent logs from the test run."
+inputs:
+  container-id:
+    description: "ID of the Docker Container to get logs from (optional)"
+    required: false
 runs:
   using: composite
   steps:
     - uses: actions/checkout@v2
-    - run: docker-compose logs testagent
+    - run: |
+        if [ -n "${{inputs.container-id}}" ]; then
+          docker logs ${{inputs.container-id}}
+        else
+          docker-compose logs testagent
+        fi
       shell: bash
diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 1d7efd0b15e..dcf3c8f46db 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -800,18 +800,25 @@ jobs:
         ports:
           - 1521:1521
           - 5500:5500
+      testagent:
+        image: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:latest
+        env: 
+          LOG_LEVEL: DEBUG
+          TRACE_LANGUAGE: javascript
+          DISABLED_CHECKS: trace_content_length
+          PORT: 9126
+        ports:
+          - 9126:9126
     env:
       PLUGINS: oracledb
       SERVICES: oracledb
       DD_TEST_AGENT_URL: http://testagent:9126
     steps:
       - uses: actions/checkout@v2
-      - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
       - run: yarn install --ignore-engine
       - run: yarn services
       - run: yarn test:plugins
-      - uses: ./.github/actions/testagent/logs
       - uses: codecov/codecov-action@v2
 
   paperplane: