Skip to content

Commit 320a709

Browse files
Updates: new py tool to chekc DDog spans and generate report
Signed-off-by: Lukasz Gryglicki <lgryglicki@cncf.io> Assisted by [OpenAI](https://platform.openai.com/) Assisted by [GitHub Copilot](https://github.com/features/copilot)
1 parent fb82306 commit 320a709

16 files changed

Lines changed: 1275 additions & 652 deletions

.github/workflows/yarn-scan-backend-go-pr.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ jobs:
2626
node-version: '20'
2727
- name: Setup
2828
run: yarn install
29-
# - name: Yarn Audit
30-
# working-directory: cla-backend-go
31-
# run: |
32-
# yarn audit
3329
- name: Yarn Audit
3430
working-directory: cla-backend-go
3531
run: |

.github/workflows/yarn-scan-backend-pr.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ jobs:
2626
node-version: '20'
2727
- name: Setup
2828
run: yarn install
29-
# - name: Yarn Audit
30-
# working-directory: cla-backend
31-
# run: |
32-
# yarn audit
3329
- name: Yarn Audit
3430
working-directory: cla-backend
3531
run: |

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,3 +267,6 @@ cla-backend/python-api.err
267267
cla-backend-go/golang-api.err
268268
cla-backend-go/golang-api.log
269269
utils/otel_dd_go/otel_dd
270+
audit.json
271+
spans*.json
272+
api_usage.csv

cla-backend-go/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
"simple-git": "^3.16.0",
4848
"ws": ">=7.5.10",
4949
"xmlhttprequest-ssl": "^1.6.2",
50+
"form-data": "^4.0.4",
51+
"tar": "^7.5.8",
52+
"minimatch": "^10.2.1",
5053
"fast-xml-parser": "^5.3.6"
5154
}
5255
}

cla-backend-go/yarn.lock

Lines changed: 48 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -920,6 +920,13 @@
920920
wraptile "^2.0.0"
921921
zames "^2.0.0"
922922

923+
"@isaacs/fs-minipass@^4.0.0":
924+
version "4.0.1"
925+
resolved "https://registry.yarnpkg.com/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz#2d59ae3ab4b38fb4270bfa23d30f8e2e86c7fe32"
926+
integrity sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==
927+
dependencies:
928+
minipass "^7.0.4"
929+
923930
"@kwsites/file-exists@^1.1.1":
924931
version "1.1.1"
925932
resolved "https://registry.yarnpkg.com/@kwsites/file-exists/-/file-exists-1.1.1.tgz#ad1efcac13e1987d8dbaf235ef3be5b0d96faa99"
@@ -1882,10 +1889,10 @@ axios@^0.30.3, axios@^1.6.2:
18821889
form-data "^4.0.4"
18831890
proxy-from-env "^1.1.0"
18841891

1885-
balanced-match@^1.0.0:
1886-
version "1.0.2"
1887-
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
1888-
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
1892+
balanced-match@^4.0.2:
1893+
version "4.0.4"
1894+
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-4.0.4.tgz#bfb10662feed8196a2c62e7c68e17720c274179a"
1895+
integrity sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==
18891896

18901897
base64-js@^1.0.2, base64-js@^1.3.1:
18911898
version "1.5.1"
@@ -1924,20 +1931,12 @@ bowser@^2.11.0:
19241931
resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.11.0.tgz#5ca3c35757a7aa5771500c70a73a9f91ef420a8f"
19251932
integrity sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==
19261933

1927-
brace-expansion@^1.1.7:
1928-
version "1.1.11"
1929-
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
1930-
integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
1934+
brace-expansion@^5.0.2:
1935+
version "5.0.3"
1936+
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-5.0.3.tgz#6a9c6c268f85b53959ec527aeafe0f7300258eef"
1937+
integrity sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==
19311938
dependencies:
1932-
balanced-match "^1.0.0"
1933-
concat-map "0.0.1"
1934-
1935-
brace-expansion@^2.0.1:
1936-
version "2.0.1"
1937-
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
1938-
integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
1939-
dependencies:
1940-
balanced-match "^1.0.0"
1939+
balanced-match "^4.0.2"
19411940

