Skip to content

Commit 97c30ef

Browse files
authored
Remove remnants of codecov-opentelemetry (#883)
1 parent b6854d4 commit 97c30ef

File tree

5 files changed

+15
-108
lines changed

5 files changed

+15
-108
lines changed

Diff for: celery_config.py

-52
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,11 @@
22
import gc
33
import logging
44
import logging.config
5-
import os
65
from datetime import timedelta
76

87
from celery import signals
98
from celery.beat import BeatLazyFunc
109
from celery.schedules import crontab
11-
from celery.signals import worker_process_init
12-
from codecovopentelem import (
13-
CoverageSpanFilter,
14-
UnableToStartProcessorException,
15-
get_codecov_opentelemetry_instances,
16-
)
1710
from shared.celery_config import (
1811
BaseCeleryConfig,
1912
brolly_stats_rollup_task_name,
@@ -27,9 +20,7 @@
2720
from celery_task_router import route_task
2821
from helpers.cache import cache
2922
from helpers.clock import get_utc_now_as_iso_format
30-
from helpers.environment import is_enterprise
3123
from helpers.health_check import get_health_check_interval_seconds
32-
from helpers.version import get_current_version
3324
from services.redis import get_redis_connection
3425

3526
log = logging.getLogger(__name__)
@@ -59,49 +50,6 @@ def initialize_cache(**kwargs):
5950
cache.configure(redis_cache_backend)
6051

6152

62-
@worker_process_init.connect(weak=False)
63-
def init_celery_tracing(*args, **kwargs):
64-
if (
65-
os.getenv("OPENTELEMETRY_ENDPOINT")
66-
and os.getenv("OPENTELEMETRY_TOKEN")
67-
and os.getenv("OPENTELEMETRY_CODECOV_RATE")
68-
and not is_enterprise()
69-
):
70-
from opentelemetry import trace
71-
from opentelemetry.instrumentation.celery import CeleryInstrumentor
72-
from opentelemetry.sdk.trace import TracerProvider
73-
from opentelemetry.sdk.trace.export import BatchSpanProcessor
74-
75-
log.info("Configuring opentelemetry exporter")
76-
provider = TracerProvider()
77-
trace.set_tracer_provider(provider)
78-
export_rate = float(os.getenv("OPENTELEMETRY_CODECOV_RATE"))
79-
current_version = get_current_version()
80-
current_env = "production"
81-
try:
82-
generator, exporter = get_codecov_opentelemetry_instances(
83-
repository_token=os.getenv("OPENTELEMETRY_TOKEN"),
84-
version_identifier=current_version,
85-
sample_rate=export_rate,
86-
filters={
87-
CoverageSpanFilter.regex_name_filter: None,
88-
CoverageSpanFilter.span_kind_filter: [
89-
trace.SpanKind.SERVER,
90-
trace.SpanKind.CONSUMER,
91-
],
92-
},
93-
code=f"{current_version}:{current_env}",
94-
untracked_export_rate=export_rate,
95-
codecov_endpoint=os.getenv("OPENTELEMETRY_ENDPOINT"),
96-
environment=current_env,
97-
)
98-
provider.add_span_processor(generator)
99-
provider.add_span_processor(BatchSpanProcessor(exporter))
100-
CeleryInstrumentor().instrument()
101-
except UnableToStartProcessorException:
102-
log.warning("Unable to instrument opentelemetry on worker")
103-
104-
10553
hourly_check_task_name = "app.cron.hourly_check.HourlyCheckTask"
10654
daily_plan_manager_task_name = "app.cron.daily.PlanManagerTask"
10755

Diff for: enterprise/hooks/hook-opentelemetry.py

-3
This file was deleted.

Diff for: enterprise/package.sh

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ print(' --hiddenimport celery.worker.consumer')
3131
print(' --hiddenimport sqlalchemy.ext.baked')
3232
print(' --hiddenimport tasks')
3333
print(' --hiddenimport tornado.curl_httpclient')
34-
print(' --hiddenimport opentelemetry-sdk')
3534
print(' --hiddenimport asyncore')
3635
print(' --hiddenimport imaplib')
3736
print(' --hiddenimport poplib')

Diff for: requirements.in

-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
https://github.com/codecov/opentelem-python/archive/refs/tags/v0.0.4a1.tar.gz#egg=codecovopentelem
21
https://github.com/codecov/test-results-parser/archive/94ff26cb083a02ff726dd2497c2129e4aaf5f7cd.tar.gz#egg=test-results-parser
32
https://github.com/codecov/shared/archive/4db8f12c1a4ad43cedb1a965d2fa8cd8138fc2b3.tar.gz#egg=shared
43
https://github.com/codecov/timestring/archive/d37ceacc5954dff3b5bd2f887936a98a668dda42.tar.gz#egg=timestring
@@ -19,8 +18,6 @@ jinja2>=3.1.3
1918
lxml>=4.9.1
2019
mock
2120
openai
22-
opentelemetry-instrumentation-celery>=0.45b0
23-
opentelemetry-sdk>=1.24.0
2421
orjson
2522
pre-commit
2623
polars==1.12.0

Diff for: requirements.txt

+15-49
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
#
2-
# This file is autogenerated by pip-compile with Python 3.12
3-
# by the following command:
4-
#
5-
# pip-compile
6-
#
1+
# This file was autogenerated by uv via the following command:
2+
# uv pip compile requirements.in -o requirements.txt
73
amqp==5.2.0
84
# via kombu
95
analytics-python==1.3.0b1
@@ -76,19 +72,14 @@ codecov-ribs==0.1.18
7672
# via
7773
# -r requirements.in
7874
# shared
79-
codecovopentelem @ https://github.com/codecov/opentelem-python/archive/refs/tags/v0.0.4a1.tar.gz
80-
# via -r requirements.in
8175
colour==0.1.5
8276
# via shared
83-
coverage[toml]==7.5.0
77+
coverage==7.5.0
8478
# via
8579
# -r requirements.in
86-
# codecovopentelem
8780
# pytest-cov
8881
cryptography==43.0.1
8982
# via shared
90-
deprecated==1.2.12
91-
# via opentelemetry-api
9283
distlib==0.3.7
9384
# via virtualenv
9485
distro==1.8.0
@@ -119,7 +110,7 @@ filelock==3.12.4
119110
# via virtualenv
120111
freezegun==1.5.0
121112
# via pytest-freezegun
122-
google-api-core[grpc]==2.11.1
113+
google-api-core==2.11.1
123114
# via
124115
# google-cloud-core
125116
# google-cloud-pubsub
@@ -144,7 +135,7 @@ google-crc32c==1.1.2
144135
# via google-resumable-media
145136
google-resumable-media==2.5.0
146137
# via google-cloud-storage
147-
googleapis-common-protos[grpc]==1.59.1
138+
googleapis-common-protos==1.59.1
148139
# via
149140
# google-api-core
150141
# grpc-google-iam-v1
@@ -184,8 +175,6 @@ idna==3.7
184175
# yarl
185176
ijson==3.2.3
186177
# via shared
187-
importlib-metadata==6.8.0
188-
# via opentelemetry-api
189178
iniconfig==1.1.1
190179
# via pytest
191180
jinja2==3.1.4
@@ -218,23 +207,6 @@ oauthlib==3.1.0
218207
# via shared
219208
openai==1.2.4
220209
# via -r requirements.in
221-
opentelemetry-api==1.24.0
222-
# via
223-
# opentelemetry-instrumentation
224-
# opentelemetry-instrumentation-celery
225-
# opentelemetry-sdk
226-
opentelemetry-instrumentation==0.45b0
227-
# via opentelemetry-instrumentation-celery
228-
opentelemetry-instrumentation-celery==0.45b0
229-
# via -r requirements.in
230-
opentelemetry-sdk==1.24.0
231-
# via
232-
# -r requirements.in
233-
# codecovopentelem
234-
opentelemetry-semantic-conventions==0.45b0
235-
# via
236-
# opentelemetry-instrumentation-celery
237-
# opentelemetry-sdk
238210
orjson==3.10.7
239211
# via
240212
# -r requirements.in
@@ -347,24 +319,27 @@ requests==2.32.3
347319
# via
348320
# -r requirements.in
349321
# analytics-python
350-
# codecovopentelem
351322
# google-api-core
352323
# google-cloud-storage
353324
# shared
354325
# stripe
355326
respx==0.20.2
356327
# via -r requirements.in
357-
rfc3986[idna2008]==1.4.0
328+
rfc3986==1.4.0
358329
# via httpx
359330
rsa==4.7.2
360331
# via google-auth
361332
s3transfer==0.10.1
362333
# via boto3
363-
sentry-sdk[celery]==2.13.0
334+
sentry-sdk==2.13.0
364335
# via
365336
# -r requirements.in
366337
# shared
367-
shared @ https://github.com/codecov/shared/archive/4db8f12c1a4ad43cedb1a965d2fa8cd8138fc2b3.tar.gz
338+
setuptools==75.4.0
339+
# via
340+
# cerberus
341+
# nodeenv
342+
shared @ https://github.com/codecov/shared/archive/4db8f12c1a4ad43cedb1a965d2fa8cd8138fc2b3.tar.gz#egg=shared
368343
# via -r requirements.in
369344
six==1.16.0
370345
# via
@@ -396,13 +371,13 @@ statsd==3.3.0
396371
# via -r requirements.in
397372
stripe==9.6.0
398373
# via -r requirements.in
399-
test-results-parser @ https://github.com/codecov/test-results-parser/archive/94ff26cb083a02ff726dd2497c2129e4aaf5f7cd.tar.gz
374+
test-results-parser @ https://github.com/codecov/test-results-parser/archive/94ff26cb083a02ff726dd2497c2129e4aaf5f7cd.tar.gz#egg=test-results-parser
400375
# via -r requirements.in
401376
text-unidecode==1.3
402377
# via faker
403378
time-machine==2.14.1
404379
# via -r requirements.in
405-
timestring @ https://github.com/codecov/timestring/archive/d37ceacc5954dff3b5bd2f887936a98a668dda42.tar.gz
380+
timestring @ https://github.com/codecov/timestring/archive/d37ceacc5954dff3b5bd2f887936a98a668dda42.tar.gz#egg=timestring
406381
# via -r requirements.in
407382
tlslite-ng==0.8.0b1
408383
# via shared
@@ -413,7 +388,6 @@ typing==3.7.4.3
413388
typing-extensions==4.6.3
414389
# via
415390
# openai
416-
# opentelemetry-sdk
417391
# pydantic
418392
# pydantic-core
419393
# shared
@@ -441,16 +415,8 @@ virtualenv==20.24.5
441415
wcwidth==0.2.5
442416
# via prompt-toolkit
443417
wrapt==1.16.0
444-
# via
445-
# deprecated
446-
# opentelemetry-instrumentation
447-
# vcrpy
418+
# via vcrpy
448419
yarl==1.9.4
449420
# via vcrpy
450-
zipp==3.19.2
451-
# via importlib-metadata
452421
zstandard==0.23.0
453422
# via -r requirements.in
454-
455-
# The following packages are considered to be unsafe in a requirements file:
456-
# setuptools

0 commit comments

Comments
 (0)