Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Avoid key-error when inserting asset chunks #550

Merged
merged 6 commits into from
Mar 3, 2025
+398 −70
Merged

fix: Avoid key-error when inserting asset chunks #550

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f8bb75d
if no key exists in map then skip
ajay-sentry Feb 28, 2025
829a5c5
actual fix
ajay-sentry Feb 28, 2025
32f2b93
add repr on asset for easier debugging, update jsons to v3 parser
ajay-sentry Feb 28, 2025
bcbb45e
fix tests, use .get()
ajay-sentry Feb 28, 2025
33e9f06
revert thing that makes test fail
ajay-sentry Feb 28, 2025
e97b3d9
add to other parser versions and test
ajay-sentry Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add repr on asset for easier debugging, update jsons to v3 parser
  • Loading branch information
@ajay-sentry
ajay-sentry committed Feb 28, 2025
commit 32f2b93e4dd03298fccffe98766af21a65e1d33e
4 changes: 4 additions & 0 deletions shared/bundle_analysis/models.py
View file
Original file line number Diff line number Diff line change
@@ -238,6 +238,10 @@ class Asset(Base):
"Chunk", secondary=assets_chunks, back_populates="assets", cascade="all, delete"
)

def __repr__(self):
"""Returns a string representation of the Asset with key information"""
return f"Asset(name='{self.name}', type={self.asset_type}, size={self.size})"


