From ff9f9deb30fa94b5018f925a4ccb1841266bc3ce Mon Sep 17 00:00:00 2001 From: Dery Rahman Ahaddienata Date: Fri, 21 Feb 2025 16:16:51 +0700 Subject: [PATCH 1/7] feat: add otel zero code instrumentation deps --- bq2bq/requirements.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bq2bq/requirements.txt b/bq2bq/requirements.txt index 503281e..2514afe 100644 --- a/bq2bq/requirements.txt +++ b/bq2bq/requirements.txt @@ -22,3 +22,14 @@ six==1.15.0 tzlocal==2.1 urllib3==1.26.5 sqlparse==0.4.2 +opentelemetry-api==1.30.0 +opentelemetry-distro==0.51b0 +opentelemetry-exporter-otlp==1.30.0 +opentelemetry-exporter-otlp-proto-common==1.30.0 +opentelemetry-exporter-otlp-proto-grpc==1.30.0 +opentelemetry-exporter-otlp-proto-http==1.30.0 +opentelemetry-instrumentation==0.51b0 +opentelemetry-instrumentation-system-metrics==0.51b0 +opentelemetry-proto==1.30.0 +opentelemetry-sdk==1.30.0 +opentelemetry-semantic-conventions==0.51b0 From 17af95da0c43bbbffb78c6e132101f3d285a0ff2 Mon Sep 17 00:00:00 2001 From: Dery Rahman Ahaddienata Date: Mon, 24 Feb 2025 14:41:58 +0700 Subject: [PATCH 2/7] bump: use protobuf v5 --- bq2bq/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/bq2bq/requirements.txt b/bq2bq/requirements.txt index 2514afe..663f2b8 100644 --- a/bq2bq/requirements.txt +++ b/bq2bq/requirements.txt @@ -33,3 +33,4 @@ opentelemetry-instrumentation-system-metrics==0.51b0 opentelemetry-proto==1.30.0 opentelemetry-sdk==1.30.0 opentelemetry-semantic-conventions==0.51b0 +protobuf==5.29.3 From a4eb67988131a58f969084ccdb47f9bb93fcbbbd Mon Sep 17 00:00:00 2001 From: Dery Rahman Ahaddienata Date: Mon, 24 Feb 2025 14:43:33 +0700 Subject: [PATCH 3/7] deps: use otel deps without version --- bq2bq/requirements.txt | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/bq2bq/requirements.txt b/bq2bq/requirements.txt index 663f2b8..b13c691 100644 --- a/bq2bq/requirements.txt +++ b/bq2bq/requirements.txt @@ -22,15 +22,7 @@ six==1.15.0 tzlocal==2.1 urllib3==1.26.5 sqlparse==0.4.2 -opentelemetry-api==1.30.0 -opentelemetry-distro==0.51b0 -opentelemetry-exporter-otlp==1.30.0 -opentelemetry-exporter-otlp-proto-common==1.30.0 -opentelemetry-exporter-otlp-proto-grpc==1.30.0 -opentelemetry-exporter-otlp-proto-http==1.30.0 -opentelemetry-instrumentation==0.51b0 -opentelemetry-instrumentation-system-metrics==0.51b0 -opentelemetry-proto==1.30.0 -opentelemetry-sdk==1.30.0 -opentelemetry-semantic-conventions==0.51b0 -protobuf==5.29.3 +opentelemetry-sdk +opentelemetry-distro +opentelemetry-exporter-otlp +opentelemetry-instrumentation-system-metrics From 81712659701c7205a7ca9743bca8547f4e61a064 Mon Sep 17 00:00:00 2001 From: Dery Rahman Ahaddienata Date: Mon, 24 Feb 2025 14:50:43 +0700 Subject: [PATCH 4/7] deps: use proper otel version --- bq2bq/requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bq2bq/requirements.txt b/bq2bq/requirements.txt index b13c691..79c7a79 100644 --- a/bq2bq/requirements.txt +++ b/bq2bq/requirements.txt @@ -22,7 +22,7 @@ six==1.15.0 tzlocal==2.1 urllib3==1.26.5 sqlparse==0.4.2 -opentelemetry-sdk -opentelemetry-distro -opentelemetry-exporter-otlp -opentelemetry-instrumentation-system-metrics +opentelemetry-sdk==1.5.0 +opentelemetry-distro==0.24b0 +opentelemetry-exporter-otlp==1.5.0 +opentelemetry-instrumentation-system-metrics==0.30b0 From aa2fb49f94301670a063bc1eb916f104a783135b Mon Sep 17 00:00:00 2001 From: Dery Rahman Ahaddienata Date: Mon, 24 Feb 2025 15:11:19 +0700 Subject: [PATCH 5/7] deps: no deps --- bq2bq/.gitlab-ci.yml | 2 +- bq2bq/Dockerfile | 5 ++++- bq2bq/requirements.txt | 8 ++++---- bq2bq/run_coverage.sh | 2 +- bq2bq/run_tests.sh | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/bq2bq/.gitlab-ci.yml b/bq2bq/.gitlab-ci.yml index 081cb4e..4d1e66c 100644 --- a/bq2bq/.gitlab-ci.yml +++ b/bq2bq/.gitlab-ci.yml @@ -11,7 +11,7 @@ test: coverage: '/coverage \d+%/' script: - apk add build-base - - pip install -r requirements-test.txt + - pip install --no-deps -r requirements-test.txt - coverage run setup.py test - echo "coverage $(coverage report | awk '{print $6}' | tail -n 1)" - coverage report diff --git a/bq2bq/Dockerfile b/bq2bq/Dockerfile index 92fdd82..96afcb4 100644 --- a/bq2bq/Dockerfile +++ b/bq2bq/Dockerfile @@ -3,6 +3,9 @@ FROM python:3.8-alpine WORKDIR /opt/bumblebee COPY . . -RUN ["pip", "install", "-r", "requirements.txt"] +RUN ["pip", "install", "--no-deps", "-r", "requirements.txt"] ENTRYPOINT [ "python3", "/opt/bumblebee/main.py"] + + + diff --git a/bq2bq/requirements.txt b/bq2bq/requirements.txt index 79c7a79..2209678 100644 --- a/bq2bq/requirements.txt +++ b/bq2bq/requirements.txt @@ -22,7 +22,7 @@ six==1.15.0 tzlocal==2.1 urllib3==1.26.5 sqlparse==0.4.2 -opentelemetry-sdk==1.5.0 -opentelemetry-distro==0.24b0 -opentelemetry-exporter-otlp==1.5.0 -opentelemetry-instrumentation-system-metrics==0.30b0 +opentelemetry-sdk==1.30.0 +opentelemetry-distro==0.51b0 +opentelemetry-exporter-otlp==1.30.0 +opentelemetry-instrumentation-system-metrics==0.51b0 diff --git a/bq2bq/run_coverage.sh b/bq2bq/run_coverage.sh index f5f8408..5d7fe99 100755 --- a/bq2bq/run_coverage.sh +++ b/bq2bq/run_coverage.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -pip install -r requirements.txt +pip install --no-deps -r requirements.txt pip install coverage coverage run setup.py test echo "coverage $(coverage report | awk '{print $6}' | tail -n 1)" diff --git a/bq2bq/run_tests.sh b/bq2bq/run_tests.sh index 19f53d6..444dffc 100755 --- a/bq2bq/run_tests.sh +++ b/bq2bq/run_tests.sh @@ -1,4 +1,4 @@ #!/bin/sh -e -pip install -r requirements.txt +pip install --no-deps -r requirements.txt python -m unittest discover tests/ From a3bfb0aa6bbd9c87c370a8b9af8bdb730b48852a Mon Sep 17 00:00:00 2001 From: Dery Rahman Ahaddienata Date: Mon, 24 Feb 2025 15:19:43 +0700 Subject: [PATCH 6/7] deps: pip install otel only on dockerfile --- bq2bq/.gitlab-ci.yml | 2 +- bq2bq/Dockerfile | 4 ++-- bq2bq/requirements.txt | 4 ---- bq2bq/run_coverage.sh | 2 +- bq2bq/run_tests.sh | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/bq2bq/.gitlab-ci.yml b/bq2bq/.gitlab-ci.yml index 4d1e66c..081cb4e 100644 --- a/bq2bq/.gitlab-ci.yml +++ b/bq2bq/.gitlab-ci.yml @@ -11,7 +11,7 @@ test: coverage: '/coverage \d+%/' script: - apk add build-base - - pip install --no-deps -r requirements-test.txt + - pip install -r requirements-test.txt - coverage run setup.py test - echo "coverage $(coverage report | awk '{print $6}' | tail -n 1)" - coverage report diff --git a/bq2bq/Dockerfile b/bq2bq/Dockerfile index 96afcb4..e414f83 100644 --- a/bq2bq/Dockerfile +++ b/bq2bq/Dockerfile @@ -3,8 +3,8 @@ FROM python:3.8-alpine WORKDIR /opt/bumblebee COPY . . -RUN ["pip", "install", "--no-deps", "-r", "requirements.txt"] - +RUN ["pip", "install", "-r", "requirements.txt"] +RUN ["pip", "install", "opentelemetry-sdk", "opentelemetry-distro", "opentelemetry-exporter-otlp", "opentelemetry-instrumentation-system-metrics", "--no-cache-dir"] ENTRYPOINT [ "python3", "/opt/bumblebee/main.py"] diff --git a/bq2bq/requirements.txt b/bq2bq/requirements.txt index 2209678..503281e 100644 --- a/bq2bq/requirements.txt +++ b/bq2bq/requirements.txt @@ -22,7 +22,3 @@ six==1.15.0 tzlocal==2.1 urllib3==1.26.5 sqlparse==0.4.2 -opentelemetry-sdk==1.30.0 -opentelemetry-distro==0.51b0 -opentelemetry-exporter-otlp==1.30.0 -opentelemetry-instrumentation-system-metrics==0.51b0 diff --git a/bq2bq/run_coverage.sh b/bq2bq/run_coverage.sh index 5d7fe99..f5f8408 100755 --- a/bq2bq/run_coverage.sh +++ b/bq2bq/run_coverage.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -pip install --no-deps -r requirements.txt +pip install -r requirements.txt pip install coverage coverage run setup.py test echo "coverage $(coverage report | awk '{print $6}' | tail -n 1)" diff --git a/bq2bq/run_tests.sh b/bq2bq/run_tests.sh index 444dffc..19f53d6 100755 --- a/bq2bq/run_tests.sh +++ b/bq2bq/run_tests.sh @@ -1,4 +1,4 @@ #!/bin/sh -e -pip install --no-deps -r requirements.txt +pip install -r requirements.txt python -m unittest discover tests/ From 82bf85fe978ea74936dbae16dcf669264f827e60 Mon Sep 17 00:00:00 2001 From: Dery Rahman Ahaddienata Date: Mon, 24 Feb 2025 16:51:30 +0700 Subject: [PATCH 7/7] Dockerfile update to support otel --- bq2bq/Dockerfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bq2bq/Dockerfile b/bq2bq/Dockerfile index e414f83..1916bee 100644 --- a/bq2bq/Dockerfile +++ b/bq2bq/Dockerfile @@ -1,10 +1,17 @@ FROM python:3.8-alpine +RUN apk add --no-cache \ + gcc \ + g++ \ + python3-dev \ + musl-dev \ + linux-headers + WORKDIR /opt/bumblebee COPY . . RUN ["pip", "install", "-r", "requirements.txt"] -RUN ["pip", "install", "opentelemetry-sdk", "opentelemetry-distro", "opentelemetry-exporter-otlp", "opentelemetry-instrumentation-system-metrics", "--no-cache-dir"] +RUN ["pip", "install", "--no-deps", "opentelemetry-sdk", "opentelemetry-distro", "opentelemetry-exporter-otlp", "opentelemetry-instrumentation-system-metrics", "--no-cache-dir"] ENTRYPOINT [ "python3", "/opt/bumblebee/main.py"]