Skip to content

Commit 0661476

Browse files
damemidamemi
authored
Merge pull request #1 from damemi/rebase-test
Rebase test
2 parents 43b2144 + 03086bf commit 0661476

File tree

236 files changed

+11764
-27999
lines changed

Some content is hidden

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

236 files changed

+11764
-27999
lines changed

‎.env

+22-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11

22

3-
# Images
4-
IMAGE_VERSION=1.6.0
3+
# Demo App version
4+
IMAGE_VERSION=1.9.0
55
IMAGE_NAME=ghcr.io/open-telemetry/demo
6-
TRACETEST_IMAGE_VERSION=v0.14.5
6+
DEMO_VERSION=latest
7+
8+
# Dependent images
9+
COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.100.0
10+
GRAFANA_IMAGE=grafana/grafana:10.4.2
11+
JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.55
12+
# must also update version field in ./src/grafana/provisioning/datasources/opensearch.yml
13+
OPENSEARCH_IMAGE=opensearchproject/opensearch:2.13.0
14+
POSTGRES_IMAGE=postgres:16.2
15+
PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.51.2
16+
REDIS_IMAGE=redis:7.2-alpine
17+
TRACETEST_IMAGE=kubeshop/tracetest:v1.0.0
718

819
# Demo Platform
920
ENV_PLATFORM=local
@@ -44,13 +55,6 @@ CURRENCY_SERVICE_ADDR=currencyservice:${CURRENCY_SERVICE_PORT}
4455
EMAIL_SERVICE_PORT=6060
4556
EMAIL_SERVICE_ADDR=http://emailservice:${EMAIL_SERVICE_PORT}
4657

47-
# Feature Flag Service
48-
FEATURE_FLAG_SERVICE_PORT=8081
49-
FEATURE_FLAG_SERVICE_ADDR=featureflagservice:${FEATURE_FLAG_SERVICE_PORT}
50-
FEATURE_FLAG_SERVICE_HOST=feature-flag-service
51-
FEATURE_FLAG_GRPC_SERVICE_PORT=50053
52-
FEATURE_FLAG_GRPC_SERVICE_ADDR=featureflagservice:${FEATURE_FLAG_GRPC_SERVICE_PORT}
53-
5458
# Frontend
5559
FRONTEND_PORT=8080
5660
FRONTEND_ADDR=frontend:${FRONTEND_PORT}
@@ -60,6 +64,10 @@ FRONTEND_HOST=frontend
6064
ENVOY_PORT=8080
6165
FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}
6266

67+
# Image Provider
68+
IMAGE_PROVIDER_HOST=imageprovider
69+
IMAGE_PROVIDER_PORT=8081
70+
6371
# Load Generator
6472
LOCUST_WEB_PORT=8089
6573
LOCUST_USERS=10
@@ -91,6 +99,10 @@ SHIPPING_SERVICE_ADDR=shippingservice:${SHIPPING_SERVICE_PORT}
9199
# ******************
92100
# Dependent Services
93101
# ******************
102+
# flagd
103+
FLAGD_HOST=flagd
104+
FLAGD_PORT=8013
105+
94106
# Kafka
95107
KAFKA_SERVICE_PORT=9092
96108
KAFKA_SERVICE_ADDR=kafka:${KAFKA_SERVICE_PORT}

‎.github/workflows/assign-reviewers.yml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212

1313
jobs:
1414
assign-reviewers:
15+
if: github.repository == 'open-telemetry/opentelemetry-demo'
1516
runs-on: ubuntu-latest
1617
steps:
1718
- uses: dyladan/component-owners@main

‎.github/workflows/build-images.yml

+46-27
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ on:
2121