19421941
braces@^3.0.3, braces@~3.0.2:
19431942
version "3.0.3"
@@ -2117,10 +2116,10 @@ chokidar@^3.5.3:
21172116
optionalDependencies:
21182117
fsevents "~2.3.2"
21192118

2120-
chownr@^2.0.0:
2121-
version "2.0.0"
2122-
resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
2123-
integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
2119+
chownr@^3.0.0:
2120+
version "3.0.0"
2121+
resolved "https://registry.yarnpkg.com/chownr/-/chownr-3.0.0.tgz#9855e64ecd240a9cc4267ce8a4aa5d24a1da15e4"
2122+
integrity sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==
21242123

21252124
ci-info@^3.8.0:
21262125
version "3.9.0"
@@ -2276,11 +2275,6 @@ compress-commons@^4.1.2:
22762275
normalize-path "^3.0.0"
22772276
readable-stream "^3.6.0"
22782277

2279-
concat-map@0.0.1:
2280-
version "0.0.1"
2281-
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
2282-
integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
2283-
22842278
content-disposition@^0.5.4:
22852279
version "0.5.4"
22862280
resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
@@ -2949,16 +2943,7 @@ for-each@^0.3.3:
29492943
dependencies:
29502944
is-callable "^1.1.3"
29512945

2952-
form-data@^4.0.0:
2953-
version "4.0.1"
2954-
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.1.tgz#ba1076daaaa5bfd7e99c1a6cb02aa0a5cff90d48"
2955-
integrity sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==
2956-
dependencies:
2957-
asynckit "^0.4.0"
2958-
combined-stream "^1.0.8"
2959-
mime-types "^2.1.12"
2960-
2961-
form-data@^4.0.4:
2946+
form-data@^4.0.0, form-data@^4.0.4:
29622947
version "4.0.5"
29632948
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053"
29642949
integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==
@@ -3028,13 +3013,6 @@ fs-extra@^9.1.0:
30283013
jsonfile "^6.0.1"
30293014
universalify "^2.0.0"
30303015

3031-
fs-minipass@^2.0.0:
3032-
version "2.1.0"
3033-
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
3034-
integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
3035-
dependencies:
3036-
minipass "^3.0.0"
3037-
30383016
fs.realpath@^1.0.0:
30393017
version "1.0.0"
30403018
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -3962,51 +3940,29 @@ mimic-response@^3.1.0:
39623940
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
39633941
integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
39643942

3965-
minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1:
3966-
version "3.1.2"
3967-
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
3968-
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
3943+
minimatch@^10.2.1, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^5.0.1, minimatch@^5.1.0, minimatch@~3.0.4:
3944+
version "10.2.4"
3945+
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.2.4.tgz#465b3accbd0218b8281f5301e27cedc697f96fde"
3946+
integrity sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==
39693947
dependencies:
3970-
brace-expansion "^1.1.7"
3971-
3972-
minimatch@^5.0.1, minimatch@^5.1.0:
3973-
version "5.1.6"
3974-
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
3975-
integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
3976-
dependencies:
3977-
brace-expansion "^2.0.1"
3978-
3979-
minimatch@~3.0.4:
3980-
version "3.0.8"
3981-
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1"
3982-
integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==
3983-
dependencies:
3984-
brace-expansion "^1.1.7"
3948+
brace-expansion "^5.0.2"
39853949

39863950
minimist@^1.2.6:
39873951
version "1.2.8"
39883952
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
39893953
integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
39903954

3991-
minipass@^3.0.0:
3992-
version "3.3.6"
3993-
resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
3994-
integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
3995-
dependencies:
3996-
yallist "^4.0.0"
3955+
minipass@^7.0.4, minipass@^7.1.2:
3956+
version "7.1.3"
3957+
resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.3.tgz#79389b4eb1bb2d003a9bba87d492f2bd37bdc65b"
3958+
integrity sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==
39973959