class Chunk(Base):
"""
6 changes: 4 additions & 2 deletions shared/bundle_analysis/parsers/v3.py
View file
Original file line number Diff line number Diff line change
@@ -381,15 +381,17 @@ def _create_associations(self):
self.db_session.query(Asset)
.filter(
Asset.session_id == self.session.id,
Asset.asset_type == AssetType.JAVASCRIPT,
# Asset.asset_type == AssetType.JAVASCRIPT,
)
.all()
)

print("IN HERE")
print("IN HERE", assets)

asset_name_to_id = {asset.name: asset.id for asset in assets}

print("IN HERE 2", asset_name_to_id)

chunks: list[Chunk] = (
self.db_session.query(Chunk)
.filter(
86 changes: 71 additions & 15 deletions tests/samples/asset_link_curr_a.json
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,57 @@
{
"version": "1",
"version": "3",
"builtAt": 1716480551148,
"duration": 294,
"bundleName": "BundleA",
"outputPath": "/vite/dist",
"bundler": { "name": "rollup", "version": "4.16.2" },
"plugin": { "name": "@codecov/vite-plugin", "version": "0.0.1-beta.8" },
"assets": [
{ "name": "asset-same-name-diff-modules.js", "size": 4126, "normalized": "asset-*.js" },
{ "name": "asset-diff-name-same-modules-TWO.js", "size": 1421, "normalized": "asset-*.js" },
{ "name": "asset-diff-name-diff-modules-TWO.js", "size": 161, "normalized": "asset-*.js" },
{ "name": "asset-css-A-TWO.css", "size": 4, "normalized": "assets/index-*.css"},
{ "name": "asset-css-B-TWO.css", "size": 5, "normalized": "assets/index-*.css"},
{ "name": "asset-font-A-TWO.woff", "size": 40, "normalized": "assets/index-*.woff"},
{ "name": "asset-font-B-TWO.ttf", "size": 50, "normalized": "assets/index-*.ttf"},
{ "name": "asset-image-A-TWO.jpg", "size": 400, "normalized": "assets/index-*.jpg"},
{ "name": "asset-image-B-TWO.svg", "size": 500, "normalized": "assets/index-*.svg"}
{
"name": "asset-same-name-diff-modules.js",
"size": 4126,
"normalized": "asset-*.js"
},
{
"name": "asset-diff-name-same-modules-TWO.js",
"size": 1421,
"normalized": "asset-*.js"
},
{
"name": "asset-diff-name-diff-modules-TWO.js",
"size": 161,
"normalized": "asset-*.js"
},
{
"name": "asset-css-A-TWO.css",
"size": 4,
"normalized": "assets/index-*.css"
},
{
"name": "asset-css-B-TWO.css",
"size": 5,
"normalized": "assets/index-*.css"
},
{
"name": "asset-font-A-TWO.woff",
"size": 40,
"normalized": "assets/index-*.woff"
},
{
"name": "asset-font-B-TWO.ttf",
"size": 50,
"normalized": "assets/index-*.ttf"
},
{
"name": "asset-image-A-TWO.jpg",
"size": 400,
"normalized": "assets/index-*.jpg"
},
{
"name": "asset-image-B-TWO.svg",
"size": 500,
"normalized": "assets/index-*.svg"
}
],
"chunks": [
{
@@ -44,14 +80,34 @@
}
],
"modules": [
{ "name": "./src/file-aTwo.js", "size": 189, "chunkUniqueIds": ["0-asset"] },
{ "name": "./src/file-bTwo.js", "size": 353, "chunkUniqueIds": ["0-asset"] },
{ "name": "./src/file-cTwo.js", "size": 497, "chunkUniqueIds": ["0-asset"] },
{
"name": "./src/file-aTwo.js",
"size": 189,
"chunkUniqueIds": ["0-asset"]
},
{
"name": "./src/file-bTwo.js",
"size": 353,
"chunkUniqueIds": ["0-asset"]
},
{
"name": "./src/file-cTwo.js",
"size": 497,
"chunkUniqueIds": ["0-asset"]
},
{ "name": "./src/file-d.js", "size": 154, "chunkUniqueIds": ["1-asset"] },
{ "name": "./src/file-e.js", "size": 140, "chunkUniqueIds": ["1-asset"] },
{ "name": "./src/file-f.js", "size": 315, "chunkUniqueIds": ["1-asset"] },
{ "name": "./src/file-sTWO.js", "size": 406, "chunkUniqueIds": ["2-asset"] },
{ "name": "./src/file-tTWO.js", "size": 262, "chunkUniqueIds": ["2-asset"] },
{
"name": "./src/file-sTWO.js",
"size": 406,
"chunkUniqueIds": ["2-asset"]
},
{
"name": "./src/file-tTWO.js",
"size": 262,
"chunkUniqueIds": ["2-asset"]
},
{ "name": "./src/file-uTWO.js", "size": 308, "chunkUniqueIds": ["2-asset"] }
]
}
86 changes: 71 additions & 15 deletions tests/samples/asset_link_curr_b.json
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,57 @@
{
"version": "1",
"version": "3",
"builtAt": 1716480551148,
"duration": 294,
"bundleName": "BundleB",
"outputPath": "/vite/dist",
"bundler": { "name": "rollup", "version": "4.16.2" },
"plugin": { "name": "@codecov/vite-plugin", "version": "0.0.1-beta.8" },
"assets": [
{ "name": "asset-same-name-diff-modules.js", "size": 4126, "normalized": "asset-*.js" },
{ "name": "asset-diff-name-same-modules-TWO.js", "size": 1421, "normalized": "asset-*.js" },
{ "name": "asset-diff-name-diff-modules-TWO.js", "size": 161, "normalized": "asset-*.js" },
{ "name": "asset-css-A-TWO.css", "size": 4, "normalized": "assets/index-*.css"},
{ "name": "asset-css-B-TWO.css", "size": 5, "normalized": "assets/index-*.css"},
{ "name": "asset-font-A-TWO.woff", "size": 40, "normalized": "assets/index-*.woff"},
{ "name": "asset-font-B-TWO.ttf", "size": 50, "normalized": "assets/index-*.ttf"},
{ "name": "asset-image-A-TWO.jpg", "size": 400, "normalized": "assets/index-*.jpg"},
{ "name": "asset-image-B-TWO.svg", "size": 500, "normalized": "assets/index-*.svg"}
{
"name": "asset-same-name-diff-modules.js",
"size": 4126,
"normalized": "asset-*.js"
},
{
"name": "asset-diff-name-same-modules-TWO.js",
"size": 1421,
"normalized": "asset-*.js"
},
{
"name": "asset-diff-name-diff-modules-TWO.js",
"size": 161,
"normalized": "asset-*.js"
},
{
"name": "asset-css-A-TWO.css",
"size": 4,
"normalized": "assets/index-*.css"
},
{
"name": "asset-css-B-TWO.css",
"size": 5,
"normalized": "assets/index-*.css"
},
{
"name": "asset-font-A-TWO.woff",
"size": 40,
"normalized": "assets/index-*.woff"
},
{
"name": "asset-font-B-TWO.ttf",
"size": 50,
"normalized": "assets/index-*.ttf"
},
{
"name": "asset-image-A-TWO.jpg",
"size": 400,
"normalized": "assets/index-*.jpg"
},
{
"name": "asset-image-B-TWO.svg",
"size": 500,
"normalized": "assets/index-*.svg"
}
],
"chunks": [
{
@@ -44,14 +80,34 @@
}
],
"modules": [
{ "name": "./src/file-aTwo.js", "size": 189, "chunkUniqueIds": ["0-asset"] },
{ "name": "./src/file-bTwo.js", "size": 353, "chunkUniqueIds": ["0-asset"] },
{ "name": "./src/file-cTwo.js", "size": 497, "chunkUniqueIds": ["0-asset"] },
{
"name": "./src/file-aTwo.js",
"size": 189,
"chunkUniqueIds": ["0-asset"]
},
{
"name": "./src/file-bTwo.js",
"size": 353,
"chunkUniqueIds": ["0-asset"]
},
{
"name": "./src/file-cTwo.js",
"size": 497,
"chunkUniqueIds": ["0-asset"]
},
{ "name": "./src/file-d.js", "size": 154, "chunkUniqueIds": ["1-asset"] },
{ "name": "./src/file-e.js", "size": 140, "chunkUniqueIds": ["1-asset"] },
{ "name": "./src/file-f.js", "size": 315, "chunkUniqueIds": ["1-asset"] },
{ "name": "./src/file-sTWO.js", "size": 406, "chunkUniqueIds": ["2-asset"] },
{ "name": "./src/file-tTWO.js", "size": 262, "chunkUniqueIds": ["2-asset"] },
{
"name": "./src/file-sTWO.js",
"size": 406,
"chunkUniqueIds": ["2-asset"]
},
{
"name": "./src/file-tTWO.js",
"size": 262,
"chunkUniqueIds": ["2-asset"]
},
{ "name": "./src/file-uTWO.js", "size": 308, "chunkUniqueIds": ["2-asset"] }
]
}
86 changes: 71 additions & 15 deletions tests/samples/asset_link_prev_a.json
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,57 @@
{
"version": "1",
"version": "3",
"builtAt": 1716480551136,
"duration": 294,
"bundleName": "BundleA",
"outputPath": "/vite/dist",
"bundler": { "name": "rollup", "version": "4.16.2" },
"plugin": { "name": "@codecov/vite-plugin", "version": "0.0.1-beta.8" },
"assets": [
{ "name": "asset-same-name-diff-modules.js", "size": 4126, "normalized": "asset-*.js" },
{ "name": "asset-diff-name-same-modules-ONE.js", "size": 1421, "normalized": "asset-*.js" },
{ "name": "asset-diff-name-diff-modules-ONE.js", "size": 161, "normalized": "asset-*.js" },
{ "name": "asset-css-A-ONE.css", "size": 2, "normalized": "assets/index-*.css"},
{ "name": "asset-css-B-ONE.css", "size": 3, "normalized": "assets/index-*.css"},
{ "name": "asset-font-A-ONE.woff", "size": 20, "normalized": "assets/index-*.woff"},
{ "name": "asset-font-B-ONE.ttf", "size": 30, "normalized": "assets/index-*.ttf"},
{ "name": "asset-image-A-ONE.jpg", "size": 200, "normalized": "assets/index-*.jpg"},
{ "name": "asset-image-B-ONE.svg", "size": 300, "normalized": "assets/index-*.svg"}
{
"name": "asset-same-name-diff-modules.js",
"size": 4126,
"normalized": "asset-*.js"
},
{
"name": "asset-diff-name-same-modules-ONE.js",
"size": 1421,
"normalized": "asset-*.js"
},
{
"name": "asset-diff-name-diff-modules-ONE.js",
"size": 161,
"normalized": "asset-*.js"
},
{
"name": "asset-css-A-ONE.css",
"size": 2,
"normalized": "assets/index-*.css"
},
{
"name": "asset-css-B-ONE.css",
"size": 3,
"normalized": "assets/index-*.css"
},
{
"name": "asset-font-A-ONE.woff",
"size": 20,
"normalized": "assets/index-*.woff"
},
{
"name": "asset-font-B-ONE.ttf",
"size": 30,
"normalized": "assets/index-*.ttf"
},
{
"name": "asset-image-A-ONE.jpg",
"size": 200,
"normalized": "assets/index-*.jpg"
},
{
"name": "asset-image-B-ONE.svg",
"size": 300,
"normalized": "assets/index-*.svg"
}
],
"chunks": [
{
@@ -44,14 +80,34 @@
}
],
"modules": [
{ "name": "./src/file-aOne.js", "size": 189, "chunkUniqueIds": ["0-asset"] },
{ "name": "./src/file-bOne.js", "size": 353, "chunkUniqueIds": ["0-asset"] },
{ "name": "./src/file-cOne.js", "size": 497, "chunkUniqueIds": ["0-asset"] },
{
"name": "./src/file-aOne.js",
"size": 189,
"chunkUniqueIds": ["0-asset"]
},
{
"name": "./src/file-bOne.js",
"size": 353,
"chunkUniqueIds": ["0-asset"]
},
{
"name": "./src/file-cOne.js",
"size": 497,
"chunkUniqueIds": ["0-asset"]
},
{ "name": "./src/file-d.js", "size": 154, "chunkUniqueIds": ["1-asset"] },
{ "name": "./src/file-e.js", "size": 140, "chunkUniqueIds": ["1-asset"] },
{ "name": "./src/file-f.js", "size": 315, "chunkUniqueIds": ["1-asset"] },
{ "name": "./src/file-gONE.js", "size": 406, "chunkUniqueIds": ["2-asset"] },
{ "name": "./src/file-hONE.js", "size": 262, "chunkUniqueIds": ["2-asset"] },
{
"name": "./src/file-gONE.js",
"size": 406,
"chunkUniqueIds": ["2-asset"]
},
{
"name": "./src/file-hONE.js",
"size": 262,
"chunkUniqueIds": ["2-asset"]
},
{ "name": "./src/file-iONE.js", "size": 308, "chunkUniqueIds": ["2-asset"] }
]
}
Loading
Oops, something went wrong.
Loading
Oops, something went wrong.