Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Enhance Open Telemetry specific features #1663

Open
wants to merge 80 commits into
base: feature/open-telemetry
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
18e39fd
Enabled Instrumentations with OpenTelemetry
sughosneo Apr 7, 2021
a71b004
updated CardType and Enumeration classes (#1528)
mfcallahan Apr 8, 2021
516de21
Refactored opentelemetry module to a common project
sughosneo Apr 9, 2021
6012fb0
Fix aggregator address (#1646)
mseada94 Apr 12, 2021
6093ec0
Included Zipkin helm chart
sughosneo Apr 13, 2021
c01ac6e
Updated Ingress API version
sughosneo Apr 13, 2021
ef548da
Included tracing for WebMVC
sughosneo Apr 13, 2021
d0cd283
Update sdk tag (#1647)
richlander Apr 13, 2021
acb304c
Adding deploy workflows and script
colindembovsky Apr 14, 2021
996da77
Update checkout from @v1 to @v2
colindembovsky Apr 15, 2021
8414627
Update chart-root to CHART_ROOT
colindembovsky Apr 15, 2021
ede057c
Update chart to CHART
colindembovsky Apr 15, 2021
7343ceb
Update namespace to NAMESPACE
colindembovsky Apr 15, 2021
c152b03
Remove app-name
colindembovsky Apr 15, 2021
391de9f
Update DeployToK8s to deploy-to-k8s
colindembovsky Apr 15, 2021
9affd62
Adding unit tests
colindembovsky Apr 15, 2021
d261523
Revert
colindembovsky Apr 15, 2021
e858b1a
Full revert
colindembovsky Apr 15, 2021
53ad2d1
Adding unit tests
colindembovsky Apr 15, 2021
c6763a2
Add workflow_dispatch
colindembovsky Apr 15, 2021
99e8631
Change working dir
colindembovsky Apr 15, 2021
47ca568
Adding workflow_dispatch and unit tests
colindembovsky Apr 15, 2021
17dc8ef
Adding unit tests
colindembovsky Apr 15, 2021
f388b4f
Up verbosity
colindembovsky Apr 15, 2021
95fc219
Update arg
colindembovsky Apr 15, 2021
87016c3
Change verbosity to only test
colindembovsky Apr 15, 2021
5ec0228
Fixing dotnet test cmd
colindembovsky Apr 15, 2021
e10f9c1
Fix file name
colindembovsky Apr 15, 2021
e367740
Fix perms
colindembovsky Apr 15, 2021
d8c6578
Fix casing
colindembovsky Apr 15, 2021
6f29ec5
Fixing casing
colindembovsky Apr 15, 2021
81f0576
Updated sockjs package (#1651)
Apr 21, 2021
f66dadf
Merge branch 'dev' of github.com:dotnet-architecture/eShopOnContainer…
colindembovsky Apr 23, 2021
374cf8d
Prevent deploy jobs
colindembovsky Apr 23, 2021
c4d40f1
Prevent deploy jobs
colindembovsky Apr 23, 2021
19baeb7
Migrates from Newtonsoft.Json to System.Text.Json (#1658)
May 3, 2021
911a5c5
Enabled zipkin configuration
sughosneo May 5, 2021
fb657f0
Bump merge from 1.2.1 to 2.1.1 in /src/Web/WebSPA (#1662)
dependabot[bot] May 5, 2021
6007bdc
Updated xmlhttprequest-ssl package to 1.6.2 (#1664)
May 5, 2021
6b0890f
Bump handlebars from 4.7.6 to 4.7.7 in /src/Web/WebSPA (#1665)
dependabot[bot] May 7, 2021
6556c4f
Bump url-parse from 1.4.7 to 1.5.1 in /src/Web/WebSPA (#1666)
dependabot[bot] May 7, 2021
3521fb8
Bump lodash from 4.17.20 to 4.17.21 in /src/Web/WebSPA (#1667)
dependabot[bot] May 7, 2021
2b8b6b5
Updated package versions (#1669)
May 7, 2021
bf7ade8
Update CardType.cs (#1674)
IEvangelist May 17, 2021
1cbd218
Updates the postcss package version (#1672)
May 17, 2021
37aeace
Updated dns-packet package to version 5.2.2 (#1682)
May 26, 2021
ad7ff76
Bump browserslist from 4.16.0 to 4.16.6 in /src/Web/WebSPA (#1679)
dependabot[bot] May 26, 2021
8ed2587
Added EventBus.Tests to solution (#1684)
sanderobdeijn May 31, 2021
be9ce6d
Update keyvault sdk from t1 to t2 (#1685)
zedy-wj Jun 8, 2021
e8fd578
Bump ws from 6.2.1 to 6.2.2 in /src/Web/WebSPA (#1694)
dependabot[bot] Jun 8, 2021
d49334b
Updated packages (#1695)
Jun 8, 2021
08d3a2b
Updated package (#1696)
Jun 9, 2021
dbf782d
Initial eShop-Learn version
mvelosop Jun 15, 2021
bbe423c
Initial version running
mvelosop Jun 15, 2021
c60a493
Fix catalog search error
mvelosop Jun 15, 2021
ae45ffb
Remove campaigns, marketing and coupon-related components
mvelosop Jun 15, 2021
7d26ef8
Initial SPA application working
mvelosop Jun 15, 2021
07e0bfe
running version without refresh page error
mvelosop Jun 17, 2021
2a0db63
Update to .NET 5
mvelosop Jun 17, 2021
4bf3079
Update target js version
mvelosop Jun 17, 2021
4bf0db6
Update to Angular 9
mvelosop Jun 17, 2021
c8a8884
Update packages required by Angular 10
mvelosop Jun 17, 2021
c7f482d
install packages for Angular 9
mvelosop Jun 17, 2021
066b055
Angular 10 version running
mvelosop Jun 17, 2021
67c248b
Update versions in package.json
mvelosop Jun 17, 2021
9194b2c
Update other packages to latest versions
mvelosop Jun 17, 2021
4b0c2c5
Handle SPA/MVC branding for login and registration views
mvelosop Jun 18, 2021
7405eba
Update README, catalog image files and MVC page size
mvelosop Jun 21, 2021
5afcd37
Update item images
mvelosop Jun 22, 2021
e9aa525
Merge pull request #1705 from dotnet-architecture/feature/refresh-spa…
mvelosop Jun 22, 2021
e858ac0
Update Angular version to 11.2
mvelosop Jun 25, 2021
8c27163
Merge pull request #1711 from dotnet-architecture/update/angular-version
mvelosop Jun 25, 2021
6982f0e
Correct typo error in Shipping Address (#1712)
kaypee90 Jun 28, 2021
6381df5
Updates npm packages (#1710)
Jun 28, 2021
2afc003
Included Envoyproxy filrewall rules in the script (#1704)
Jun 28, 2021
6946735
Included feedback
sughosneo Jun 29, 2021
8bb15ce
Updated npm packages (#1714)
Jun 30, 2021
5c57b8c
Binding queue using existing cosumerChannel (#1716)
alan0428a Jul 7, 2021
8099d27
Merge branch 'dev' into feature/enable-telemetry
sughosneo Jul 7, 2021
0601707
Updated project files
sughosneo Jul 7, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
50 changes: 50 additions & 0 deletions .github/workflows/basket-api-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Deploy basket-api

on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["basket-api"]
branches: [dev]
types: [completed]

env:
CHART: basket-api
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm

jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- uses: azure/login@v1
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}

- uses: azure/aks-set-context@v1
name: Set AKS context
with:
creds: '${{ secrets.AZURE_CREDENTIALS }}'
cluster-name: ${{ secrets.CLUSTER_NAME }}
resource-group: ${{ secrets.RESOURCE_GROUP }}

- name: Set branch name as env variable
run: |
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash

- name: Deploy Chart
run: |
./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected
env:
TAG: ${{ env.BRANCH }}
working-directory: ${{ env.CHART_ROOT }}
36 changes: 35 additions & 1 deletion .github/workflows/basket-api.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: basket-api

on:
workflow_dispatch:
push:
branches:
- dev
Expand All @@ -21,6 +22,7 @@ on:
env:
SERVICE: basket-api
IMAGE: basket.api
DOTNET_VERSION: 5.0.x

jobs:

Expand All @@ -30,7 +32,23 @@ jobs:
steps:
- name: 'Checkout Github Action'
uses: actions/checkout@master


- name: Setup dotnet
uses: actions/setup-dotnet@v1
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

- name: Build and run unit tests
run: |
cd src
dotnet restore "eShopOnContainers-ServicesAndWebApps.sln"
cd Services/Basket/Basket.API
dotnet build --no-restore
cd -
cd Services/Basket/Basket.UnitTests
dotnet build --no-restore
dotnet test --no-build -v=normal

- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
working-directory: ./src
Expand All @@ -46,6 +64,22 @@ jobs:
- name: 'Checkout Github Action'
uses: actions/checkout@master

- name: Setup dotnet
uses: actions/setup-dotnet@v1
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

- name: Build and run unit tests
run: |
cd src
dotnet restore "eShopOnContainers-ServicesAndWebApps.sln"
cd Services/Basket/Basket.API
dotnet build --no-restore
cd -
cd Services/Basket/Basket.UnitTests
dotnet build --no-restore
dotnet test --no-build -v=normal

- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
Expand Down
50 changes: 50 additions & 0 deletions .github/workflows/catalog-api-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Deploy catalog-api

on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["catalog-api"]
branches: [dev]
types: [completed]

env:
CHART: catalog-api
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm

jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- uses: azure/login@v1
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}

- uses: azure/aks-set-context@v1
name: Set AKS context
with:
creds: '${{ secrets.AZURE_CREDENTIALS }}'
cluster-name: ${{ secrets.CLUSTER_NAME }}
resource-group: ${{ secrets.RESOURCE_GROUP }}

- name: Set branch name as env variable
run: |
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash

- name: Deploy chart
run: |
./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected
env:
TAG: ${{ env.BRANCH }}
working-directory: ${{ env.CHART_ROOT }}
34 changes: 34 additions & 0 deletions .github/workflows/catalog-api.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: catalog-api

on:
workflow_dispatch:
push:
branches:
- dev
Expand All @@ -21,6 +22,7 @@ on:
env:
SERVICE: catalog-api
IMAGE: catalog.api
DOTNET_VERSION: 5.0.x

jobs:

Expand All @@ -30,6 +32,22 @@ jobs:
steps:
- name: 'Checkout Github Action'
uses: actions/checkout@master

- name: Setup dotnet
uses: actions/setup-dotnet@v1
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

- name: Build and run unit tests
run: |
cd src
dotnet restore "eShopOnContainers-ServicesAndWebApps.sln"
cd Services/Catalog/Catalog.API
dotnet build --no-restore
cd -
cd Services/Catalog/Catalog.UnitTests
dotnet build --no-restore
dotnet test --no-build -v=normal

- name: Compose build ${{ env.SERVICE }}
run: sudo -E docker-compose build ${{ env.SERVICE }}
Expand All @@ -46,6 +64,22 @@ jobs:
- name: 'Checkout Github Action'
uses: actions/checkout@master

- name: Setup dotnet
uses: actions/setup-dotnet@v1
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

- name: Build and run unit tests
run: |
cd src
dotnet restore "eShopOnContainers-ServicesAndWebApps.sln"
cd Services/Catalog/Catalog.API
dotnet build --no-restore
cd -
cd Services/Catalog/Catalog.UnitTests
dotnet build --no-restore
dotnet test --no-build -v=normal

- name: Enable experimental features for the Docker daemon and CLI
run: |
echo $'{\n "experimental": true\n}' | sudo tee /etc/docker/daemon.json
Expand Down
50 changes: 50 additions & 0 deletions .github/workflows/identity-api-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Deploy identity-api

on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["identity-api"]
branches: [dev]
types: [completed]

env:
CHART: identity-api
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm

jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- uses: azure/login@v1
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}

- uses: azure/aks-set-context@v1
name: Set AKS context
with:
creds: '${{ secrets.AZURE_CREDENTIALS }}'
cluster-name: ${{ secrets.CLUSTER_NAME }}
resource-group: ${{ secrets.RESOURCE_GROUP }}

- name: Set branch name as env variable
run: |
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash

- name: Deploy Chart
run: |
./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected
env:
TAG: ${{ env.BRANCH }}
working-directory: ${{ env.CHART_ROOT }}
50 changes: 50 additions & 0 deletions .github/workflows/mobileshoppingagg-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Deploy mobileshoppingagg

on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["mobileshoppingagg"]
branches: [dev]
types: [completed]

env:
CHART: mobileshoppingagg
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm

jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- uses: azure/login@v1
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}

- uses: azure/aks-set-context@v1
name: Set AKS context
with:
creds: '${{ secrets.AZURE_CREDENTIALS }}'
cluster-name: ${{ secrets.CLUSTER_NAME }}
resource-group: ${{ secrets.RESOURCE_GROUP }}

- name: Set branch name as env variable
run: |
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash

- name: Deploy Chart
run: |
./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected
env:
TAG: ${{ env.BRANCH }}
working-directory: ${{ env.CHART_ROOT }}
50 changes: 50 additions & 0 deletions .github/workflows/ordering-api-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Deploy ordering-api

on:
workflow_dispatch:
repository_dispatch:
types:
- deploy
workflow_run:
workflows: ["ordering-api"]
branches: [dev]
types: [completed]

env:
CHART: ordering-api
NAMESPACE: eshop
CHART_ROOT: deploy/k8s/helm

jobs:
deploy-to-k8s:
#if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: false
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- uses: azure/login@v1
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}

- uses: azure/aks-set-context@v1
name: Set AKS context
with:
creds: '${{ secrets.AZURE_CREDENTIALS }}'
cluster-name: ${{ secrets.CLUSTER_NAME }}
resource-group: ${{ secrets.RESOURCE_GROUP }}

- name: Set branch name as env variable
run: |
currentbranch=$(echo ${GITHUB_REF##*/})
echo "running on $currentbranch"
echo "BRANCH=$currentbranch" >> $GITHUB_ENV
shell: bash

- name: Deploy Chart
run: |
./deploy-chart.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.NAMESPACE }} --acr-connected
env:
TAG: ${{ env.BRANCH }}
working-directory: ${{ env.CHART_ROOT }}
Loading