Skip to content

Commit 169657e

Browse files
authored
Merge pull request #41 from pinecone-io/sc-9584
Remove sentry from python client
2 parents cef6034 + 89d9109 commit 169657e

File tree

8 files changed

+0
-93
lines changed

8 files changed

+0
-93
lines changed

pinecone/config.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@
77

88
import certifi
99
import requests
10-
import sentry_sdk
1110
import configparser
1211

1312
from pinecone.core.client.exceptions import ApiKeyError
1413
from pinecone.core.api_action import ActionAPI, WhoAmIResponse
1514
from pinecone.core.utils import warn_deprecated
1615
from pinecone.core.utils.constants import CLIENT_VERSION, PARENT_LOGGER_NAME, DEFAULT_PARENT_LOGGER_LEVEL
17-
from pinecone.core.utils.sentry import sentry_decorator as sentry
1816
from pinecone.core.client.configuration import Configuration as OpenApiConfiguration
1917

2018
__all__ = [
@@ -26,14 +24,6 @@
2624
_parent_logger.setLevel(DEFAULT_PARENT_LOGGER_LEVEL)
2725

2826

29-
def _set_sentry_tags(config: dict):
30-
sentry_sdk.set_tag("package_version", CLIENT_VERSION)
31-
sentry_tag_names = ('environment', 'project_name', 'controller_host', 'username', 'user_label')
32-
for key, val in config.items():
33-
if key in sentry_tag_names:
34-
sentry_sdk.set_tag(key, val)
35-
36-
3727
class ConfigBase(NamedTuple):
3828
environment: str = ""
3929
api_key: str = ""
@@ -122,8 +112,6 @@ def reset(self, config_file=None, **kwargs):
122112
config = config._replace(openapi_config=openapi_config)
123113
self._config = config
124114

125-
# Sentry
126-
_set_sentry_tags({**whoami_response._asdict(), **self._config._asdict()})
127115

128116
def _preprocess_and_validate_config(self, config: dict) -> dict:
129117
"""Normalize, filter, and validate config keys/values.
@@ -189,7 +177,6 @@ def LOG_LEVEL(self):
189177
return logging.getLevelName(logging.getLogger('pinecone').level)
190178

191179

192-
@sentry
193180
def init(api_key: str = None, host: str = None, environment: str = None, project_name: str = None,
194181
log_level: str = None, openapi_config: OpenApiConfiguration = None,
195182
config: str = "~/.pinecone", **kwargs):

pinecone/core/grpc/index_grpc.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from pinecone.core.grpc.retry import RetryOnRpcErrorClientInterceptor, RetryConfig
2323
from pinecone.core.utils import _generate_request_id, dict_to_proto_struct, fix_tuple_length
2424
from pinecone.core.utils.constants import MAX_MSG_SIZE, REQUEST_ID, CLIENT_VERSION
25-
from pinecone.core.utils.sentry import sentry_decorator as sentry
2625
from pinecone.exceptions import PineconeException
2726

2827
__all__ = ["GRPCIndex", "GRPCVector", "GRPCQueryVector"]
@@ -127,7 +126,6 @@ def grpc_server_on(self) -> bool:
127126
except grpc.FutureTimeoutError:
128127
return False
129128

130-
@sentry
131129
def close(self):
132130
"""Closes the connection to the index."""
133131
try:
@@ -137,7 +135,6 @@ def close(self):
137135

138136
def _wrap_grpc_call(self, func, request, timeout=None, metadata=None, credentials=None, wait_for_ready=None,
139137
compression=None):
140-
@sentry
141138
@wraps(func)
142139
def wrapped():
143140
user_provided_metadata = metadata or {}
@@ -244,7 +241,6 @@ class GRPCIndex(GRPCIndexBase):
244241
def stub_class(self):
245242
return VectorServiceStub
246243

247-
@sentry
248244
def upsert(self, vectors, async_req=False, **kwargs):
249245
def _vector_transform(item):
250246
if isinstance(item, GRPCVector):
@@ -262,7 +258,6 @@ def _vector_transform(item):
262258
else:
263259
return self._wrap_grpc_call(self.stub.Upsert, request, timeout=timeout)
264260

265-
@sentry
266261
def delete(self, *args, async_req=False, **kwargs):
267262
request = DeleteRequest(*args, **kwargs)
268263
timeout = kwargs.pop('timeout', None)
@@ -272,15 +267,13 @@ def delete(self, *args, async_req=False, **kwargs):
272267
else:
273268
return self._wrap_grpc_call(self.stub.Delete, request, timeout=timeout)
274269

275-
@sentry
276270
def fetch(self, *args, **kwargs):
277271
timeout = kwargs.pop('timeout', None)
278272
request = FetchRequest(*args, **kwargs)
279273
response = self._wrap_grpc_call(self.stub.Fetch, request, timeout=timeout)
280274
json_response = json_format.MessageToDict(response)
281275
return parse_fetch_response(json_response)
282276

283-
@sentry
284277
def query(self, queries, **kwargs):
285278
timeout = kwargs.pop('timeout', None)
286279

@@ -304,7 +297,6 @@ def _query_transform(item):
304297
json_response = json_format.MessageToDict(response)
305298
return parse_query_response(json_response)
306299

307-
@sentry
308300
def describe_index_stats(self, **kwargs):
309301
timeout = kwargs.pop('timeout', None)
310302
request = DescribeIndexStatsRequest()

pinecone/core/utils/constants.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,5 @@ class NodeType(str, enum.Enum):
3131

3232

3333
PACKAGE_ENVIRONMENT = get_environment() or "development"
34-
SENTRY_DSN_TXT_RECORD = "pinecone-client.sentry.pinecone.io"
3534
CLIENT_VERSION = get_version()
3635
CLIENT_ID = f'python-client-{CLIENT_VERSION}'

pinecone/core/utils/sentry.py

Lines changed: 0 additions & 54 deletions
This file was deleted.

pinecone/index.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
from pinecone import Config
88
from pinecone.core.client import ApiClient, Configuration
9-
from pinecone.core.utils.sentry import sentry_decorator as sentry
109
from .core.client.models import FetchResponse, ProtobufAny, QueryRequest, QueryResponse, QueryVector, RpcStatus, \
1110
ScoredVector, SingleQueryResults, DescribeIndexStatsResponse, UpsertRequest, UpsertResponse, Vector
1211
from pinecone.core.client.api.vector_operations_api import VectorOperationsApi
@@ -45,7 +44,6 @@ def __init__(self, index_name: str, pool_threads=1):
4544
self.user_agent = get_user_agent()
4645
self._vector_api = VectorOperationsApi(self)
4746

48-
@sentry
4947
@validate_and_convert_errors
5048
def upsert(self, vectors, **kwargs):
5149
_check_type = kwargs.pop('_check_type', False)
@@ -67,17 +65,14 @@ def _vector_transform(item):
6765
**{k: v for k, v in kwargs.items() if k in _OPENAPI_ENDPOINT_PARAMS}
6866
)
6967

70-
@sentry
7168
@validate_and_convert_errors
7269
def delete(self, *args, **kwargs):
7370
return self._vector_api.delete(*args, **kwargs)
7471

75-
@sentry
7672
@validate_and_convert_errors
7773
def fetch(self, *args, **kwargs):
7874
return self._vector_api.fetch(*args, **kwargs)
7975

80-
@sentry
8176
@validate_and_convert_errors
8277
def query(self, queries, **kwargs):
8378
_check_type = kwargs.pop('_check_type', False)
@@ -101,7 +96,6 @@ def _query_transform(item):
10196
**{k: v for k, v in kwargs.items() if k in _OPENAPI_ENDPOINT_PARAMS}
10297
)
10398

104-
@sentry
10599
@validate_and_convert_errors
106100
def describe_index_stats(self, *args, **kwargs):
107101
return self._vector_api.describe_index_stats(*args, **kwargs)

pinecone/info.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Copyright (c) 2020-2021 Pinecone Systems Inc. All right reserved.
33
#
44

5-
from pinecone.core.utils.sentry import sentry_decorator as sentry
65
from pinecone.core.api_action import ActionAPI, VersionResponse, WhoAmIResponse
76
from pinecone.config import Config
87

@@ -16,21 +15,18 @@ def _get_action_api():
1615
return ActionAPI(host=Config.CONTROLLER_HOST, api_key=Config.API_KEY)
1716

1817

19-
@sentry
2018
def version() -> VersionResponse:
2119
"""Returns version information (client and server)."""
2220
api = _get_action_api()
2321
return api.version()
2422

2523

26-
@sentry
2724
def whoami() -> WhoAmIResponse:
2825
"""Returns the details of the currently authenticated API key."""
2926
api = _get_action_api()
3027
return api.whoami()
3128

3229

33-
@sentry
3430
def wait_controller_ready(timeout: int = 30):
3531
connection = False
3632
max_time = time.time() + timeout

pinecone/manage.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
from pinecone.core.client.configuration import Configuration
1313
from pinecone.core.client.model.create_request import CreateRequest
1414
from pinecone.core.client.model.patch_request import PatchRequest
15-
from pinecone.core.utils.sentry import sentry_decorator as sentry
1615
from pinecone.core.utils import get_user_agent
1716

1817
__all__ = [
@@ -55,7 +54,6 @@ def _get_status(name: str):
5554
return response['status']
5655

5756

58-
@sentry
5957
def create_index(
6058
name: str,
6159
dimension: int,
@@ -132,7 +130,6 @@ def is_ready():
132130
'https://www.pinecone.io/docs/api/operation/describe_index/')))
133131

134132

135-
@sentry
136133
def delete_index(name: str, timeout: int = None):
137134
"""Deletes a Pinecone index.
138135
@@ -163,15 +160,13 @@ def get_remaining():
163160
'https://www.pinecone.io/docs/api/operation/list_indexes/')))
164161

165162

166-
@sentry
167163
def list_indexes():
168164
"""Lists all indexes."""
169165
api_instance = _get_api_instance()
170166
response = api_instance.list_indexes()
171167
return response
172168

173169

174-
@sentry
175170
def describe_index(name: str):
176171
"""Describes a Pinecone index.
177172
@@ -188,7 +183,6 @@ def describe_index(name: str):
188183
index_config=db['index_config'], status={'ready': ready})
189184

190185

191-
@sentry
192186
def scale_index(name: str, replicas: int):
193187
"""Increases number of replicas for the index.
194188

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ requests>=2.19.0
22
pyyaml>=5.4
33
loguru>=0.5.0
44
typing-extensions>=3.7.4
5-
sentry-sdk>=1.0.0
65
dnspython>=2.0.0
76
# openapi generated client:
87
python_dateutil >= 2.5.3

0 commit comments

Comments
 (0)