Skip to content

Commit 06f5fa9

Browse files
committed
Merge branch 'master' into shruthi/feat/make-extrapolation-mode-enum-2
2 parents 3f039d0 + 5dda8f6 commit 06f5fa9

File tree

1,664 files changed

+15330
-16091
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,664 files changed

+15330
-16091
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,11 +524,9 @@ pnpm-lock.yaml @getsentry/owners-js-de
524524
## End of Telemetry Experience
525525

526526
## ML & AI
527-
*autofix*.py @getsentry/machine-learning-ai
528527
/static/app/components/events/autofix/ @getsentry/machine-learning-ai
528+
/static/app/views/seerExplorer/ @getsentry/machine-learning-ai
529529
/src/sentry/seer/ @getsentry/machine-learning-ai
530-
*seerExplorer*.tsx @getsentry/machine-learning-ai
531-
*seerExplorer*.ts @getsentry/machine-learning-ai
532530
## End of ML & AI
533531

534532
## Issues

bin/preprod/trigger_size_status_check

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ COMMIT_SHA = "db2b4ae626b458b4be651019f1a7c112406c003e"
3030
# Build configurations - set to None to disable a build
3131
BUILD_1 = {
3232
"app_id": "com.emerge.hackernews.android",
33+
"artifact_type": PreprodArtifact.ArtifactType.AAB,
3334
"app_name": "HackerNews",
3435
"platform": "Android",
3536
"build_version": "1.0.3",
@@ -42,8 +43,10 @@ BUILD_1 = {
4243
"error_message": None, # Only used if state is "failed"
4344
}
4445

46+
# Set to None to disable BUILD_2 for single-build testing:
4547
BUILD_2 = {
4648
"app_id": "com.emerge.hackernews.ios",
49+
"artifact_type": PreprodArtifact.ArtifactType.XCARCHIVE,
4750
"app_name": "HackerNews",
4851
"platform": "iOS",
4952
"build_version": "1.0.3",
@@ -56,9 +59,6 @@ BUILD_2 = {
5659
"error_message": None, # Only used if state is "failed"
5760
}
5861

59-
# Set to None to disable BUILD_2 for single-build testing:
60-
# BUILD_2 = None
61-
6262
# Available states:
6363
# - "uploading": Artifact is still uploading (no metrics)
6464
# - "uploaded": Artifact uploaded but not processed yet (no metrics)
@@ -476,6 +476,7 @@ def main() -> None:
476476
# Create artifact data
477477
artifact_data = {
478478
"project": project,
479+
"artifact_type": build_config["artifact_type"],
479480
"app_id": build_config["app_id"],
480481
"app_name": build_config["app_name"],
481482
"commit_comparison": commit_comparison,

knip.config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ const productionEntryPoints = [
1717
// this is imported with require.context
1818
'static/app/data/forms/*.tsx',
1919
// --- we should be able to get rid of those: ---
20+
// Only used in stories (so far)
21+
'static/app/components/core/quote/*.tsx',
2022
// Prevent exception until we build out coverage
2123
'static/app/components/prevent/virtualRenderers/**/*.{js,ts,tsx}',
2224
// todo we currently keep all icons

migrations_lockfile.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ tempest: 0001_squashed_0002_make_message_type_nullable
3939

4040
uptime: 0048_delete_uptime_status_columns
4141

42-
workflow_engine: 0095_unique_detectorgroup_group
42+
workflow_engine: 0097_add_unique_constraint_to_datasource

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
"@stripe/stripe-js": "^5.10.0",
8080
"@swc/plugin-emotion": "11.0.3",
8181
"@tanstack/query-async-storage-persister": "5.83.1",
82+
"@tanstack/react-pacer": "^0.17.0",
8283
"@tanstack/react-query": "5.85.0",
8384
"@tanstack/react-query-devtools": "5.85.0",
8485
"@tanstack/react-query-persist-client": "5.85.0",

pnpm-lock.yaml

Lines changed: 50 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ dependencies = [
8181
# [end] jsonschema format validators
8282
"sentry-arroyo>=2.33.1",
8383
"sentry-forked-email-reply-parser>=0.5.12.post1",
84-
"sentry-kafka-schemas>=2.1.13",
84+
"sentry-kafka-schemas>=2.1.15",
8585
"sentry-ophio>=1.1.3",
8686
"sentry-protos>=0.4.3",
8787
"sentry-redis-tools>=0.5.0",

src/sentry/analytics/events/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
from .monitor_mark_failed import * # noqa: F401,F403
6363
from .onboarding_complete import * # noqa: F401,F403
6464
from .onboarding_continuation_sent import * # noqa: F401,F403
65-
from .open_pr_comment import * # noqa: F401,F403
6665
from .org_auth_token_created import * # noqa: F401,F403
6766
from .org_auth_token_deleted import * # noqa: F401,F403
6867
from .organization_created import * # noqa: F401,F403

src/sentry/analytics/events/open_pr_comment.py

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

src/sentry/api/endpoints/organization_trace_item_attributes.py

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from collections.abc import Callable
1+
from collections.abc import Callable, Sequence
22
from datetime import datetime, timedelta
33
from typing import Literal, NotRequired, TypedDict
44

@@ -33,7 +33,7 @@
3333
from sentry.models.releaseprojectenvironment import ReleaseStages
3434
from sentry.models.releases.release_project import ReleaseProject
3535
from sentry.search.eap import constants
36-
from sentry.search.eap.columns import ColumnDefinitions
36+
from sentry.search.eap.columns import ColumnDefinitions, VirtualColumnDefinition
3737
from sentry.search.eap.ourlogs.definitions import OURLOG_DEFINITIONS
3838
from sentry.search.eap.resolver import SearchResolver
3939
from sentry.search.eap.spans.definitions import SPAN_DEFINITIONS
@@ -404,7 +404,9 @@ def __init__(
404404
self.resolver = SearchResolver(
405405
params=snuba_params, config=SearchResolverConfig(), definitions=definitions
406406
)
407-
self.search_type, self.attribute_key = self.resolve_attribute_key(key, snuba_params)
407+
self.search_type, self.attribute_key, self.context_definition = self.resolve_attribute_key(
408+
key
409+
)
408410
self.autocomplete_function: dict[str, Callable[[], list[TagValue]]] = (
409411
{key: self.project_id_autocomplete_function for key in self.PROJECT_ID_KEYS}
410412
| {key: self.project_slug_autocomplete_function for key in self.PROJECT_SLUG_KEYS}
@@ -418,10 +420,12 @@ def __init__(
418420
)
419421

420422
def resolve_attribute_key(
421-
self, key: str, snuba_params: SnubaParams
422-
) -> tuple[constants.SearchType, AttributeKey]:
423-
resolved_attr, _ = self.resolver.resolve_attribute(key)
424-
return resolved_attr.search_type, resolved_attr.proto_definition
423+
self, key: str
424+
) -> tuple[constants.SearchType, AttributeKey, VirtualColumnDefinition | None]:
425+
resolved_attr, context_definition = self.resolver.resolve_attribute(key)
426+
if context_definition:
427+
resolved_attr = self.resolver.map_context_to_original_column(context_definition)
428+
return resolved_attr.search_type, resolved_attr.proto_definition, context_definition
425429

426430
def execute(self) -> list[TagValue]:
427431
func = self.autocomplete_function.get(self.key)
@@ -620,6 +624,11 @@ def string_autocomplete_function(self) -> list[TagValue]:
620624
)
621625
rpc_response = snuba_rpc.attribute_values_rpc(rpc_request)
622626

627+
values: Sequence[str] = rpc_response.values
628+
if self.context_definition:
629+
context = self.context_definition.constructor(self.snuba_params)
630+
values = [context.value_map.get(value, value) for value in values]
631+
623632
return [
624633
TagValue(
625634
key=self.key,
@@ -628,7 +637,7 @@ def string_autocomplete_function(self) -> list[TagValue]:
628637
first_seen=None,
629638
last_seen=None,
630639
)
631-
for value in rpc_response.values
640+
for value in values
632641
if value
633642
]
634643

0 commit comments

Comments
 (0)