3998-
minipass@^5.0.0:
3999-
version "5.0.0"
4000-
resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
4001-
integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
4002-
4003-
minizlib@^2.1.1:
4004-
version "2.1.2"
4005-
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
4006-
integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
3960+
minizlib@^3.1.0:
3961+
version "3.1.0"
3962+
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-3.1.0.tgz#6ad76c3a8f10227c9b51d1c9ac8e30b27f5a251c"
3963+
integrity sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==
40073964
dependencies:
4008-
minipass "^3.0.0"
4009-
yallist "^4.0.0"
3965+
minipass "^7.1.2"
40103966

40113967
mkdirp@^0.5.6:
40123968
version "0.5.6"
@@ -4015,11 +3971,6 @@ mkdirp@^0.5.6:
40153971
dependencies:
40163972
minimist "^1.2.6"
40173973

4018-
mkdirp@^1.0.3:
4019-
version "1.0.4"
4020-
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
4021-
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
4022-
40233974
ms@^2.1.3:
40243975
version "2.1.3"
40253976
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
@@ -5081,17 +5032,16 @@ tar-stream@^2.1.0, tar-stream@^2.2.0:
50815032
inherits "^2.0.3"
50825033
readable-stream "^3.1.1"
50835034

5084-
tar@^6.1.15:
5085-
version "6.2.1"
5086-
resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
5087-
integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
5035+
tar@^6.1.15, tar@^7.5.8:
5036+
version "7.5.9"
5037+
resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.9.tgz#817ac12a54bc4362c51340875b8985d7dc9724b8"
5038+
integrity sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==
50885039
dependencies:
5089-
chownr "^2.0.0"
5090-
fs-minipass "^2.0.0"
5091-
minipass "^5.0.0"
5092-
minizlib "^2.1.1"
5093-
mkdirp "^1.0.3"
5094-
yallist "^4.0.0"
5040+
"@isaacs/fs-minipass" "^4.0.0"
5041+
chownr "^3.0.0"
5042+
minipass "^7.1.2"
5043+
minizlib "^3.1.0"
5044+
yallist "^5.0.0"
50955045

50965046
throat@^5.0.0:
50975047
version "5.0.0"
@@ -5472,10 +5422,10 @@ xtend@^4.0.0:
54725422
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
54735423
integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
54745424

5475-
yallist@^4.0.0:
5476-
version "4.0.0"
5477-
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
5478-
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
5425+
yallist@^5.0.0:
5426+
version "5.0.0"
5427+
resolved "https://registry.yarnpkg.com/yallist/-/yallist-5.0.0.tgz#00e2de443639ed0d78fd87de0d27469fbcffb533"
5428+
integrity sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==
54795429

54805430
yaml-ast-parser@0.0.43:
54815431
version "0.0.43"

cla-backend/cla/routes.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import hug
99
import os
1010
import re
11-
import time
1211
from urllib.parse import urlparse
1312
import requests
1413
from falcon import HTTP_401, HTTP_400, HTTP_OK, HTTP_500, Response
@@ -369,7 +368,7 @@ def _otel_start_request_span(request) -> None:
369368

370369
from opentelemetry import context as otel_context
371370
from opentelemetry.propagate import extract
372-
from opentelemetry.trace import SpanKind, Status, StatusCode, set_span_in_context
371+
from opentelemetry.trace import SpanKind, set_span_in_context
373372
except Exception as e:
374373
try:
375374
cla.log.info(f"LG:api-log-otel-datadog-init-missing err={e}")

cla-backend/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@
5757
"ansi-regex": "^5.0.1",
5858
"aws-sdk": "^2.1329.0",
5959
"axios": "^0.30.3",
60+
"basic-ftp": "^5.2.0",
6061
"cookiejar": "^2.1.4",
6162
"file-type": "^16.5.4",
63+
"form-data": "^4.0.4",
6264
"glob-parent": "^5.1.2",
6365
"http-cache-semantics": "^4.1.1",
6466
"ini": "^1.3.7",
@@ -74,6 +76,7 @@
7476
"shell-quote": "^1.7.3",
7577
"simple-git": "^3.16.0",
7678
"ws": ">=7.5.10",
79+
"tar": "^7.5.8",
7780
"xmlhttprequest-ssl": "^1.6.2",
7881
"fast-xml-parser": "^5.3.6"
7982
}

0 commit comments

Comments
 (0)