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

Initial Dev to Main codebase merge #27

Merged
merged 135 commits into from
Jul 12, 2023
Merged
Show file tree
Hide file tree
Changes from 112 commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
e7f3e63
prettier and eslint configured
mbildstein May 24, 2023
be3b575
Set up tsconfig and folder structure for both
YouruiR May 24, 2023
1879fd0
added gitignores
YouruiR May 24, 2023
aa6ee69
Merge pull request #1 from oslabs-beta/michaelb/linter-setup
YouruiR May 24, 2023
2f7eec2
Merge branch 'dev' into folder-setup
YouruiR May 24, 2023
1bef3ed
Merge pull request #2 from oslabs-beta/folder-setup
davidan1989 May 24, 2023
b987212
Initial setup of Github Actions
wnguye03 May 24, 2023
628fd80
Update testsAndReviews.yml
wnguye03 May 24, 2023
d76c8c7
Update testsAndReviews.yml
wnguye03 May 24, 2023
08e6bdf
Update testsAndReviews.yml
wnguye03 May 24, 2023
eb004a0
Update testsAndReviews.yml
wnguye03 May 24, 2023
f95973f
additional modification to the testsAndReviews.yml
wnguye03 May 24, 2023
d4a0772
Delete pull_request_template.md
wnguye03 May 25, 2023
7e99804
Final changes testsAndReviews.yml
wnguye03 May 25, 2023
f0d4608
Merge pull request #3 from oslabs-beta/wnguye03-set-up-for-Github-act…
wnguye03 May 25, 2023
6aa9191
manifest file configured with minimum required settings
mbildstein May 26, 2023
40ec6ad
Merge pull request #5 from oslabs-beta/michaelb/manifest-setup
wnguye03 May 26, 2023
9a5a50d
Added type declarations folder to npm package directory.
YouruiR Jun 1, 2023
c575852
Create pull_request_template.md
YouruiR Jun 1, 2023
1bc8267
Update pull_request_template.md
YouruiR Jun 1, 2023
031556b
setting up panel. next step: config bundler
mbildstein Jun 2, 2023
5cb8e5b
setting up panel. next step: config bundler \n \n Co-authored-by: @li…
mbildstein Jun 2, 2023
32a2202
Merge pull request #6 from oslabs-beta/express-setup
mbildstein Jun 2, 2023
ce55437
Update CI for testing
wnguye03 Jun 2, 2023
db5c555
Create CODEOWNERS
wnguye03 Jun 2, 2023
3bca332
Delete unneeded GitHub action workflow
wnguye03 Jun 2, 2023
a90484f
Merge pull request #9 from oslabs-beta/wnguye03-patch-1
YouruiR Jun 3, 2023
be47477
Partial implmentation of server and data processing middleware
wnguye03 Jun 5, 2023
520ff58
reorganized file structure for chrome ext. developing automatic manif…
mbildstein Jun 5, 2023
00c981b
next.js data processing
wnguye03 Jun 6, 2023
a4e0fd8
backup commit before merge of feature branch
mbildstein Jun 6, 2023
c1173ec
Set up tsconfig and folder structure for both
YouruiR May 24, 2023
01def7e
added gitignores
YouruiR May 24, 2023
c077517
prettier and eslint configured
mbildstein May 24, 2023
a8bc721
manifest file configured with minimum required settings
mbildstein May 26, 2023
1c73080
setting up panel. next step: config bundler \n \n Co-authored-by: @li…
mbildstein Jun 2, 2023
0819808
reorganized file structure for chrome ext. developing automatic manif…
mbildstein Jun 5, 2023
27e657b
resolved merge conflicts in feature branch
mbildstein Jun 6, 2023
7321587
Merge branch 'mb-ll/chrome-ext-setup' of https://github.com/oslabs-be…
mbildstein Jun 6, 2023
6d81a51
Finished node data processing, and reduce decoupling and provide ts t…
wnguye03 Jun 7, 2023
eef50c6
removed console.logs and promotheus and jaeger exporter for later str…
wnguye03 Jun 7, 2023
c6b99df
Merge pull request #10 from oslabs-beta/william-OtelController
davidan1989 Jun 7, 2023
959363f
Added event emitter for receiving requests to
YouruiR Jun 7, 2023
52c44b0
Merge branch 'dev' into eventsource
YouruiR Jun 7, 2023
24fad68
react app renders in network panel
li-lucia Jun 7, 2023
4b045b3
Co-authored-by: Michael Bildstein <[email protected]>
li-lucia Jun 7, 2023
94b2887
Merge remote-tracking branch 'origin' into mb-ll/chrome-ext-setup
li-lucia Jun 7, 2023
50ca07e
Merge pull request #12 from oslabs-beta/mb-ll/chrome-ext-setup
li-lucia Jun 7, 2023
fb36f1e
rendered table component to ext panel; converted app components into …
li-lucia Jun 7, 2023
fe7682e
added nodemon to dependencies.
YouruiR Jun 8, 2023
385d3d4
Merge branch 'dev' into eventsource
YouruiR Jun 8, 2023
3d65429
implemented event emitter and event source stream.
YouruiR Jun 8, 2023
cc3e471
Merge pull request #13 from oslabs-beta/eventsource
mbildstein Jun 8, 2023
0f5dd13
changed shape of mock data and changed table to fit mock data
li-lucia Jun 8, 2023
cbc67f0
merged from dev
li-lucia Jun 8, 2023
ce7c111
Merge pull request #14 from oslabs-beta/mb-ll/chrome-ext-setup
YouruiR Jun 8, 2023
c9e0980
Co-authored-by: Michael Bildstein <[email protected]>
li-lucia Jun 8, 2023
f9864f4
conditionally rendered spans that share traceIds and added dropdown a…
li-lucia Jun 9, 2023
0b88699
updated to correct repo
li-lucia Jun 9, 2023
5a982d3
Merge pull request #15 from oslabs-beta/mb-ll/chrome-ext-setup
mbildstein Jun 9, 2023
79f3e68
connect express to frontend with OtelData.
YouruiR Jun 9, 2023
52164bf
Merge branch 'dev' into connect-otel-express
YouruiR Jun 9, 2023
9a0a99d
Replaced mock data with OtelData
YouruiR Jun 9, 2023
177ecdf
Added waterfall graph. Current issues: refactor styling to use tailwi…
li-lucia Jun 10, 2023
9ec173d
Merge branch 'dev' into mb-ll/chrome-ext-setup
li-lucia Jun 10, 2023
683c7e6
rendering names of every span; removed grid lines on x-axis
li-lucia Jun 10, 2023
d370c1c
rendering names of every span
li-lucia Jun 10, 2023
cdcd4ec
fixed table heading
li-lucia Jun 10, 2023
2b33b19
Merge pull request #16 from oslabs-beta/mb-ll/chrome-ext-setup
wnguye03 Jun 10, 2023
2a0d306
updated front end typings to use new optional and
YouruiR Jun 10, 2023
b73a81d
Merge branch 'dev' into connect-otel-express
YouruiR Jun 10, 2023
08348bc
Error sending data to frontend
YouruiR Jun 10, 2023
b6d201d
implemented pako to compress Otel data
YouruiR Jun 11, 2023
e75c86d
Fixed SSE events on front/backend.
YouruiR Jun 11, 2023
5b745f9
added test command to npm-package
YouruiR Jun 21, 2023
9f8153c
added mock tests with supertests
YouruiR Jun 21, 2023
1a03c4b
Correct yaml error with working directory
YouruiR Jun 21, 2023
6f64e8a
added npm start command for CI testing.
YouruiR Jun 21, 2023
7f5d732
Added script to build ts files for
YouruiR Jun 21, 2023
4c469ac
took out unnecessary js files
YouruiR Jun 21, 2023
859e85e
changed npm ci to npm install in test suite
YouruiR Jun 21, 2023
7758bd8
changed npm install in the yaml file to install from correct
YouruiR Jun 21, 2023
0328bbc
changed workflow to continue tests
YouruiR Jun 21, 2023
1a9c938
refactored logic to update networkRequests state correctly
li-lucia Jun 27, 2023
62cd4da
deleted unused variables
li-lucia Jun 27, 2023
25353a8
Merge pull request #17 from oslabs-beta/connect-otel-express
mbildstein Jun 27, 2023
12b6ac9
Merge branch 'dev' into express-unit
YouruiR Jun 27, 2023
dbbc2f6
Merge branch 'dev' into li-lucia/frontend-parse-data
li-lucia Jun 27, 2023
1425b62
Merge pull request #19 from oslabs-beta/express-unit
wnguye03 Jun 27, 2023
cce023a
Merge branch 'dev' into li-lucia/frontend-parse-data
li-lucia Jun 27, 2023
93f179e
Merge pull request #20 from oslabs-beta/li-lucia/frontend-parse-data
wnguye03 Jun 28, 2023
36c7642
refactored functio checkTraceId. Still need to work on: (1. currently…
li-lucia Jun 28, 2023
58cc5f0
feature-clientSideNetworkEvents
wnguye03 Jun 29, 2023
a911e81
techDebt-errorHandlingForExpressRoute
wnguye03 Jun 29, 2023
89aa570
changed package json to include 2 separate entrypoints.
YouruiR Jun 29, 2023
3a7ecc5
refactored to store incoming data in a map object to keep insertion o…
li-lucia Jun 29, 2023
ccf6673
Merge pull request #22 from oslabs-beta/techDebt-errorHandlingForExpr…
li-lucia Jun 30, 2023
be34045
resynced PRs
wnguye03 Jun 30, 2023
0c41843
Merge pull request #21 from oslabs-beta/feature-clientSideNetworkEvents
wnguye03 Jun 30, 2023
fe50f6d
merged from dev
li-lucia Jun 30, 2023
9c9d50e
express app export now runs only once upon executing
YouruiR Jun 30, 2023
f1d5358
Merge branch 'dev' into packaging
YouruiR Jun 30, 2023
0c8307c
took out ununsed modules
YouruiR Jun 30, 2023
30bfee8
Merge pull request #23 from oslabs-beta/packaging
davidan1989 Jul 1, 2023
61b9f9b
moved incoming CS object type into types.ts
li-lucia Jul 1, 2023
92b3b45
Merge branch 'dev' into agregate-data-CS-SS
li-lucia Jul 1, 2023
8893923
storing both chromeApi given request data and otel given data into on…
li-lucia Jul 1, 2023
2368bba
refactored convertToEpoch function to return milliseconds to match Ot…
li-lucia Jul 1, 2023
2097d0c
created relevant data function. Issues: there seems to still be dupli…
li-lucia Jul 2, 2023
a9e9a5c
rendering table. Issues: repeat data
li-lucia Jul 2, 2023
731efdb
finished readme for npm package
YouruiR Jul 2, 2023
095dccc
added npm package link
YouruiR Jul 5, 2023
ba3ad61
Changed chrome extension description
YouruiR Jul 5, 2023
c47aafa
corrected typo in readme
YouruiR Jul 5, 2023
2cf734e
published ver 1.01 with typo corrected
YouruiR Jul 5, 2023
7d1f446
able to render but time logic is flawed
li-lucia Jul 5, 2023
7292570
aggregated duplicate spans living in the same traceId. Issue: not su…
li-lucia Jul 5, 2023
0c55c9d
issue: want to refactor to only store one state
li-lucia Jul 5, 2023
937b5d5
isRelevant function works correctly to parse through incoming data an…
li-lucia Jul 6, 2023
392e71c
refactored chart to display in order with correct relative durations
li-lucia Jul 6, 2023
b7b15ef
added ms to table
li-lucia Jul 6, 2023
0208e2a
created clearState button; resized components; conditionally render R…
li-lucia Jul 7, 2023
812ef99
updated manifest file version
li-lucia Jul 10, 2023
bf2a49f
Merge pull request #24 from oslabs-beta/npm-publish
YouruiR Jul 11, 2023
54b1086
deleted console logs and changed reload panel text
li-lucia Jul 11, 2023
40303d9
docs: ✏️ Added link to chrome extension
YouruiR Jul 11, 2023
711b0b5
Merge branch 'dev' into automate-npm-publish
YouruiR Jul 11, 2023
752e421
merged dev
li-lucia Jul 11, 2023
9a7e280
added checkout step to npm CD workflow file
YouruiR Jul 12, 2023
107973b
removed a console log
YouruiR Jul 12, 2023
1487cce
Merge pull request #25 from oslabs-beta/automate-npm-publish
YouruiR Jul 12, 2023
8001701
cleaned up development console logs and files not contributing to pro…
li-lucia Jul 12, 2023
a8a39ce
updated file imports and deleted unused code in panel and devtools
li-lucia Jul 12, 2023
db892f7
Merge branch 'dev' into clearState-button
li-lucia Jul 12, 2023
de9bbd6
Merge pull request #26 from oslabs-beta/clearState-button
li-lucia Jul 12, 2023
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
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Default reviewers/codeowners for all code changes
* @mbildstein @wnguye03 @li-lucia @davidan1989 @YouruiR
20 changes: 10 additions & 10 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
## Overview

Issue Type
**Issue Type**

- [x] Bug
- [ ] Feature
- [ ] Tech Debt

Description
**Description**
A clear and concise description of the issue.

Ticket Item
**Ticket Item**

Figma link - optional
Spec link - optional
**Figma link - optional**
**Spec link - optional**

Steps to Reproduce Bug / Validate Feature / Confirm Tech Debt Fix
**Steps to Reproduce Bug / Validate Feature / Confirm Tech Debt Fix**

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

Previous behavior
**Previous behavior**
A clear and concise description of what was originally happening.

Expected behavior
**Expected behavior**
A clear and concise description of what you expected to happen.

Screenshots & Videos
**Screenshots & Videos**
If applicable, add screenshots and videos to help explain your issue type.

Additional context
**Additional context**
Add any other context about the problem here.
46 changes: 46 additions & 0 deletions .github/workflows/npmCD.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: npm package CD

on:
pull_request:
types:
- closed
branches:
- 'main'
jobs:
npm_publish:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Check if PR is merged
id: check_merge
run: |
if [[ "$(git log -1 --pretty=%B "${{ github.event.pull_request.merge_commit_sha }}")" == *"Merge pull request"* ]]; then
echo "::set-output name=is_merged::true"
else
echo "::set-output name=is_merged::false"
fi

- name: Setup node env
uses: actions/setup-node@v3
with:
node-version: 18
- name: Install dependencies
run: npm ci
working-directory: ./npm-package
- name: Build files into dist
run: npm run build
working-directory: ./npm-package
- name: Check for changes in npm-package
id: changes
run: |
if git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.merge_commit_sha }} -- npm-package/ | grep -q .; then
echo "::set-output name=changes::true"
else
echo "::set-output name=changes::false"
fi
- name: Deploy
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: npm run semantic-release
if: steps.check_merge.outputs.is_merged == 'true' && steps.changes.outputs.changes == 'true'
30 changes: 30 additions & 0 deletions .github/workflows/testsAndReviews.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Node.js Continuous Integration

on:
pull_request:
branches: [ "dev", "main" ]

workflow_dispatch:

jobs:
test_pull_request:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Setup node env
uses: actions/setup-node@v3
with:
node-version: 18
- name: Install dependencies
run: npm ci
working-directory: ./npm-package
- name: Build TS files
run: npm run build
working-directory: ./npm-package
- name: Start express server
run: npm start &
working-directory: ./npm-package
- name: Run backend tests
run: npm test
working-directory: ./npm-package
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules/

.DS_Store
.env
7 changes: 7 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": false,
"singleQuote": true,
"extends": ["prettier"]
}
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.formatOnPaste": false
}
1 change: 1 addition & 0 deletions chrome-extension/dist/assets/devtools-6e5143ad.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions chrome-extension/dist/assets/index-2b3c72e0.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading