Skip to content

Commit 2fe5949

Browse files
songy23songy23
committed
Fix all merge conflicts
1 parent 9253832 commit 2fe5949

File tree

47 files changed

+639
-9371
lines changed

Some content is hidden

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

47 files changed

+639
-9371
lines changed

‎.github/workflows/checks.yml

-3
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@ on:
77
branches: [ main ]
88

99
jobs:
10-
<<<<<<< HEAD
11-
=======
1210
build_images:
1311
uses: ./.github/workflows/build-images.yml
1412
with:
1513
push: false
1614
version: 'dev'
1715

18-
>>>>>>> main
1916
markdownlint:
2017
runs-on: ubuntu-latest
2118
steps:

‎.github/workflows/release.yml

-116
Original file line numberDiff line numberDiff line change
@@ -8,124 +8,8 @@ on:
88

99
jobs:
1010
build_and_push_images:
11-
<<<<<<< HEAD
12-
runs-on: ubuntu-latest
13-
permissions:
14-
contents: read
15-
packages: write
16-
17-
env:
18-
RELEASE_VERSION: "${{ github.event.release.tag_name }}"
19-
DOCKERHUB_REPO: "otel/demo"
20-
GHCR_REPO: "ghcr.io/open-telemetry/demo"
21-
22-
strategy:
23-
matrix:
24-
file_tag:
25-
- file: ./src/adservice/Dockerfile
26-
tag_suffix: adservice
27-
context: ./
28-
- file: ./src/cartservice/src/Dockerfile
29-
tag_suffix: cartservice
30-
context: ./
31-
- file: ./src/checkoutservice/Dockerfile
32-
tag_suffix: checkoutservice
33-
context: ./
34-
- file: ./src/currencyservice/Dockerfile
35-
tag_suffix: currencyservice
36-
context: ./src/currencyservice
37-
- file: ./src/emailservice/Dockerfile
38-
tag_suffix: emailservice
39-
context: ./src/emailservice
40-
- file: ./src/featureflagservice/Dockerfile
41-
tag_suffix: featureflagservice
42-
context: ./
43-
- file: ./src/frontend/Dockerfile
44-
tag_suffix: frontend
45-
context: ./
46-
- file: ./src/frontendproxy/Dockerfile
47-
tag_suffix: frontendproxy
48-
context: ./
49-
- file: ./src/loadgenerator/Dockerfile
50-
tag_suffix: loadgenerator
51-
context: ./
52-
- file: ./src/paymentservice/Dockerfile
53-
tag_suffix: paymentservice
54-
context: ./
55-
- file: ./src/productcatalogservice/Dockerfile
56-
tag_suffix: productcatalogservice
57-
context: ./
58-
- file: ./src/quoteservice/Dockerfile
59-
tag_suffix: quoteservice
60-
context: ./
61-
- file: ./src/shippingservice/Dockerfile
62-
tag_suffix: shippingservice
63-
context: ./
64-
- file: ./src/recommendationservice/Dockerfile
65-
tag_suffix: recommendationservice
66-
context: ./
67-
- file: ./src/kafka/Dockerfile
68-
tag_suffix: kafka
69-
context: ./
70-
- file: ./src/accountingservice/Dockerfile
71-
tag_suffix: accountingservice
72-
context: ./
73-
- file: ./src/frauddetectionservice/Dockerfile
74-
tag_suffix: frauddetectionservice
75-
context: ./
76-
- file: ./src/frontend/Dockerfile.cypress
77-
tag_suffix: frontend-tests
78-
context: ./
79-
- file: ./test/Dockerfile
80-
tag_suffix: integrationTests
81-
context: ./
82-
83-
steps:
84-
- uses: actions/checkout@v3
85-
with:
86-
fetch-depth: 0
87-
88-
- name: Log in to the Container registry
89-
uses: docker/login-action@v2
90-
with:
91-
registry: ghcr.io
92-
username: ${{ github.repository_owner }}
93-
password: ${{ secrets.GITHUB_TOKEN }}
94-
if: github.event_name != 'pull_request'
95-
96-
- name: Log in to Docker Hub
97-
uses: docker/login-action@v2
98-
with:
99-
username: ${{ secrets.DOCKER_USERNAME }}
100-
password: ${{ secrets.DOCKER_PASSWORD }}
101-
if: github.event_name != 'pull_request'
102-
103-
- name: Set up QEMU
104-
uses: docker/setup-qemu-action@v2
105-
106-
- name: Set up Docker Buildx
107-
uses: docker/setup-buildx-action@v2
108-
with:
109-
config-inline: |
110-
[worker.oci]
111-
max-parallelism = 2
112-
113-
- name: Matrix Build and push demo images
114-
uses: docker/build-push-action@v3.3.0
115-
with:
116-
context: ${{ matrix.file_tag.context }}
117-
file: ${{ matrix.file_tag.file }}
118-
platforms: linux/amd64,linux/arm64
119-
push: ${{ github.event_name != 'pull_request' }}
120-
tags: |
121-
${{ env.DOCKERHUB_REPO }}:${{ env.RELEASE_VERSION || 'pr' }}-${{matrix.file_tag.tag_suffix }}
122-
${{ env.GHCR_REPO }}:${{ env.RELEASE_VERSION || 'pr' }}-${{ matrix.file_tag.tag_suffix }}
123-
cache-from: type=gha
124-
cache-to: type=gha
125-
=======
12611
uses: ./.github/workflows/build-images.yml
12712
with:
12813
push: true
12914
version: ${{ github.event.release.tag_name }}
13015
secrets: inherit
131-
>>>>>>> main

‎CHANGELOG.md

-8
Original file line numberDiff line numberDiff line change
@@ -114,19 +114,12 @@ release.
114114
([#935](https://github.com/open-telemetry/opentelemetry-demo/pull/935))
115115
* [cartservice] update service to .NET 7
116116
([#942](https://github.com/open-telemetry/opentelemetry-demo/pull/942))
117-
<<<<<<< HEAD
118-
* [cartservice] update .NET package to 1.5.1 release
119-
([#935](https://github.com/open-telemetry/opentelemetry-demo/pull/957))
120-
=======
121117
* [tests] Add trace-based testing examples
122118
([#877](https://github.com/open-telemetry/opentelemetry-demo/pull/877))
123-
>>>>>>> main
124119
* Introduce minimal mode to run demo
125120
([#872](https://github.com/open-telemetry/opentelemetry-demo/pull/872))
126121
* [frontendproxy]Envoy expose a route for the collector to route frontend spans
127122
([#938](https://github.com/open-telemetry/opentelemetry-demo/pull/938))
128-
<<<<<<< HEAD
129-
=======
130123
* [frontend] update JS SDKs to 1.15.0/0.41.0
131124
([#853](https://github.com/open-telemetry/opentelemetry-demo/pull/853))
132125
* [shippingservice] Update Rust dependencies and add TelemetryResourceDetector
@@ -161,7 +154,6 @@ release.
161154
([#1086](https://github.com/open-telemetry/opentelemetry-demo/pull/1086))
162155
* [TraceTests] Update span attributes to align with new IBM/sarama instrumentation
163156
([#1096](https://github.com/open-telemetry/opentelemetry-demo/pull/1096))
164-
>>>>>>> main
165157

166158
## 1.4.0
167159

‎README.md

-13
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,6 @@ We welcome any vendor to fork the project to demonstrate their services and
5454
adding a link below. The community is committed to maintaining the project and
5555
keeping it up to date for you.
5656

57-
<<<<<<< HEAD
58-
| | | |
59-
| ----------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- | -------------------------------------------------------------------------------------------- |
60-
| [AlibabaCloud LogService](https://github.com/aliyun-sls/opentelemetry-demo) | [Elastic](https://github.com/elastic/opentelemetry-demo) | [OpenSearch](https://github.com/opensearch-project/opentelemetry-demo) |
61-
| [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) |
62-
| [Aspecto](https://github.com/aspecto-io/opentelemetry-demo) | [Helios](https://otelsandbox.gethelios.dev) | [Splunk](https://github.com/signalfx/opentelemetry-demo) |
63-
| [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/) |
64-
| [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) |
65-
| [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) |
66-
| [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) |
67-
| [Dynatrace](https://www.dynatrace.com/news/blog/opentelemetry-demo-application-with-dynatrace/) | [New Relic](https://github.com/newrelic/opentelemetry-demo) | |
68-
=======
6957
| | | |
7058
|-----------------------------------------|-----------------------------|----------------------------------------------------------------|
7159
| [AlibabaCloud LogService][AlibabaCloud] | [Elastic][Elastic] | [OpenSearch][OpenSearch] |
@@ -77,7 +65,6 @@ keeping it up to date for you.
7765
| [Coralogix][Coralogix] | [Kloudfuse][Kloudfuse] | [Teletrace][Teletrace] |
7866
| [Datadog][Datadog] | [Logz.io][Logzio] | [Tracetest][Tracetest] |
7967
| [Dynatrace][Dynatrace] | [New Relic][NewRelic] | [Uptrace][Uptrace] |
80-
>>>>>>> main
8168

8269
## Contributing
8370

‎docker-compose.yml

-4
Original file line numberDiff line numberDiff line change
@@ -645,11 +645,7 @@ services:
645645

646646
# OpenTelemetry Collector
647647
otelcol:
648-
<<<<<<< HEAD
649-
image: otel/opentelemetry-collector-contrib:0.76.1
650-
=======
651648
image: otel/opentelemetry-collector-contrib:0.91.0
652-
>>>>>>> main
653649
container_name: otel-col
654650
deploy:
655651
resources:

‎kubernetes/opentelemetry-demo.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -10092,11 +10092,7 @@ spec:
1009210092
- name: OTEL_EXPORTER_OTLP_ENDPOINT
1009310093
value: http://$(OTEL_COLLECTOR_NAME):4317
1009410094
- name: OTEL_RESOURCE_ATTRIBUTES
10095-
<<<<<<< HEAD
1009610095
value: service.name=$(OTEL_SERVICE_NAME),service.instance.id=$(OTEL_K8S_POD_UID),service.namespace=opentelemetry-demo,k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME),datadog.container.tag.team=otel
10097-
=======
10098-
value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo
10099-
>>>>>>> main
1010010096
resources:
1010110097
limits:
1010210098
memory: 500Mi

‎src/accountingservice/Dockerfile

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44

5-
<<<<<<< HEAD
6-
FROM registry.ddbuild.io/images/mirror/golang:1.19-alpine AS builder
7-
=======
8-
FROM golang:1.21.4-alpine AS builder
9-
>>>>>>> main
5+
FROM registry.ddbuild.io/images/mirror/golang:1.21.4-alpine AS builder
106
WORKDIR /usr/src/app/
117

128
COPY ./src/accountingservice/ ./

‎src/adservice/Dockerfile

+2-12
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44

5-
<<<<<<< HEAD
6-
FROM registry.ddbuild.io/images/java:corretto-17 AS builder
7-
=======
8-
FROM eclipse-temurin:21-jdk as builder
9-
>>>>>>> main
5+
FROM registry.ddbuild.io/images/mirror/eclipse-temurin:21-jdk as builder
106

117
WORKDIR /usr/src/app/
128

@@ -22,15 +18,9 @@ RUN ./gradlew installDist -PprotoSourceDir=./proto
2218

2319
# -----------------------------------------------------------------------------
2420

25-
<<<<<<< HEAD
26-
FROM registry.ddbuild.io/images/java:corretto-17
27-
28-
ARG version=1.24.0
29-
=======
30-
FROM eclipse-temurin:21-jre
21+
FROM registry.ddbuild.io/images/mirror/eclipse-temurin:21-jre
3122

3223
ARG version=1.31.0
33-
>>>>>>> main
3424
WORKDIR /usr/src/app/
3525

3626
COPY --from=builder /usr/src/app/ ./

‎src/adservice/build.gradle

-23
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ plugins {
44
id 'com.github.sherter.google-java-format' version '0.9'
55
id 'idea'
66
id 'application'
7-
<<<<<<< HEAD
8-
=======
97
id 'com.github.ben-manes.versions' version '0.49.0'
10-
>>>>>>> main
118
}
129

1310
repositories {
@@ -19,19 +16,11 @@ description = 'Ad Service'
1916
group = "adservice"
2017
version = "0.1.0-SNAPSHOT"
2118

22-
<<<<<<< HEAD
23-
def opentelemetryVersion = "1.19.0"
24-
def opentelemetryInstrumentationAlphaVersion = "1.19.1-alpha"
25-
def grpcVersion = "1.45.1"
26-
def jacksonVersion = "2.13.2"
27-
def protocVersion = "3.20.0"
28-
=======
2919
def opentelemetryVersion = "1.31.0"
3020
def opentelemetryInstrumentationAlphaVersion = "1.31.0-alpha"
3121
def grpcVersion = "1.59.0"
3222
def jacksonVersion = "2.15.3"
3323
def protocVersion = "3.25.0"
34-
>>>>>>> main
3524

3625
tasks.withType(JavaCompile).configureEach {
3726
sourceCompatibility = JavaVersion.VERSION_21
@@ -51,11 +40,7 @@ dependencies {
5140
implementation platform("io.opentelemetry:opentelemetry-bom:${opentelemetryVersion}")
5241
implementation platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${opentelemetryInstrumentationAlphaVersion}")
5342

54-
<<<<<<< HEAD
55-
implementation "com.google.api.grpc:proto-google-common-protos:2.8.0",
56-
=======
5743
implementation "com.google.api.grpc:proto-google-common-protos:2.28.0",
58-
>>>>>>> main
5944
"javax.annotation:javax.annotation-api:1.3.2",
6045
"io.grpc:grpc-protobuf:${grpcVersion}",
6146
"io.grpc:grpc-stub:${grpcVersion}",
@@ -64,19 +49,11 @@ dependencies {
6449
"io.opentelemetry:opentelemetry-api",
6550
"io.opentelemetry:opentelemetry-sdk",
6651
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations",
67-
<<<<<<< HEAD
68-
"org.apache.logging.log4j:log4j-core:2.17.2"
69-
70-
runtimeOnly "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}",
71-
"com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}",
72-
"io.netty:netty-tcnative-boringssl-static:2.0.51.Final"
73-
=======
7452
"org.apache.logging.log4j:log4j-core:2.21.1"
7553

7654
runtimeOnly "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}",
7755
"com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}",
7856
"io.netty:netty-tcnative-boringssl-static:2.0.62.Final"
79-
>>>>>>> main
8057
}
8158
}
8259

‎src/adservice/gradle/wrapper/gradle-wrapper.properties

-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
<<<<<<< HEAD
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
5-
=======
63
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
74
networkTimeout=10000
85
validateDistributionUrl=true
9-
>>>>>>> main
106
zipStoreBase=GRADLE_USER_HOME
117
zipStorePath=wrapper/dists

‎src/cartservice/src/Dockerfile

+2-18
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,22 @@
1515
# limitations under the License.
1616

1717
# https://mcr.microsoft.com/v2/dotnet/sdk/tags/list
18-
<<<<<<< HEAD
19-
FROM registry.ddbuild.io/images/mirror/dotnet:sdk-7.0.305 as builder
20-
=======
21-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.100-1 AS builder
18+
FROM registry.ddbuild.io/images/mirror/dotnet:sdk-8.0.100-1 AS builder
2219
ARG TARGETARCH
23-
>>>>>>> main
2420

2521
WORKDIR /usr/src/app/
2622

2723
COPY ./src/cartservice/ ./
2824
COPY ./pb/ ./src/protos/
2925

30-
<<<<<<< HEAD
31-
RUN \
32-
RUNTIME_IDENTIIFER=linux-musl-x64; \
33-
if [ "$(uname -m)" = "aarch64" ]; then RUNTIME_IDENTIIFER=linux-musl-arm64; fi; \
34-
dotnet restore ./src/cartservice.csproj -r $RUNTIME_IDENTIIFER && \
35-
dotnet publish ./src/cartservice.csproj -p:PublishSingleFile=true -r $RUNTIME_IDENTIIFER --self-contained true -p:PublishTrimmed=False -p:TrimMode=Link -c Release -o /cartservice --no-restore
36-
=======
3726
RUN dotnet restore ./src/cartservice.csproj -v d -r linux-musl-$TARGETARCH
3827

3928
RUN dotnet publish ./src/cartservice.csproj -v d -r linux-musl-$TARGETARCH --no-restore -o /cartservice
40-
>>>>>>> main
4129

4230
# -----------------------------------------------------------------------------
4331

4432
# https://mcr.microsoft.com/v2/dotnet/runtime-deps/tags/list
45-
<<<<<<< HEAD
46-
FROM registry.ddbuild.io/images/mirror/dotnet/runtime-deps:7.0.8-alpine3.18
47-
=======
48-
FROM mcr.microsoft.com/dotnet/runtime-deps:8.0.0-alpine3.18
49-
>>>>>>> main
33+
FROM registry.ddbuild.io/images/mirror/dotnet/runtime-deps:8.0.0-alpine3.18
5034

5135
WORKDIR /usr/src/app/
5236
COPY --from=builder /cartservice/ ./

0 commit comments

Comments
 (0)