From 13f39d1f6df5a8b02ef52e657154a648ab59b792 Mon Sep 17 00:00:00 2001
From: sallyom <somalley@redhat.com>
Date: Fri, 21 Jun 2024 13:38:00 -0400
Subject: [PATCH] update workflow

Signed-off-by: sallyom <somalley@redhat.com>
---
 .github/workflows/chatbot.yaml          | 28 ++++++++-------
 .github/workflows/test-trace-steps.yaml | 46 +++++++++++++++----------
 2 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/chatbot.yaml b/.github/workflows/chatbot.yaml
index 4a67983b4..fa418f4b1 100644
--- a/.github/workflows/chatbot.yaml
+++ b/.github/workflows/chatbot.yaml
@@ -51,36 +51,40 @@ jobs:
       - name: Configure OpenTelemetry Collector
         run: |
           echo '
+          extensions:
+            basicauth/client:
+              client_auth:
+                username: "${{ secrets.OTEL_USERNAME }}"
+                password: "${{ secrets.OTEL_PASSWORD }}"
           receivers:
             otlp:
               protocols:
                 grpc:
-                  endpoint: "0.0.0.0:4317"
                 http:
-                  endpoint: "0.0.0.0:4318"
           exporters:
             otlphttp:
-              endpoint: https://apps.platform-sts.pcbk.p1.openshiftapps.com
+              endpoint: https://otc.apps.platform-sts.pcbk.p1.openshiftapps.com
+              auth:
+                authenticator: basicauth/client
               tls:
                 insecure: false
-                cert_pem: ${{ secrets.CLIENT_CERT_ROSA_OTEL }}
-                key_pem: ${{ secrets.CLIENT_KEY_ROSA_OTEL }}
-                ca_pem: ${{ secrets.SERVER_CERT_ROSA_OTEL }}
-            logging:
+                ca_pem: "${{ secrets.ROSA_ROOT_CERT }}"
+            debug:
               verbosity: detailed
           service:
+            extensions: [basicauth/client]
             pipelines:
               traces:
                 receivers: [otlp]
-                exporters: [logging,otlphttp]
+                exporters: [debug, otlphttp]
           ' > otel-collector-config.yaml
 
       - name: Run OpenTelemetry Collector
         run: |
-          curl --proto '=https' --tlsv1.2 -fOL https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.102.1/otelcol_0.102.1_linux_amd64.tar.gz
-          tar -xvf otelcol_0.102.1_linux_amd64.tar.gz
-          chmod +x otelcol
-          ./otelcol --config otel-collector-config.yaml &
+          wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.103.0/otelcol-contrib_0.103.0_linux_amd64.tar.gz
+          tar -xvf otelcol-contrib_0.103.0_linux_amd64.tar.gz
+          chmod +x otelcol-contrib
+          ./otelcol-contrib --config otel-collector-config.yaml &
 
       - name: Install qemu dependency
         run: |
diff --git a/.github/workflows/test-trace-steps.yaml b/.github/workflows/test-trace-steps.yaml
index b5a688c2e..d39af7968 100644
--- a/.github/workflows/test-trace-steps.yaml
+++ b/.github/workflows/test-trace-steps.yaml
@@ -13,12 +13,10 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
-
+    if: "!contains(github.event.pull_request.labels.*.name, 'hold-tests')"
+    runs-on: ubuntu-22.04
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
+    - uses: actions/checkout@v4.1.7
     - name: Set up Python
       uses: actions/setup-python@v5.1.0
       with:
@@ -28,39 +26,51 @@ jobs:
       run: |
         pip install --no-cache-dir opentelemetry-sdk opentelemetry-exporter-otlp opentelemetry-instrumentation
 
+    - name: Download OpenTelemetry Collector Contrib
+      run: |
+        wget https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.103.0/otelcol-contrib_0.103.0_linux_amd64.tar.gz
+        tar -xvf otelcol-contrib_0.103.0_linux_amd64.tar.gz
+
+    -  name: Write rosa cluster ca.crt to file
+       env:
+         ROSA_ROOT_CERT: ${{ secrets.ROSA_ROOT_CERT }}
+       run: |
+         echo "${ROSA_ROOT_CERT}" | base64 --decode > /tmp/ca.crt
+
     - name: Configure OpenTelemetry Collector
       run: |
         echo '
+        extensions:
+          basicauth/client:
+            client_auth:
+              username: "${{ secrets.OTEL_USERNAME }}"
+              password: "${{ secrets.OTEL_PASSWORD }}"
         receivers:
           otlp:
             protocols:
               grpc:
-                endpoint: "0.0.0.0:4317"
               http:
-                endpoint: "0.0.0.0:4318"
         exporters:
           otlphttp:
-            endpoint: https://apps.platform-sts.pcbk.p1.openshiftapps.com
+            endpoint: https://otc.apps.platform-sts.pcbk.p1.openshiftapps.com
+            auth:
+              authenticator: basicauth/client
             tls:
               insecure: false
-              cert_pem: ${{ secrets.CLIENT_CERT_ROSA_OTEL }}
-              key_pem: ${{ secrets.CLIENT_KEY_ROSA_OTEL }}
-              ca_pem: ${{ secrets.SERVER_CERT_ROSA_OTEL }}
-          logging:
+              ca_file: /tmp/ca.crt
+          debug:
             verbosity: detailed
         service:
+          extensions: [basicauth/client]
           pipelines:
             traces:
               receivers: [otlp]
-              exporters: [logging,otlphttp]
-          ' > otel-collector-config.yaml
+              exporters: [debug, otlphttp]
+        ' > otel-collector-config.yaml
 
     - name: Run OpenTelemetry Collector
       run: |
-        curl --proto '=https' --tlsv1.2 -fOL https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.102.1/otelcol_0.102.1_linux_amd64.tar.gz
-        tar -xvf otelcol_0.102.1_linux_amd64.tar.gz
-        chmod +x otelcol
-        ./otelcol --config otel-collector-config.yaml &
+        ./otelcol-contrib --config otel-collector-config.yaml &
 
     - name: Start build trace
       run: |