Skip to content

Commit 53eec49

Browse files
authored
fix(api): remove logfire from api server (#1055)
* fix(api): deactivate logfire if not compatible * fix: remove logfire depencies * fix: remove logfire from the server
1 parent 94f9335 commit 53eec49

File tree

6 files changed

+7
-85
lines changed

6 files changed

+7
-85
lines changed

carbonserver/carbonserver/api/services/signup_service.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from uuid import UUID
33

44
import jwt
5-
import logfire
65
from fastapi import HTTPException
76

87
from carbonserver.api.infra.repositories.repository_organizations import (
@@ -39,11 +38,9 @@ def sign_up(
3938
self,
4039
user: UserAutoCreate,
4140
) -> User:
42-
with logfire.span("User applicative creation", service="signup"):
43-
created_user = self._user_repository.create_user(user)
44-
subscribed_user = self.new_user_setup(created_user)
45-
logfire.info(str(subscribed_user))
46-
LOGGER.info(f"User {subscribed_user.id} created")
41+
created_user = self._user_repository.create_user(user)
42+
subscribed_user = self.new_user_setup(created_user)
43+
LOGGER.info(f"User {subscribed_user.id} created")
4744
return subscribed_user
4845

4946
def subscribe_user_to_org(

carbonserver/carbonserver/config.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ def fief_url(self) -> str:
3232
frontend_url: str = Field("", env="FRONTEND_URL")
3333
environment: str = Field("production")
3434
jwt_key: str = Field("", env="JWT_KEY")
35-
logfire_token: str = Field("", env="LOGFIRE_TOKEN")
36-
send_to_logfire: bool = Field(False, env="LOGFIRE_SEND_TO_LOGFIRE")
3735
api_port: int = Field(8080, env="API_PORT")
3836
server_host: str = Field("0.0.0.0", env="SERVER_HOST")
3937

carbonserver/main.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import os
22

3-
import logfire
43
from fastapi import FastAPI
54
from fastapi_pagination import add_pagination
65
from pydantic import ValidationError
@@ -83,17 +82,13 @@ def init_db(container):
8382

8483

8584
def init_server(container):
86-
logfire.configure(
87-
token=settings.logfire_token, send_to_logfire=settings.send_to_logfire
88-
)
8985
server = FastAPI(
9086
servers=[
9187
{"url": "/api/"},
9288
],
9389
port=settings.api_port,
9490
host=settings.server_host,
9591
)
96-
logfire.instrument_fastapi(server)
9792

9893
server.container = container
9994
server.include_router(users.router)

carbonserver/pyproject.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ dependencies = [
2222
"fastapi<1.0.0",
2323
"fief-client[fastapi]",
2424
"fastapi[standard]",
25-
"logfire",
2625
"httpx",
2726
"pydantic[email]<2.0.0",
2827
"psycopg2-binary<3.0.0",
@@ -38,7 +37,6 @@ dependencies = [
3837
"requests-mock",
3938
"rapidfuzz",
4039
"PyJWT",
41-
"logfire[fastapi]>=1.0.1",
4240
"fastapi-oidc>=0.0.9",
4341
]
4442

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ dev = [
9090
"requests",
9191
"requests-mock",
9292
"responses",
93-
"logfire>=1.0.1",
9493
"pytest-cov",
94+
"logfire>=1.0.1", # For testing Logfire output method
9595
]
9696
doc = [
9797
"sphinx",
@@ -133,7 +133,6 @@ api = [
133133
"requests-mock",
134134
"rapidfuzz",
135135
"PyJWT",
136-
"logfire[fastapi]>=1.0.1",
137136
]
138137

139138
[project.scripts]

requirements/requirements-api.txt

Lines changed: 3 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ anyio==4.12.0
1111
# watchfiles
1212
arrow==1.4.0
1313
# via codecarbon (pyproject.toml)
14-
asgiref==3.11.0
15-
# via opentelemetry-instrumentation-asgi
1614
bcrypt==4.3.0
1715
# via codecarbon (pyproject.toml)
1816
cachetools==6.2.3
@@ -43,8 +41,6 @@ ecdsa==0.19.1
4341
# via python-jose
4442
email-validator==2.3.0
4543
# via pydantic
46-
executing==2.2.1
47-
# via logfire
4844
fastapi==0.123.0
4945
# via
5046
# codecarbon (pyproject.toml)
@@ -57,8 +53,8 @@ fastapi-pagination==0.15.0
5753
# via codecarbon (pyproject.toml)
5854
fief-client==0.20.0
5955
# via codecarbon (pyproject.toml)
60-
googleapis-common-protos==1.72.0
61-
# via opentelemetry-exporter-otlp-proto-http
56+
greenlet==3.3.1
57+
# via sqlalchemy
6258
h11==0.16.0
6359
# via
6460
# httpcore
@@ -77,14 +73,10 @@ idna==3.11
7773
# email-validator
7874
# httpx
7975
# requests
80-
importlib-metadata==8.7.0
81-
# via opentelemetry-api
8276
iniconfig==2.3.0
8377
# via pytest
8478
jwcrypto==1.5.6
8579
# via fief-client
86-
logfire==4.15.1
87-
# via codecarbon (pyproject.toml)
8880
makefun==1.16.0
8981
# via fief-client
9082
mako==1.3.10
@@ -103,49 +95,8 @@ numpy==2.4.2
10395
# pandas
10496
nvidia-ml-py==13.580.82
10597
# via codecarbon (pyproject.toml)
106-
opentelemetry-api==1.38.0
107-
# via
108-
# opentelemetry-exporter-otlp-proto-http
109-
# opentelemetry-instrumentation
110-
# opentelemetry-instrumentation-asgi
111-
# opentelemetry-instrumentation-fastapi
112-
# opentelemetry-sdk
113-
# opentelemetry-semantic-conventions
114-
opentelemetry-exporter-otlp-proto-common==1.38.0
115-
# via opentelemetry-exporter-otlp-proto-http
116-
opentelemetry-exporter-otlp-proto-http==1.38.0
117-
# via logfire
118-
opentelemetry-instrumentation==0.59b0
119-
# via
120-
# logfire
121-
# opentelemetry-instrumentation-asgi
122-
# opentelemetry-instrumentation-fastapi
123-
opentelemetry-instrumentation-asgi==0.59b0
124-
# via opentelemetry-instrumentation-fastapi
125-
opentelemetry-instrumentation-fastapi==0.59b0
126-
# via logfire
127-
opentelemetry-proto==1.38.0
128-
# via
129-
# opentelemetry-exporter-otlp-proto-common
130-
# opentelemetry-exporter-otlp-proto-http
131-
opentelemetry-sdk==1.38.0
132-
# via
133-
# logfire
134-
# opentelemetry-exporter-otlp-proto-http
135-
opentelemetry-semantic-conventions==0.59b0
136-
# via
137-
# opentelemetry-instrumentation
138-
# opentelemetry-instrumentation-asgi
139-
# opentelemetry-instrumentation-fastapi
140-
# opentelemetry-sdk
141-
opentelemetry-util-http==0.59b0
142-
# via
143-
# opentelemetry-instrumentation-asgi
144-
# opentelemetry-instrumentation-fastapi
14598
packaging==25.0
146-
# via
147-
# opentelemetry-instrumentation
148-
# pytest
99+
# via pytest
149100
pandas==2.3.3
150101
# via codecarbon (pyproject.toml)
151102
pluggy==1.6.0
@@ -154,11 +105,6 @@ prometheus-client==0.23.1
154105
# via codecarbon (pyproject.toml)
155106
prompt-toolkit==3.0.52
156107
# via questionary
157-
protobuf==6.33.5
158-
# via
159-
# googleapis-common-protos
160-
# logfire
161-
# opentelemetry-proto
162108
psutil==6.1.1
163109
# via codecarbon (pyproject.toml)
164110
psycopg2-binary==2.9.11
@@ -208,7 +154,6 @@ requests==2.32.5
208154
# via
209155
# codecarbon (pyproject.toml)
210156
# fastapi-oidc
211-
# opentelemetry-exporter-otlp-proto-http
212157
# requests-mock
213158
# responses
214159
requests-mock==1.12.1
@@ -218,7 +163,6 @@ responses==0.25.8
218163
rich==14.2.0
219164
# via
220165
# codecarbon (pyproject.toml)
221-
# logfire
222166
# typer
223167
rsa==4.9.1
224168
# via python-jose
@@ -247,11 +191,6 @@ typing-extensions==4.15.0
247191
# fastapi
248192
# fastapi-pagination
249193
# jwcrypto
250-
# logfire
251-
# opentelemetry-api
252-
# opentelemetry-exporter-otlp-proto-http
253-
# opentelemetry-sdk
254-
# opentelemetry-semantic-conventions
255194
# pydantic
256195
# starlette
257196
# typer
@@ -273,9 +212,5 @@ wcwidth==0.2.14
273212
# via prompt-toolkit
274213
websockets==15.0.1
275214
# via uvicorn
276-
wrapt==1.17.3
277-
# via opentelemetry-instrumentation
278215
yaspin==3.3.0
279216
# via fief-client
280-
zipp==3.23.0
281-
# via importlib-metadata

0 commit comments

Comments
 (0)