From f414da383461a43790264ca7c090fd6589e27781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Mucito?= Date: Thu, 15 Oct 2020 17:52:42 -0500 Subject: [PATCH 01/10] update auth_timestamp --- src/main/java/com/paymentez/example/sdk/Paymentez.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/paymentez/example/sdk/Paymentez.java b/src/main/java/com/paymentez/example/sdk/Paymentez.java index a0be9ea..7a025a0 100644 --- a/src/main/java/com/paymentez/example/sdk/Paymentez.java +++ b/src/main/java/com/paymentez/example/sdk/Paymentez.java @@ -30,7 +30,8 @@ private static String getUniqToken(String auth_timestamp, String app_secret_key) } public static String getAuthToken(String app_code, String app_secret_key) { - String auth_timestamp = "" + (System.currentTimeMillis()); + Long tsLong = System.currentTimeMillis()/1000; + String auth_timestamp = tsLong.toString(); String string_auth_token = app_code + ";" + auth_timestamp + ";" + getUniqToken(auth_timestamp, app_secret_key); String auth_token = new String(Base64.getEncoder().encode(string_auth_token.getBytes())); return auth_token; From 35921db599baf8a31be427e94e3745e3b64d228f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Sladojevi=C4=87?= <60047953+dusanslad@users.noreply.github.com> Date: Tue, 5 Nov 2024 16:04:53 +0100 Subject: [PATCH 02/10] Create otel-export.yaml --- .github/workflows/otel-export.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/otel-export.yaml diff --git a/.github/workflows/otel-export.yaml b/.github/workflows/otel-export.yaml new file mode 100644 index 0000000..00ef1cd --- /dev/null +++ b/.github/workflows/otel-export.yaml @@ -0,0 +1,19 @@ +name: OpenTelemetry Export Trace + +on: + workflow_run: + workflows: [my-workflow] + types: [completed] + +jobs: + otel-export-trace: + name: OpenTelemetry Export Trace + runs-on: ubuntu-latest + steps: + - name: Export Workflow Trace + uses: inception-health/otel-export-trace-action@latest + with: + otlpEndpoint: https://otlp.eu01.nr-data.net:443/ + otlpHeaders: ${{ secrets.OTLP_HEADERS }} + githubToken: ${{ secrets.GITHUB_TOKEN }} + runId: ${{ github.event.workflow_run.id }} From 7ceaa7ac974f1a67e446262ebc2b6ceddba4c3d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Sladojevi=C4=87?= <60047953+dusanslad@users.noreply.github.com> Date: Tue, 5 Nov 2024 16:14:02 +0100 Subject: [PATCH 03/10] Create java.yaml --- .github/workflows/java.yaml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/java.yaml diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml new file mode 100644 index 0000000..406c8a7 --- /dev/null +++ b/.github/workflows/java.yaml @@ -0,0 +1,30 @@ +name: Java CI + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up JDK 17 + uses: actions/setup-java@v2 + with: + java-version: '17' + distribution: 'adopt' + + - name: Build with Maven + run: mvn install + + - name: Run tests + run: mvn test From a20c8ef189cda2cd0337281545042bbbbcb76b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Sladojevi=C4=87?= <60047953+dusanslad@users.noreply.github.com> Date: Tue, 5 Nov 2024 16:16:33 +0100 Subject: [PATCH 04/10] Update java.yaml --- .github/workflows/java.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml index 406c8a7..b77940e 100644 --- a/.github/workflows/java.yaml +++ b/.github/workflows/java.yaml @@ -7,6 +7,7 @@ on: pull_request: branches: - main + workflow_dispatch: jobs: build: From f20705ea57212f353cda5a13438ad53bafc15a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Sladojevi=C4=87?= <60047953+dusanslad@users.noreply.github.com> Date: Tue, 5 Nov 2024 16:20:06 +0100 Subject: [PATCH 05/10] Update java.yaml --- .github/workflows/java.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml index b77940e..e84274a 100644 --- a/.github/workflows/java.yaml +++ b/.github/workflows/java.yaml @@ -3,10 +3,10 @@ name: Java CI on: push: branches: - - main + - master pull_request: branches: - - main + - master workflow_dispatch: jobs: From 2c3056ea440e23dd07a9b895181985a0a0e43b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Sladojevi=C4=87?= <60047953+dusanslad@users.noreply.github.com> Date: Tue, 5 Nov 2024 16:20:28 +0100 Subject: [PATCH 06/10] Update otel-export.yaml --- .github/workflows/otel-export.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/otel-export.yaml b/.github/workflows/otel-export.yaml index 00ef1cd..c37585b 100644 --- a/.github/workflows/otel-export.yaml +++ b/.github/workflows/otel-export.yaml @@ -2,7 +2,7 @@ name: OpenTelemetry Export Trace on: workflow_run: - workflows: [my-workflow] + workflows: [*] types: [completed] jobs: From e90eafb77ec0c52e0e04bf564dc157308f8cec68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Sladojevi=C4=87?= <60047953+dusanslad@users.noreply.github.com> Date: Tue, 5 Nov 2024 16:27:25 +0100 Subject: [PATCH 07/10] Update otel-export.yaml --- .github/workflows/otel-export.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/otel-export.yaml b/.github/workflows/otel-export.yaml index c37585b..021757f 100644 --- a/.github/workflows/otel-export.yaml +++ b/.github/workflows/otel-export.yaml @@ -2,7 +2,7 @@ name: OpenTelemetry Export Trace on: workflow_run: - workflows: [*] + workflows: ['*'] types: [completed] jobs: From eed649cb9ed1c263eaaa3c41506a9f0796136088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Sladojevi=C4=87?= <60047953+dusanslad@users.noreply.github.com> Date: Tue, 5 Nov 2024 16:40:09 +0100 Subject: [PATCH 08/10] Update otel-export.yaml --- .github/workflows/otel-export.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/otel-export.yaml b/.github/workflows/otel-export.yaml index 021757f..f5c93d6 100644 --- a/.github/workflows/otel-export.yaml +++ b/.github/workflows/otel-export.yaml @@ -14,6 +14,6 @@ jobs: uses: inception-health/otel-export-trace-action@latest with: otlpEndpoint: https://otlp.eu01.nr-data.net:443/ - otlpHeaders: ${{ secrets.OTLP_HEADERS }} + NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} githubToken: ${{ secrets.GITHUB_TOKEN }} runId: ${{ github.event.workflow_run.id }} From d3df79982989f3761f5c8a65267cb07ebea5d461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Sladojevi=C4=87?= <60047953+dusanslad@users.noreply.github.com> Date: Wed, 6 Nov 2024 08:38:54 +0100 Subject: [PATCH 09/10] Update otel-export.yaml --- .github/workflows/otel-export.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/otel-export.yaml b/.github/workflows/otel-export.yaml index f5c93d6..79936ba 100644 --- a/.github/workflows/otel-export.yaml +++ b/.github/workflows/otel-export.yaml @@ -14,6 +14,6 @@ jobs: uses: inception-health/otel-export-trace-action@latest with: otlpEndpoint: https://otlp.eu01.nr-data.net:443/ - NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} + otlpHeaders: '{"Content-Type": "application/json", "authorization": "Basic ${{ secrets.NEW_RELIC_LICENSE_KEY }}"}' githubToken: ${{ secrets.GITHUB_TOKEN }} runId: ${{ github.event.workflow_run.id }} From 84ec0697b6cbde19061bfac2964c4be0d27fcc19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Sladojevi=C4=87?= <60047953+dusanslad@users.noreply.github.com> Date: Wed, 6 Nov 2024 09:18:16 +0100 Subject: [PATCH 10/10] Update otel-export.yaml --- .github/workflows/otel-export.yaml | 46 +++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/.github/workflows/otel-export.yaml b/.github/workflows/otel-export.yaml index 79936ba..01591fa 100644 --- a/.github/workflows/otel-export.yaml +++ b/.github/workflows/otel-export.yaml @@ -1,19 +1,43 @@ -name: OpenTelemetry Export Trace +# name: OpenTelemetry Export Trace + +# on: +# workflow_run: +# workflows: ['*'] +# types: [completed] + +# jobs: +# otel-export-trace: +# name: OpenTelemetry Export Trace +# runs-on: ubuntu-latest +# steps: +# - name: Export Workflow Trace +# uses: inception-health/otel-export-trace-action@latest +# with: +# otlpEndpoint: https://otlp.eu01.nr-data.net:443/ +# otlpHeaders: '{"Content-Type": "application/json", "authorization": "Basic ${{ secrets.NEW_RELIC_LICENSE_KEY }}"}' +# githubToken: ${{ secrets.GITHUB_TOKEN }} +# runId: ${{ github.event.workflow_run.id }} + +name: new-relic-exporter on: workflow_run: workflows: ['*'] - types: [completed] + types: [completed] # defaults to run on every completed workflow run event + +env: + GHA_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} + GHA_RUN_ID: ${{ github.event.workflow_run.id }} + GHA_RUN_NAME: ${{ github.event.workflow_run.name }} jobs: - otel-export-trace: - name: OpenTelemetry Export Trace + new-relic-exporter: + name: new-relic-exporter runs-on: ubuntu-latest + if: ${{ always() }} steps: - - name: Export Workflow Trace - uses: inception-health/otel-export-trace-action@latest - with: - otlpEndpoint: https://otlp.eu01.nr-data.net:443/ - otlpHeaders: '{"Content-Type": "application/json", "authorization": "Basic ${{ secrets.NEW_RELIC_LICENSE_KEY }}"}' - githubToken: ${{ secrets.GITHUB_TOKEN }} - runId: ${{ github.event.workflow_run.id }} + - name: Checkout + uses: actions/checkout@v3 + - name: new-relic-exporter + uses: newrelic-experimental/gha-new-relic-exporter@latest