Skip to content

Commit 33de211

Browse files
YANG-DBpellaredrenovate[bot]austinlparkercartersocha
authored
Upstream changes needed merge (#41)
* Commit generated Go code and bump dependencies (open-telemetry#946) * accountingservice: commit generated code bump deps * license-checker to ignore genproto * Update README.md * Add comment to tools.go * checkoutservice: commit generated code bump dependencies * productcatalogservice: commit generated code bump dependencies * Configure Renovate (open-telemetry#931) * Add renovate.json * only update otel deps * update renovate config * update renovate config --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: austinlparker <austin@ap2.io> Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com> * [cartservice] code cleanup (open-telemetry#943) * File scope namespaces * Sort modifiers * Remove redundant type declaration * Avoid hiding variables * join declaration and assignment * Use standard .NET convention for fields and consts * inline out variable * object initializer * collection initializer * drop unused using * drop unused parameters * remove redundant field initializer --------- Co-authored-by: Austin Parker <austin@ap2.io> * Add Axiom to list of vendors (open-telemetry#963) We would very much like to add [Axiom](axiom.co) to the list of vendors in the README. I linked a public demo dashboard that is feed by the demo. --------- Signed-off-by: YANGDB <yang.db.dev@gmail.com> Co-authored-by: Robert Pająk <pellared@hotmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: austinlparker <austin@ap2.io> Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com> Co-authored-by: Piotr Kiełkowicz <pkiekowicz@splunk.com> Co-authored-by: Lukas Malkmus <mail@lukasmalkmus.com>
1 parent 0b90026 commit 33de211

38 files changed

Lines changed: 16089 additions & 1644 deletions

‎.env‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,9 @@ PROMETHEUS_SERVICE_PORT=9090
117117
PROMETHEUS_SERVICE_HOST=prometheus
118118
PROMETHEUS_ADDR=${PROMETHEUS_SERVICE_HOST}:${PROMETHEUS_SERVICE_PORT}
119119

120+
# OpenSearch versionins
121+
VERSION=2.8.0
122+
120123
# OpenSearch Node1
121124
OPENSEARCH1_PORT=9200
122125
OPENSEARCH1_HOST=opensearch-node1

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,13 @@ src/frontend/cypress/screenshots
4040
src/shippingservice/target/
4141

4242
# Ignore copied/generated protobuf files
43-
/src/accountingservice/genproto/
4443
/src/cartservice/src/protos/
45-
/src/checkoutservice/genproto/
4644
/src/featureflagservice/proto/
4745
/src/featureflagservice/src/ffs_demo_pb.erl
4846
/src/featureflagservice/src/ffs_service_*.erl
4947
/src/featureflagservice/src/oteldemo_*.erl
5048
/src/frontend/pb/
5149
/src/frontend/protos/
5250
/src/paymentservice/demo.proto
53-
/src/productcatalogservice/genproto/
5451
/src/recommendationservice/demo_pb2*.py
5552
/src/shippingservice/proto/

‎.licenserc.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,13 @@
3434
],
3535
"ignore": [
3636
"node_modules/",
37+
"src/accountingservice/genproto/",
3738
"src/cartservice/src/obj/",
3839
"src/cartservice/tests/obj/",
40+
"src/checkoutservice/genproto/",
3941
"src/featureflagservice/assets/vendor/",
4042
"src/featureflagservice/priv/",
43+
"src/productcatalogservice/genproto/",
4144
"internal/tools/"
4245
]
4346
}

‎README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ We welcome any vendor to fork the project to demonstrate their services and
5353
adding a link below. The community is committed to maintaining the project and
5454
keeping it up to date for you.
5555