2222
jobs:
2323
build_and_push_images:
24+
if: github.repository == 'open-telemetry/opentelemetry-demo'
2425
runs-on: ubuntu-latest
2526
permissions:
2627
contents: read
@@ -35,70 +36,85 @@ jobs:
3536
fail-fast: false
3637
matrix:
3738
file_tag:
39+
- file: ./src/accountingservice/Dockerfile
40+
tag_suffix: accountingservice
41+
context: ./
42+
setup-qemu: true
3843
- file: ./src/adservice/Dockerfile
3944
tag_suffix: adservice
4045
context: ./
46+
setup-qemu: true
4147
- file: ./src/cartservice/src/Dockerfile
4248
tag_suffix: cartservice
4349
context: ./
50+
setup-qemu: false
4451
- file: ./src/checkoutservice/Dockerfile
4552
tag_suffix: checkoutservice
4653
context: ./
54+
setup-qemu: true
4755
- file: ./src/currencyservice/Dockerfile
4856
tag_suffix: currencyservice
49-
context: ./src/currencyservice
57+
context: ./
58+
setup-qemu: true
5059
- file: ./src/emailservice/Dockerfile
5160
tag_suffix: emailservice
5261
context: ./src/emailservice
53-
# NOTE:
54-
# https://github.com/open-telemetry/opentelemetry-demo/issues/956
55-
# Until dedicated ARM runners are available for GHA we cannot upgrade
56-
# OTP/Elixir versions. Please do not change the OTP/Elixir versions.
57-
- file: ./src/featureflagservice/Dockerfile
58-
tag_suffix: featureflagservice
62+
setup-qemu: true
63+
- file: ./src/frauddetectionservice/Dockerfile
64+
tag_suffix: frauddetectionservice
5965
context: ./
66+
setup-qemu: true
6067
- file: ./src/frontend/Dockerfile
6168
tag_suffix: frontend
6269
context: ./
70+
setup-qemu: true
6371
- file: ./src/frontendproxy/Dockerfile
6472
tag_suffix: frontendproxy
6573
context: ./
74+
setup-qemu: true
75+
- file: ./src/frontend/Dockerfile.cypress
76+
tag_suffix: frontend-tests
77+
context: ./
78+
setup-qemu: true
79+
- file: ./src/imageprovider/Dockerfile
80+
tag_suffix: imageprovider
81+
context: ./
82+
setup-qemu: true
83+
- file: ./src/kafka/Dockerfile
84+
tag_suffix: kafka
85+
context: ./
86+
setup-qemu: true
6687
- file: ./src/loadgenerator/Dockerfile
6788
tag_suffix: loadgenerator
6889
context: ./
90+
setup-qemu: true
6991
- file: ./src/paymentservice/Dockerfile
7092
tag_suffix: paymentservice
7193
context: ./
94+
setup-qemu: true
7295
- file: ./src/productcatalogservice/Dockerfile
7396
tag_suffix: productcatalogservice
7497
context: ./
98+
setup-qemu: true
7599
- file: ./src/quoteservice/Dockerfile
76100
tag_suffix: quoteservice
77101
context: ./
78-
- file: ./src/shippingservice/Dockerfile
79-
tag_suffix: shippingservice
80-
context: ./
102+
setup-qemu: true
81103
- file: ./src/recommendationservice/Dockerfile
82104
tag_suffix: recommendationservice
83105
context: ./
84-
- file: ./src/kafka/Dockerfile
85-
tag_suffix: kafka
86-
context: ./
87-
- file: ./src/accountingservice/Dockerfile
88-
tag_suffix: accountingservice
89-
context: ./
90-
- file: ./src/frauddetectionservice/Dockerfile
91-
tag_suffix: frauddetectionservice
92-
context: ./
93-
- file: ./src/frontend/Dockerfile.cypress
94-
tag_suffix: frontend-tests
106+
setup-qemu: true
107+
- file: ./src/shippingservice/Dockerfile
108+
tag_suffix: shippingservice
95109
context: ./
96-
- file: ./test/Dockerfile
97-
tag_suffix: integrationTests
110+
setup-qemu: true
111+
- file: ./test/tracetesting/Dockerfile
112+
tag_suffix: traceBasedTests
98113
context: ./
114+
setup-qemu: true
99115

100116
steps:
101-
- uses: actions/checkout@v3
117+
- uses: actions/checkout@v4
102118
with:
103119
fetch-depth: 0
104120
- name: Check for changes and set push options
@@ -131,25 +147,28 @@ jobs:
131147
password: ${{ secrets.DOCKER_PASSWORD }}
132148
if: ${{ inputs.push }}
133149
- name: Set up QEMU
134-
uses: docker/setup-qemu-action@v2
150+
if: ${{ matrix.file_tag.setup-qemu }}
151+
uses: docker/setup-qemu-action@v3
135152
with:
136153
image: tonistiigi/binfmt:master
137154
- name: Set up Docker Buildx
138-
uses: docker/setup-buildx-action@v2
155+
uses: docker/setup-buildx-action@v3
139156
with:
140157
config-inline: |
141158
[worker.oci]
142159
max-parallelism = 2
143160
- name: Matrix Build and push demo images
144161
if: steps.check_changes.outputs.skip == 'false'
145-
uses: docker/build-push-action@v3.3.1
162+
uses: docker/build-push-action@v5.0.0
146163
with:
147164
context: ${{ matrix.file_tag.context }}
148165
file: ${{ matrix.file_tag.file }}
149166
platforms: linux/amd64,linux/arm64
150167
push: ${{ inputs.push }}
151168
tags: |
152169
${{ env.DOCKERHUB_REPO }}:${{ inputs.version }}-${{matrix.file_tag.tag_suffix }}
170+
${{ env.DOCKERHUB_REPO }}:latest-${{matrix.file_tag.tag_suffix }}
153171
${{ env.GHCR_REPO }}:${{ inputs.version }}-${{ matrix.file_tag.tag_suffix }}
172+
${{ env.GHCR_REPO }}:latest-${{ matrix.file_tag.tag_suffix }}
154173
cache-from: type=gha
155174
cache-to: type=gha

‎.github/workflows/checks.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: check out code
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424

2525
- name: install dependencies
2626
run: npm install
@@ -32,9 +32,9 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: check out code
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636

37-
- uses: actions/setup-python@v4
37+
- uses: actions/setup-python@v5
3838
with:
3939
python-version: '3.x'
4040

@@ -48,7 +48,7 @@ jobs:
4848
runs-on: ubuntu-latest
4949
steps:
5050
- name: check out code
51-
uses: actions/checkout@v3
51+
uses: actions/checkout@v4
5252

5353
- name: run misspell
5454
run: make misspell
@@ -57,7 +57,7 @@ jobs:
5757
name: markdownlinkcheck
5858
runs-on: ubuntu-latest
5959
steps:
60-
- uses: actions/checkout@v3
60+
- uses: actions/checkout@v4
6161
- name: Run link check
6262
uses: gaurav-nelson/github-action-markdown-link-check@v1
6363
with:
@@ -69,7 +69,7 @@ jobs:
6969
runs-on: ubuntu-latest
7070

7171
steps:
72-
- uses: actions/checkout@v3
72+
- uses: actions/checkout@v4
7373

7474
- name: run sanitycheck.py
7575
run: python3 ./internal/tools/sanitycheck.py
@@ -78,7 +78,7 @@ jobs:
7878
runs-on: ubuntu-latest
7979
steps:
8080
- name: check out code
81-
uses: actions/checkout@v3
81+
uses: actions/checkout@v4
8282
- name: install tools
8383
run: make install-tools
8484
- name: run checklicense

‎.github/workflows/gradle-wrapper-validation.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
validation:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717

18-
- uses: gradle/wrapper-validation-action@v1.1.0
18+
- uses: gradle/wrapper-validation-action@v3.3.2

‎.github/workflows/label-pr.yml

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# Copyright The OpenTelemetry Authors
2+
# SPDX-License-Identifier: Apache-2.0
3+
# adds a label to a pull request if certain files are changed
4+
name: Label Pull Requests
5+
6+
on:
7+
pull_request_target:
8+
types: [opened, synchronize, reopened]
9+
10+
jobs:
11+
label:
12+
runs-on: ubuntu-latest
13+
permissions:
14+
pull-requests: write
15+
contents: read
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v2
19+
20+
- name: Check for changed files
21+
id: file_changes
22+
uses: dorny/paths-filter@v2
23+
with:
24+
list-files: shell
25+
filters: |
26+
docsUpdateRequired:
27+
- 'src/flagd/**'
28+
helmUpdateRequired:
29+
- '.env'
30+
- 'docker-compose*.yml'
31+
- 'src/flagd/**'
32+
- 'src/grafana/**'
33+
- 'src/otelcollector/**'
34+
- 'src/prometheus/**'
35+
36+
- name: "Add Label: docs-update-required"
37+
if: steps.file_changes.outputs.docsUpdateRequired == 'true'
38+
uses: actions/github-script@v7
39+
with:
40+
script: |
41+
const issue_number = context.issue.number;
42+
github.rest.issues.addLabels({
43+
issue_number: issue_number,
44+
owner: context.repo.owner,
45+
repo: context.repo.repo,
46+
labels: ['docs-update-required']
47+
})
48+
49+
- name: "Add Label: helm-update-required"
50+
if: steps.file_changes.outputs.helmUpdateRequired == 'true'
51+
uses: actions/github-script@v7
52+
with:
53+
script: |
54+
const issue_number = context.issue.number;
55+
github.rest.issues.addLabels({
56+
issue_number: issue_number,
57+
owner: context.repo.owner,
58+
repo: context.repo.repo,
59+
labels: ['helm-update-required']
60+
})

‎.github/workflows/nightly-release.yml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Copyright The OpenTelemetry Authors
2+
# SPDX-License-Identifier: Apache-2.0
3+
name: Nightly Release
4+
5+
on:
6+
schedule:
7+
# Runs at 00:00 UTC every day
8+
- cron: '0 0 * * *'
9+
10+
jobs:
11+
build_and_push_images:
12+
uses: ./.github/workflows/build-images.yml
13+
if: github.repository == 'open-telemetry/opentelemetry-demo'
14+
with:
15+
push: true
16+
version: nightly-${{ github.run_id }}
17+
secrets: inherit

‎.github/workflows/release.yml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
jobs:
1010
build_and_push_images:
1111
uses: ./.github/workflows/build-images.yml
12+
if: github.repository == 'open-telemetry/opentelemetry-demo'
1213
with:
1314
push: true
1415
version: ${{ github.event.release.tag_name }}

‎.github/workflows/run-integration-tests.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Copyright The OpenTelemetry Authors
2+
# SPDX-License-Identifier: Apache-2.0
3+
name: Integration Tests
4+
5+
on:
6+
pull_request_review:
7+
types:
8+
- submitted
9+
10+
jobs:
11+
run_tests:
12+
runs-on: ubuntu-latest
13+
name: "Run CI"
14+
if: github.event.review.state == 'APPROVED'
15+
steps:
16+
- name: check out code
17+
uses: actions/checkout@v4
18+
- name: run tracetesting
19+
run: |
20+
make build && make run-tracetesting

0 commit comments

Comments
 (0)