Skip to content

Commit

Permalink
[loadgenerator] Bump deps and update container base image (open-telem…
Browse files Browse the repository at this point in the history 
…etry#669)

* Bump deps and changed container base image

* Add extra dependencies

* changelog

* Adding dependencies

* Add libstdc++

* Moving to slim image
  • Loading branch information
@julianocosta89
julianocosta89 authored Jan 9, 2023
1 parent 0da8c47 commit b3d8dd5
Show file tree
Hide file tree
Showing 5 changed files with 209 additions and 204 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,5 @@ significant modifications will be credited to OpenTelemetry Authors.
([#663](https://github.com/open-telemetry/opentelemetry-demo/pull/663))
* Add `OTEL_RESOURCE_ATTRIBUTES` to docker compose setup
([#664](https://github.com/open-telemetry/opentelemetry-demo/pull/664))
* Update loadgenerator python base image and dependencies
([#669](https://github.com/open-telemetry/opentelemetry-demo/pull/669))
19 changes: 13 additions & 6 deletions src/loadgenerator/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020 Google LLC
# Copyright The OpenTelemetry Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -12,12 +12,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM python:3.10 AS base
FROM python:3.11-slim-buster as base

WORKDIR /usr/src/app/

COPY ./src/loadgenerator/ ./
FROM base as builder
RUN apt-get -qq update \
&& apt-get install -y --no-install-recommends g++ \
&& rm -rf /var/lib/apt/lists/*

RUN pip install --prefix="/usr/local/" -r ./requirements.txt
COPY ./src/loadgenerator/requirements.txt .
RUN pip install --prefix="/reqs" -r requirements.txt

FROM base
WORKDIR /usr/src/app/
COPY --from=builder /reqs /usr/local
COPY ./src/loadgenerator/locustfile.py .
COPY ./src/loadgenerator/people.json .
ENTRYPOINT locust
160 changes: 4 additions & 156 deletions src/loadgenerator/locustfile.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
# Copyright 2018 Google LLC
# Copyright The OpenTelemetry Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import json
import random
import uuid
from locust import HttpUser, task, between
Expand Down Expand Up @@ -53,161 +54,8 @@
"OLJCESPC7Z",
]

people = [
{
"email": "[email protected]",
"address": {
"streetAddress": "1600 Amphitheatre Parkway",
"zipCode": "94043",
"city": "Mountain View",
"state": "CA",
"country": "United States",
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4432-8015-6152-0454",
"creditCardExpirationMonth": 1,
"creditCardExpirationYear": 2039,
"creditCardCvv": 672,
},
},
{
"email": "[email protected]",
"address": {
"streetAddress": "One Microsoft Way",
"zipCode": "98052",
"city": "Redmond",
"state": "WA",
"country": "United States",
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4532-4211-7434-1278",
"creditCardExpirationMonth": 2,
"creditCardExpirationYear": 2039,
"creditCardCvv": 114,
},
},
{
"email": "[email protected]",
"address": {
"streetAddress": "One Apple Park Way",
"zipCode": "95014",
"city": "Cupertino",
"state": "CA",
"country": "United States",
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4532-6178-2799-1951",
"creditCardExpirationMonth": 3,
"creditCardExpirationYear": 2039,
"creditCardCvv": 239,
},
},
{
"email": "[email protected]",
"address": {
"streetAddress": "1 Hacker Way",
"zipCode": "94025",
"city": "Menlo Park",
"state": "CA",
"country": "United States",
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4539-1103-5661-7083",
"creditCardExpirationMonth": 4,
"creditCardExpirationYear": 2039,
"creditCardCvv": 784,
},
},
{
"email": "[email protected]",
"address": {
"streetAddress": "410 Terry Ave N",
"zipCode": "98109",
"city": "Seattle",
"state": "WA",
"country": "United States",
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4916-0816-6217-7968",
"creditCardExpirationMonth": 5,
"creditCardExpirationYear": 2039,
"creditCardCvv": 397,
},
},
{
"email": "[email protected]",
"address": {
"streetAddress": "100 Winchester Circle",
"zipCode": "95032",
"city": "Los Gatos",
"state": "CA",
"country": "United States",
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4929-5431-0337-5647",
"creditCardExpirationMonth": 6,
"creditCardExpirationYear": 2039,
"creditCardCvv": 793,
},
},
{
"email": "[email protected]",
"address": {
"streetAddress": "150 Elgin St",
"zipCode": "K2P1L4",
"city": "Ottawa",
"state": "ON",
"country": "Canada",
},
"userCurrency": "CAD",
"creditCard": {
"creditCardNumber": "4763-1844-9699-8031",
"creditCardExpirationMonth": 7,
"creditCardExpirationYear": 2039,
"creditCardCvv": 488,
},
},
{
"email": "[email protected]",
"address": {
"streetAddress": "1355 Market St",
"zipCode": "94103",
"city": "San Francisco",
"state": "CA",
"country": "United States",
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4929-6495-8333-3657",
"creditCardExpirationMonth": 8,
"creditCardExpirationYear": 2039,
"creditCardCvv": 159,
},
},
{
"email": "[email protected]",
"address": {
"streetAddress": "2200 Mission College Blvd",
"zipCode": "95054",
"city": "Santa Clara",
"state": "CA",
"country": "United States",
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4485-4803-8707-3547",
"creditCardExpirationMonth": 9,
"creditCardExpirationYear": 2039,
"creditCardCvv": 682,
},
},
]
people_file = open('people.json')
people = json.load(people_file)


class WebsiteUser(HttpUser):
Expand Down
155 changes: 155 additions & 0 deletions src/loadgenerator/people.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
[
{
"email": "[email protected]",
"address": {
"streetAddress": "1600 Amphitheatre Parkway",
"zipCode": "94043",
"city": "Mountain View",
"state": "CA",
"country": "United States"
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4432-8015-6152-0454",
"creditCardExpirationMonth": 1,
"creditCardExpirationYear": 2039,
"creditCardCvv": 672
}
},
{
"email": "[email protected]",
"address": {
"streetAddress": "One Microsoft Way",
"zipCode": "98052",
"city": "Redmond",
"state": "WA",
"country": "United States"
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4532-4211-7434-1278",
"creditCardExpirationMonth": 2,
"creditCardExpirationYear": 2039,
"creditCardCvv": 114
}
},
{
"email": "[email protected]",
"address": {
"streetAddress": "One Apple Park Way",
"zipCode": "95014",
"city": "Cupertino",
"state": "CA",
"country": "United States"
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4532-6178-2799-1951",
"creditCardExpirationMonth": 3,
"creditCardExpirationYear": 2039,
"creditCardCvv": 239
}
},
{
"email": "[email protected]",
"address": {
"streetAddress": "1 Hacker Way",
"zipCode": "94025",
"city": "Menlo Park",
"state": "CA",
"country": "United States"
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4539-1103-5661-7083",
"creditCardExpirationMonth": 4,
"creditCardExpirationYear": 2039,
"creditCardCvv": 784
}
},
{
"email": "[email protected]",
"address": {
"streetAddress": "410 Terry Ave N",
"zipCode": "98109",
"city": "Seattle",
"state": "WA",
"country": "United States"
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4916-0816-6217-7968",
"creditCardExpirationMonth": 5,
"creditCardExpirationYear": 2039,
"creditCardCvv": 397
}
},
{
"email": "[email protected]",
"address": {
"streetAddress": "100 Winchester Circle",
"zipCode": "95032",
"city": "Los Gatos",
"state": "CA",
"country": "United States"
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4929-5431-0337-5647",
"creditCardExpirationMonth": 6,
"creditCardExpirationYear": 2039,
"creditCardCvv": 793
}
},
{
"email": "[email protected]",
"address": {
"streetAddress": "150 Elgin St",
"zipCode": "K2P1L4",
"city": "Ottawa",
"state": "ON",
"country": "Canada"
},
"userCurrency": "CAD",
"creditCard": {
"creditCardNumber": "4763-1844-9699-8031",
"creditCardExpirationMonth": 7,
"creditCardExpirationYear": 2039,
"creditCardCvv": 488
}
},
{
"email": "[email protected]",
"address": {
"streetAddress": "1355 Market St",
"zipCode": "94103",
"city": "San Francisco",
"state": "CA",
"country": "United States"
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4929-6495-8333-3657",
"creditCardExpirationMonth": 8,
"creditCardExpirationYear": 2039,
"creditCardCvv": 159
}
},
{
"email": "[email protected]",
"address": {
"streetAddress": "2200 Mission College Blvd",
"zipCode": "95054",
"city": "Santa Clara",
"state": "CA",
"country": "United States"
},
"userCurrency": "USD",
"creditCard": {
"creditCardNumber": "4485-4803-8707-3547",
"creditCardExpirationMonth": 9,
"creditCardExpirationYear": 2039,
"creditCardCvv": 682
}
}
]
Loading

0 comments on commit b3d8dd5

Please sign in to comment.