56-
| | | |
57-
| ----------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------- |----------------------------------------------------------------------------------------------|
58-
| [AlibabaCloud LogService](https://github.com/aliyun-sls/opentelemetry-demo) | [Grafana Labs](https://github.com/grafana/opentelemetry-demo) | [Sentry](https://github.com/getsentry/opentelemetry-demo) |
59-
| [AppDynamics](https://www.appdynamics.com/blog/cloud/how-to-observe-opentelemetry-demo-app-in-appdynamics-cloud/) | [Helios](https://otelsandbox.gethelios.dev) | [Splunk](https://github.com/signalfx/opentelemetry-demo) |
60-
| [Aspecto](https://github.com/aspecto-io/opentelemetry-demo) | [Honeycomb.io](https://github.com/honeycombio/opentelemetry-demo) | [Sumo Logic](https://www.sumologic.com/blog/common-opentelemetry-demo-application/) |
61-
| [Coralogix](https://coralogix.com/blog/configure-otel-demo-send-telemetry-data-coralogix) | [Instana](https://github.com/instana/opentelemetry-demo) | [TelemetryHub](https://github.com/TelemetryHub/opentelemetry-demo/tree/telemetryhub-backend) |
62-
| [Datadog](https://github.com/DataDog/opentelemetry-demo) | [Kloudfuse](https://github.com/kloudfuse/opentelemetry-demo) | [Teletrace](https://github.com/teletrace/opentelemetry-demo) |
63-
| [Dynatrace](https://www.dynatrace.com/news/blog/opentelemetry-demo-application-with-dynatrace/) | [Lightstep](https://github.com/lightstep/opentelemetry-demo) | [Uptrace](https://github.com/uptrace/uptrace/tree/master/example/opentelemetry-demo) |
64-
| [Elastic](https://github.com/elastic/opentelemetry-demo) | [New Relic](https://github.com/newrelic/opentelemetry-demo) | [OpenSearch](https://github.com/opensearch-project/opentelemetry-demo) |
65-
| | | |
56+
| | | |
57+
| ----------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- | -------------------------------------------------------------------------------------------- |
58+
| [AlibabaCloud LogService](https://github.com/aliyun-sls/opentelemetry-demo) | [Elastic](https://github.com/elastic/opentelemetry-demo) | [OpenSearch](https://github.com/opensearch-project/opentelemetry-demo) |
59+
| [AppDynamics](https://www.appdynamics.com/blog/cloud/how-to-observe-opentelemetry-demo-app-in-appdynamics-cloud/) | [Grafana Labs](https://github.com/grafana/opentelemetry-demo) | [Sentry](https://github.com/getsentry/opentelemetry-demo) |
60+
| [Aspecto](https://github.com/aspecto-io/opentelemetry-demo) | [Helios](https://otelsandbox.gethelios.dev) | [Splunk](https://github.com/signalfx/opentelemetry-demo) |
61+
| [Axiom](https://play.axiom.co/axiom-play-qf1k/dashboards/otel.traces.otel-demo-traces) | [Honeycomb.io](https://github.com/honeycombio/opentelemetry-demo) | [Sumo Logic](https://www.sumologic.com/blog/common-opentelemetry-demo-application/) |
62+
| [Azure Data Explorer](https://github.com/Azure/Azure-kusto-opentelemetry-demo) | [Instana](https://github.com/instana/opentelemetry-demo) | [TelemetryHub](https://github.com/TelemetryHub/opentelemetry-demo/tree/telemetryhub-backend) |
63+
| [Coralogix](https://coralogix.com/blog/configure-otel-demo-send-telemetry-data-coralogix) | [Kloudfuse](https://github.com/kloudfuse/opentelemetry-demo) | [Teletrace](https://github.com/teletrace/opentelemetry-demo) |
64+
| [Datadog](https://github.com/DataDog/opentelemetry-demo) | [Lightstep](https://github.com/lightstep/opentelemetry-demo) | [Uptrace](https://github.com/uptrace/uptrace/tree/master/example/opentelemetry-demo) |
65+
| [Dynatrace](https://www.dynatrace.com/news/blog/opentelemetry-demo-application-with-dynatrace/) | [New Relic](https://github.com/newrelic/opentelemetry-demo) | |
6666

6767
## Contributing
6868

‎docker-compose.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ services:
712712

713713
# OpenSearch store - node1
714714
opensearch-node1: # This is also the hostname of the container within the Docker network (i.e. https://opensearch-node1/)
715-
image: opensearchproject/opensearch:2.7.0 # Specifying the latest available image - modify if you want a specific version
715+
image: opensearchproject/opensearch:2.8.0 # Specifying the latest available image - modify if you want a specific version
716716
container_name: opensearch-node1
717717
environment:
718718
- cluster.name=opensearch-cluster # Name the cluster
@@ -741,7 +741,7 @@ services:
741741

742742
# OpenSearch store - node2
743743
opensearch-node2:
744-
image: opensearchproject/opensearch:2.7.0 # This should be the same image used for opensearch-node1 to avoid issues
744+
image: opensearchproject/opensearch:2.8.0 # This should be the same image used for opensearch-node1 to avoid issues
745745
container_name: opensearch-node2
746746
environment:
747747
- cluster.name=opensearch-cluster
@@ -762,7 +762,7 @@ services:
762762

763763
# OpenSearch store - dashboard
764764
opensearch-dashboards:
765-
image: opensearchproject/opensearch-dashboards:2.7.0 # Make sure the version of opensearch-dashboards matches the version of opensearch installed on other nodes
765+
image: opensearchproject/opensearch-dashboards:2.8.0 # Make sure the version of opensearch-dashboards matches the version of opensearch installed on other nodes
766766
container_name: opensearch-dashboards
767767
ports:
768768
- 5601:5601 # Map host port 5601 to container port 5601

‎renovate.json‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:base"
5+
],
6+
"schedule": "every weekend",
7+
"packageRules": [
8+
{
9+
"matchPaths": ["*"],
10+
"ignorePaths": ["src/"],
11+
"groupName": "config-no-service"
12+
},
13+
{
14+
"matchPaths": ["src/accountingservice"],
15+
"groupName": "accountingservice",
16+
"assigneesFromCodeOwners": true
17+
},
18+
{
19+
"matchPaths": ["src/adservice"],
20+
"groupName": "adservice",
21+
"assigneesFromCodeOwners": true
22+
},
23+
{
24+
"matchPaths": ["src/cartservice"],
25+
"groupName": "cartservice",
26+
"assigneesFromCodeOwners": true
27+
},
28+
{
29+
"matchPaths": ["src/checkoutservice"],
30+
"groupName": "checkoutservice",
31+
"assigneesFromCodeOwners": true
32+
},
33+
{
34+
"matchPaths": ["src/currencyservice"],
35+
"groupName": "currencyservice",
36+
"assigneesFromCodeOwners": true
37+
},
38+
{
39+
"matchPaths": ["src/emailservice"],
40+
"groupName": "emailservice",
41+
"assigneesFromCodeOwners": true
42+
},
43+
{
44+
"matchPaths": ["src/featureflagservice"],
45+
"groupName": "featureflagservice",
46+
"assigneesFromCodeOwners": true
47+
},
48+
{
49+
"matchPaths": ["src/frauddetectionservice"],
50+
"groupName": "frauddetectionservice",
51+
"assigneesFromCodeOwners": true
52+
},
53+
{
54+
"matchPaths": ["src/frontend"],
55+
"groupName": "frontend",
56+
"assigneesFromCodeOwners": true
57+
},
58+
{
59+
"matchPaths": ["src/frontendproxy"],
60+
"groupName": "frontendproxy",
61+
"assigneesFromCodeOwners": true
62+
},
63+
{
64+
"matchPaths": ["src/grafana"],
65+
"groupName": "grafana",
66+
"assigneesFromCodeOwners": true
67+
},
68+
{
69+
"matchPaths": ["src/kakfa"],
70+
"groupName": "kakfa",
71+
"assigneesFromCodeOwners": true
72+
},
73+
{
74+
"matchPaths": ["src/loadgenerator"],
75+
"groupName": "loadgenerator",
76+
"assigneesFromCodeOwners": true
77+
},
78+
{
79+
"matchPaths": ["src/otelcollector"],
80+
"groupName": "otelcollector",
81+
"assigneesFromCodeOwners": true
82+
},
83+
{
84+
"matchPaths": ["src/paymentservice"],
85+
"groupName": "paymentservice",
86+
"assigneesFromCodeOwners": true
87+
},
88+
{
89+
"matchPaths": ["src/productcatalogservice"],
90+
"groupName": "productcatalogservice",
91+
"assigneesFromCodeOwners": true
92+
},
93+
{
94+
"matchPaths": ["src/prometheus"],
95+
"groupName": "prometheus",
96+
"assigneesFromCodeOwners": true
97+
},
98+
{
99+
"matchPaths": ["src/quoteservice"],
100+
"groupName": "quoteservice",
101+
"assigneesFromCodeOwners": true
102+
},
103+
{
104+
"matchPaths": ["src/recommendationservice"],
105+
"groupName": "recommendationservice",
106+
"assigneesFromCodeOwners": true
107+
},
108+
{
109+
"matchPaths": ["src/shippingservice"],
110+
"groupName": "shippingservice",
111+
"assigneesFromCodeOwners": true
112+
}
113+
]
114+
}

‎src/accountingservice/Dockerfile‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,10 @@
33

44

55
FROM golang:1.19.2-alpine AS builder
6-
RUN apk add build-base protobuf-dev protoc
7-
RUN apk add --no-cache git
8-
RUN apk add --no-cache curl
9-
106
WORKDIR /usr/src/app/
117

12-
# Restore dependencies
138
COPY ./src/accountingservice/ ./
14-
COPY ./pb/ ./proto/
15-
16-
ENV GOPROXY=direct
17-
ENV GOSUMDB=off
18-
19-
RUN go mod download
20-
RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28
21-
RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
22-
23-
# Build executable
24-
RUN protoc -I ./proto/ ./proto/demo.proto --go_out=./ --go-grpc_out=./
25-
RUN go build -o /go/bin/accountingservice/ ./
9+
RUN go build -o /go/bin/accountingservice/
2610

2711
# -----------------------------------------------------------------------------
2812

‎src/accountingservice/README.md‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ This service consumes new orders from a Kafka topic.
44

55
## Local Build
66

7-
To build the protos and the service binary, run:
7+
To build the service binary, run:
88

99
```sh
10-
protoc -I ../../pb/ ../../pb/demo.proto --go_out=./ --go-grpc_out=./
11-
go build -o /go/bin/accountingservice/ ./
10+
go build -o /go/bin/accountingservice/
1211
```
1312

1413
## Docker Build
@@ -18,3 +17,23 @@ From the root directory, run:
1817
```sh
1918
docker compose build accountingservice
2019
```
20+
21+
## Regenerate protos
22+
23+
> **Note**
24+
> [`protoc`](https://grpc.io/docs/protoc-installation/) is required.
25+
26+
To regenerate gRPC code run:
27+
28+
```sh
29+
go generate
30+
```
31+
32+
## Bump dependencies
33+
34+
To bump all dependencies run:
35+
36+
```sh
37+
go get -u -t ./...
38+
go mod tidy
39+
```

0 commit comments

Comments
 (0)