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.

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: keep organization id when splitting the report #5063

Merged
merged 1 commit into from
Jun 25, 2024

Conversation

kamilkisiela
Copy link
Owner

Every time a report was too big and split into two or more reports, the organization id was missing, causing an operation count in the Subscription page to be slightly off.
Every other page that shows usage info, uses different tables, so not affected at all.

Copy link

changeset-bot bot commented Jun 25, 2024

⚠️ No Changeset found

Latest commit: 2ac6273

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link
Contributor

🐋 This PR was built and pushed to the following Docker images (tag: 2ac627353dc0e072d1d1f65bd2e88de94a5bac62):

Docker Bake metadata
{
"app": {
  "buildx.build.ref": "builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd/builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd0/u68vv05ft9xn1o0jglhmcuj6w",
  "containerimage.descriptor": {
    "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
    "digest": "sha256:206f84328047c18fab7f842d0a3ed6aa2e3a8d366931bb45b14cdf548195a538",
    "size": 685
  },
  "containerimage.digest": "sha256:206f84328047c18fab7f842d0a3ed6aa2e3a8d366931bb45b14cdf548195a538",
  "image.name": "ghcr.io/kamilkisiela/graphql-hive/app:2ac627353dc0e072d1d1f65bd2e88de94a5bac62,ghcr.io/kamilkisiela/graphql-hive/app:kamil_usage_report_org"
},
"composition-federation-2": {
  "buildx.build.ref": "builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd/builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd0/1xi3cxyd89sm3yr1a4cky7tdi",
  "containerimage.descriptor": {
    "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
    "digest": "sha256:11d971b2170d639063a8d7e36825669f39eac66d254ae6e77e1eb82dfc2046d8",
    "size": 685
  },
  "containerimage.digest": "sha256:11d971b2170d639063a8d7e36825669f39eac66d254ae6e77e1eb82dfc2046d8",
  "image.name": "ghcr.io/kamilkisiela/graphql-hive/composition-federation-2:2ac627353dc0e072d1d1f65bd2e88de94a5bac62,ghcr.io/kamilkisiela/graphql-hive/composition-federation-2:kamil_usage_report_org"
},
"emails": {
  "buildx.build.ref": "builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd/builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd0/j7bueln232ah8ihyxw6lezs0s",
  "containerimage.descriptor": {
    "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
    "digest": "sha256:bb941988e58f5ce58f94092581984bd1153f11894f2c2529ef4941ac4bdc12e7",
    "size": 685
  },
  "containerimage.digest": "sha256:bb941988e58f5ce58f94092581984bd1153f11894f2c2529ef4941ac4bdc12e7",
  "image.name": "ghcr.io/kamilkisiela/graphql-hive/emails:2ac627353dc0e072d1d1f65bd2e88de94a5bac62,ghcr.io/kamilkisiela/graphql-hive/emails:kamil_usage_report_org"
},
"policy": {
  "buildx.build.ref": "builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd/builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd0/v6jvoxt2cplqzlp1pykdfkxnw",
  "containerimage.descriptor": {
    "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
    "digest": "sha256:64b19f6ff83ab351148b816aacc98343420d77bf98192c4cbca83cef3fdcb366",
    "size": 685
  },
  "containerimage.digest": "sha256:64b19f6ff83ab351148b816aacc98343420d77bf98192c4cbca83cef3fdcb366",
  "image.name": "ghcr.io/kamilkisiela/graphql-hive/policy:2ac627353dc0e072d1d1f65bd2e88de94a5bac62,ghcr.io/kamilkisiela/graphql-hive/policy:kamil_usage_report_org"
},
"rate-limit": {
  "buildx.build.ref": "builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd/builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd0/pukr6qvrydsxvd8kjpc841ky0",
  "containerimage.descriptor": {
    "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
    "digest": "sha256:a2dd6485ac2ed8f3cee80598176a511c7c6a6195e84647615ba0e8815d92422e",
    "size": 685
  },
  "containerimage.digest": "sha256:a2dd6485ac2ed8f3cee80598176a511c7c6a6195e84647615ba0e8815d92422e",
  "image.name": "ghcr.io/kamilkisiela/graphql-hive/rate-limit:2ac627353dc0e072d1d1f65bd2e88de94a5bac62,ghcr.io/kamilkisiela/graphql-hive/rate-limit:kamil_usage_report_org"
},
"schema": {
  "buildx.build.ref": "builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd/builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd0/xajyeb9zgw8mgt3e48gto59ps",
  "containerimage.descriptor": {
    "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
    "digest": "sha256:615ac7e5b06fa383213dfc1a8f9c1550aee3063f9a86abd048c634cf24f2b995",
    "size": 685
  },
  "containerimage.digest": "sha256:615ac7e5b06fa383213dfc1a8f9c1550aee3063f9a86abd048c634cf24f2b995",
  "image.name": "ghcr.io/kamilkisiela/graphql-hive/schema:2ac627353dc0e072d1d1f65bd2e88de94a5bac62,ghcr.io/kamilkisiela/graphql-hive/schema:kamil_usage_report_org"
},
"server": {
  "buildx.build.ref": "builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd/builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd0/rcwc1bcmpc8p0rpjioc341ok3",
  "containerimage.descriptor": {
    "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
    "digest": "sha256:c480e71af0cedd3c8afbabe6c42c57e95de17c58300a9cfb5e9c2e1ae8a0c660",
    "size": 685
  },
  "containerimage.digest": "sha256:c480e71af0cedd3c8afbabe6c42c57e95de17c58300a9cfb5e9c2e1ae8a0c660",
  "image.name": "ghcr.io/kamilkisiela/graphql-hive/server:2ac627353dc0e072d1d1f65bd2e88de94a5bac62,ghcr.io/kamilkisiela/graphql-hive/server:kamil_usage_report_org"
},
"storage": {
  "buildx.build.ref": "builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd/builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd0/csv6pdimkhbf0mxlzdetjngn6",
  "containerimage.descriptor": {
    "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
    "digest": "sha256:b13f425682d1580765196c86cb2c89110b52f0b55574460161d2e72c6267038f",
    "size": 685
  },
  "containerimage.digest": "sha256:b13f425682d1580765196c86cb2c89110b52f0b55574460161d2e72c6267038f",
  "image.name": "ghcr.io/kamilkisiela/graphql-hive/storage:2ac627353dc0e072d1d1f65bd2e88de94a5bac62,ghcr.io/kamilkisiela/graphql-hive/storage:kamil_usage_report_org"
},
"stripe-billing": {
  "buildx.build.ref": "builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd/builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd0/mmezcdws7aq1c8tbn3k97rktv",
  "containerimage.descriptor": {
    "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
    "digest": "sha256:3447de253ca9080fd4b6e4d275b4d517ad69d64f0186bba576add7f04c698528",
    "size": 685
  },
  "containerimage.digest": "sha256:3447de253ca9080fd4b6e4d275b4d517ad69d64f0186bba576add7f04c698528",
  "image.name": "ghcr.io/kamilkisiela/graphql-hive/stripe-billing:2ac627353dc0e072d1d1f65bd2e88de94a5bac62,ghcr.io/kamilkisiela/graphql-hive/stripe-billing:kamil_usage_report_org"
},
"tokens": {
  "buildx.build.ref": "builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd/builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd0/wud0aban8iy5oap656zb74vh6",
  "containerimage.descriptor": {
    "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
    "digest": "sha256:e55d9acabff48633d7ce10150308e8c0229941f7d1351e74cef4744fc080839b",
    "size": 685
  },
  "containerimage.digest": "sha256:e55d9acabff48633d7ce10150308e8c0229941f7d1351e74cef4744fc080839b",
  "image.name": "ghcr.io/kamilkisiela/graphql-hive/tokens:2ac627353dc0e072d1d1f65bd2e88de94a5bac62,ghcr.io/kamilkisiela/graphql-hive/tokens:kamil_usage_report_org"
},
"usage": {
  "buildx.build.ref": "builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd/builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd0/8xsvqsb22yh9bupuc6btbsje9",
  "containerimage.descriptor": {
    "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
    "digest": "sha256:589d5c0dbcf8d2f6e21d6da4b002851901430c5e2579da5a83101415071080b6",
    "size": 685
  },
  "containerimage.digest": "sha256:589d5c0dbcf8d2f6e21d6da4b002851901430c5e2579da5a83101415071080b6",
  "image.name": "ghcr.io/kamilkisiela/graphql-hive/usage:2ac627353dc0e072d1d1f65bd2e88de94a5bac62,ghcr.io/kamilkisiela/graphql-hive/usage:kamil_usage_report_org"
},
"usage-estimator": {
  "buildx.build.ref": "builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd/builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd0/ou8ktfuliv8mp2zujy5l0xln9",
  "containerimage.descriptor": {
    "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
    "digest": "sha256:5ae91950c3ba2f09276c1a5794b17e112bc6e41e187a0de6daaecb40ae990132",
    "size": 685
  },
  "containerimage.digest": "sha256:5ae91950c3ba2f09276c1a5794b17e112bc6e41e187a0de6daaecb40ae990132",
  "image.name": "ghcr.io/kamilkisiela/graphql-hive/usage-estimator:2ac627353dc0e072d1d1f65bd2e88de94a5bac62,ghcr.io/kamilkisiela/graphql-hive/usage-estimator:kamil_usage_report_org"
},
"usage-ingestor": {
  "buildx.build.ref": "builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd/builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd0/wtx5xweayubgu30fpyuirmx6p",
  "containerimage.descriptor": {
    "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
    "digest": "sha256:a0f55421043947d1adecdeb4d65d97bb5dbdc4a68d919b84139d999c7ea41e48",
    "size": 685
  },
  "containerimage.digest": "sha256:a0f55421043947d1adecdeb4d65d97bb5dbdc4a68d919b84139d999c7ea41e48",
  "image.name": "ghcr.io/kamilkisiela/graphql-hive/usage-ingestor:2ac627353dc0e072d1d1f65bd2e88de94a5bac62,ghcr.io/kamilkisiela/graphql-hive/usage-ingestor:kamil_usage_report_org"
},
"webhooks": {
  "buildx.build.ref": "builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd/builder-1098ca06-0dd9-474e-9bda-ef8d360d08cd0/91ndpnrzag1thpcnwf7wughsk",
  "containerimage.descriptor": {
    "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
    "digest": "sha256:7b4441c06f74e625855e86d51c68ecaadbcd4f039f68ad10e61dcba9240a74b7",
    "size": 685
  },
  "containerimage.digest": "sha256:7b4441c06f74e625855e86d51c68ecaadbcd4f039f68ad10e61dcba9240a74b7",
  "image.name": "ghcr.io/kamilkisiela/graphql-hive/webhooks:2ac627353dc0e072d1d1f65bd2e88de94a5bac62,ghcr.io/kamilkisiela/graphql-hive/webhooks:kamil_usage_report_org"
}
}

@kamilkisiela kamilkisiela merged commit b88c9fa into main Jun 25, 2024
25 checks passed
@kamilkisiela kamilkisiela deleted the kamil-usage-report-org branch June 25, 2024 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant