Fix all merge conflicts

DataDog · Jan 4, 2024 · 2fe5949 · 2fe5949
1 parent 9253832
commit 2fe5949
Show file tree

Hide file tree

Showing 47 changed files with 639 additions and 9,371 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -7,15 +7,12 @@ on:
     branches: [ main ]
 
 jobs:
-<<<<<<< HEAD
-=======
   build_images:
     uses: ./.github/workflows/build-images.yml
     with:
       push: false
       version: 'dev'
 
->>>>>>> main
   markdownlint:
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,124 +8,8 @@ on:
 
 jobs:
   build_and_push_images:
-<<<<<<< HEAD
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    env:
-      RELEASE_VERSION: "${{ github.event.release.tag_name }}"
-      DOCKERHUB_REPO: "otel/demo"
-      GHCR_REPO: "ghcr.io/open-telemetry/demo"
-
-    strategy:
-      matrix:
-        file_tag:
-          - file: ./src/adservice/Dockerfile
-            tag_suffix: adservice
-            context: ./
-          - file: ./src/cartservice/src/Dockerfile
-            tag_suffix: cartservice
-            context: ./
-          - file: ./src/checkoutservice/Dockerfile
-            tag_suffix: checkoutservice
-            context: ./
-          - file: ./src/currencyservice/Dockerfile
-            tag_suffix: currencyservice
-            context: ./src/currencyservice
-          - file: ./src/emailservice/Dockerfile
-            tag_suffix: emailservice
-            context: ./src/emailservice
-          - file: ./src/featureflagservice/Dockerfile
-            tag_suffix: featureflagservice
-            context: ./
-          - file: ./src/frontend/Dockerfile
-            tag_suffix: frontend
-            context: ./
-          - file: ./src/frontendproxy/Dockerfile
-            tag_suffix: frontendproxy
-            context: ./
-          - file: ./src/loadgenerator/Dockerfile
-            tag_suffix: loadgenerator
-            context: ./
-          - file: ./src/paymentservice/Dockerfile
-            tag_suffix: paymentservice
-            context: ./
-          - file: ./src/productcatalogservice/Dockerfile
-            tag_suffix: productcatalogservice
-            context: ./
-          - file: ./src/quoteservice/Dockerfile
-            tag_suffix: quoteservice
-            context: ./
-          - file: ./src/shippingservice/Dockerfile
-            tag_suffix: shippingservice
-            context: ./
-          - file: ./src/recommendationservice/Dockerfile
-            tag_suffix: recommendationservice
-            context: ./
-          - file: ./src/kafka/Dockerfile
-            tag_suffix: kafka
-            context: ./
-          - file: ./src/accountingservice/Dockerfile
-            tag_suffix: accountingservice
-            context: ./
-          - file: ./src/frauddetectionservice/Dockerfile
-            tag_suffix: frauddetectionservice
-            context: ./
-          - file: ./src/frontend/Dockerfile.cypress
-            tag_suffix: frontend-tests
-            context: ./
-          - file: ./test/Dockerfile
-            tag_suffix: integrationTests
-            context: ./
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-        if: github.event_name != 'pull_request'
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-        if: github.event_name != 'pull_request'
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          config-inline: |
-            [worker.oci]
-              max-parallelism = 2
-
-      - name: Matrix Build and push demo images
-        uses: docker/build-push-action@v3.3.0
-        with:
-          context: ${{ matrix.file_tag.context }}
-          file: ${{ matrix.file_tag.file }}
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: |
-            ${{ env.DOCKERHUB_REPO }}:${{ env.RELEASE_VERSION || 'pr' }}-${{matrix.file_tag.tag_suffix }}
-            ${{ env.GHCR_REPO }}:${{ env.RELEASE_VERSION || 'pr' }}-${{ matrix.file_tag.tag_suffix }}
-          cache-from: type=gha
-          cache-to: type=gha
-=======
     uses: ./.github/workflows/build-images.yml
     with:
       push: true
       version: ${{ github.event.release.tag_name }}
     secrets: inherit
->>>>>>> main
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -114,19 +114,12 @@ release.
   ([#935](https://github.com/open-telemetry/opentelemetry-demo/pull/935))
 * [cartservice] update service to .NET 7
   ([#942](https://github.com/open-telemetry/opentelemetry-demo/pull/942))
-<<<<<<< HEAD
-* [cartservice] update .NET package to 1.5.1 release
-  ([#935](https://github.com/open-telemetry/opentelemetry-demo/pull/957))
-=======
 * [tests] Add trace-based testing examples
   ([#877](https://github.com/open-telemetry/opentelemetry-demo/pull/877))
->>>>>>> main
 * Introduce minimal mode to run demo
   ([#872](https://github.com/open-telemetry/opentelemetry-demo/pull/872))
 * [frontendproxy]Envoy expose a route for the collector to route frontend spans
   ([#938](https://github.com/open-telemetry/opentelemetry-demo/pull/938))
-<<<<<<< HEAD
-=======
 * [frontend] update JS SDKs to 1.15.0/0.41.0
   ([#853](https://github.com/open-telemetry/opentelemetry-demo/pull/853))
 * [shippingservice] Update Rust dependencies and add TelemetryResourceDetector
@@ -161,7 +154,6 @@ release.
   ([#1086](https://github.com/open-telemetry/opentelemetry-demo/pull/1086))
 * [TraceTests] Update span attributes to align with new IBM/sarama instrumentation
   ([#1096](https://github.com/open-telemetry/opentelemetry-demo/pull/1096))
->>>>>>> main
 
 ## 1.4.0
 

diff --git a/README.md b/README.md
@@ -54,18 +54,6 @@ We welcome any vendor to fork the project to demonstrate their services and
 adding a link below. The community is committed to maintaining the project and
 keeping it up to date for you.
 
-<<<<<<< HEAD
-|                                                                                                                   |                                                                        |                                                                                              |
-| ----------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- | -------------------------------------------------------------------------------------------- |
-| [AlibabaCloud LogService](https://github.com/aliyun-sls/opentelemetry-demo)                                       | [Elastic](https://github.com/elastic/opentelemetry-demo)               | [OpenSearch](https://github.com/opensearch-project/opentelemetry-demo)                       |
-| [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)                                    |
-| [Aspecto](https://github.com/aspecto-io/opentelemetry-demo)                                                       | [Helios](https://otelsandbox.gethelios.dev)                            | [Splunk](https://github.com/signalfx/opentelemetry-demo)                                     |
-| [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/)          |
-| [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) |
-| [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)                                 |
-| [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)         |
-| [Dynatrace](https://www.dynatrace.com/news/blog/opentelemetry-demo-application-with-dynatrace/)                   | [New Relic](https://github.com/newrelic/opentelemetry-demo)            | |
-=======
 |                                         |                             |                                                                |
 |-----------------------------------------|-----------------------------|----------------------------------------------------------------|
 | [AlibabaCloud LogService][AlibabaCloud] | [Elastic][Elastic]          | [OpenSearch][OpenSearch]                                       |
@@ -77,7 +65,6 @@ keeping it up to date for you.
 | [Coralogix][Coralogix]                  | [Kloudfuse][Kloudfuse]      | [Teletrace][Teletrace]                                         |
 | [Datadog][Datadog]                      | [Logz.io][Logzio]           | [Tracetest][Tracetest]                                         |
 | [Dynatrace][Dynatrace]                  | [New Relic][NewRelic]       | [Uptrace][Uptrace]                                             |
->>>>>>> main
 
 ## Contributing
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -645,11 +645,7 @@ services:
 
   # OpenTelemetry Collector
   otelcol:
-<<<<<<< HEAD
-    image: otel/opentelemetry-collector-contrib:0.76.1
-=======
     image: otel/opentelemetry-collector-contrib:0.91.0
->>>>>>> main
     container_name: otel-col
     deploy:
       resources:

diff --git a/kubernetes/opentelemetry-demo.yaml b/kubernetes/opentelemetry-demo.yaml
@@ -10092,11 +10092,7 @@ spec:
           - name: OTEL_EXPORTER_OTLP_ENDPOINT
             value: http://$(OTEL_COLLECTOR_NAME):4317
           - name: OTEL_RESOURCE_ATTRIBUTES
-<<<<<<< HEAD
             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
-=======
-            value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo
->>>>>>> main
           resources:
             limits:
               memory: 500Mi

diff --git a/src/accountingservice/Dockerfile b/src/accountingservice/Dockerfile
@@ -2,11 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 
-<<<<<<< HEAD
-FROM registry.ddbuild.io/images/mirror/golang:1.19-alpine AS builder
-=======
-FROM golang:1.21.4-alpine AS builder
->>>>>>> main
+FROM registry.ddbuild.io/images/mirror/golang:1.21.4-alpine AS builder
 WORKDIR /usr/src/app/
 
 COPY ./src/accountingservice/ ./

diff --git a/src/adservice/Dockerfile b/src/adservice/Dockerfile
@@ -2,11 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 
-<<<<<<< HEAD
-FROM registry.ddbuild.io/images/java:corretto-17 AS builder
-=======
-FROM eclipse-temurin:21-jdk as builder
->>>>>>> main
+FROM registry.ddbuild.io/images/mirror/eclipse-temurin:21-jdk as builder
 
 WORKDIR /usr/src/app/
 
@@ -22,15 +18,9 @@ RUN ./gradlew installDist -PprotoSourceDir=./proto
 
 # -----------------------------------------------------------------------------
 
-<<<<<<< HEAD
-FROM registry.ddbuild.io/images/java:corretto-17
-
-ARG version=1.24.0
-=======
-FROM eclipse-temurin:21-jre
+FROM registry.ddbuild.io/images/mirror/eclipse-temurin:21-jre
 
 ARG version=1.31.0
->>>>>>> main
 WORKDIR /usr/src/app/
 
 COPY --from=builder /usr/src/app/ ./

diff --git a/src/adservice/build.gradle b/src/adservice/build.gradle
@@ -4,10 +4,7 @@ plugins {
     id 'com.github.sherter.google-java-format' version '0.9'
     id 'idea'
     id 'application'
-<<<<<<< HEAD
-=======
     id 'com.github.ben-manes.versions' version '0.49.0'
->>>>>>> main
 }
 
 repositories {
@@ -19,19 +16,11 @@ description = 'Ad Service'
 group = "adservice"
 version = "0.1.0-SNAPSHOT"
 
-<<<<<<< HEAD
-def opentelemetryVersion = "1.19.0"
-def opentelemetryInstrumentationAlphaVersion = "1.19.1-alpha"
-def grpcVersion = "1.45.1"
-def jacksonVersion = "2.13.2"
-def protocVersion = "3.20.0"
-=======
 def opentelemetryVersion = "1.31.0"
 def opentelemetryInstrumentationAlphaVersion = "1.31.0-alpha"
 def grpcVersion = "1.59.0"
 def jacksonVersion = "2.15.3"
 def protocVersion = "3.25.0"
->>>>>>> main
 
 tasks.withType(JavaCompile).configureEach {
     sourceCompatibility = JavaVersion.VERSION_21
@@ -51,11 +40,7 @@ dependencies {
         implementation platform("io.opentelemetry:opentelemetry-bom:${opentelemetryVersion}")
         implementation platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${opentelemetryInstrumentationAlphaVersion}")
 
-<<<<<<< HEAD
-        implementation "com.google.api.grpc:proto-google-common-protos:2.8.0",
-=======
         implementation "com.google.api.grpc:proto-google-common-protos:2.28.0",
->>>>>>> main
                 "javax.annotation:javax.annotation-api:1.3.2",
                 "io.grpc:grpc-protobuf:${grpcVersion}",
                 "io.grpc:grpc-stub:${grpcVersion}",
@@ -64,19 +49,11 @@ dependencies {
                 "io.opentelemetry:opentelemetry-api",
                 "io.opentelemetry:opentelemetry-sdk",
                 "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations",
-<<<<<<< HEAD
-                "org.apache.logging.log4j:log4j-core:2.17.2"
-
-        runtimeOnly "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}",
-                "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}",
-                "io.netty:netty-tcnative-boringssl-static:2.0.51.Final"
-=======
                 "org.apache.logging.log4j:log4j-core:2.21.1"
 
         runtimeOnly "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}",
                 "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}",
                 "io.netty:netty-tcnative-boringssl-static:2.0.62.Final"
->>>>>>> main
     }
 }
 

diff --git a/src/adservice/gradle/wrapper/gradle-wrapper.properties b/src/adservice/gradle/wrapper/gradle-wrapper.properties
@@ -1,11 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-<<<<<<< HEAD
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
-=======
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
->>>>>>> main
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/cartservice/src/Dockerfile b/src/cartservice/src/Dockerfile
@@ -15,38 +15,22 @@
 # limitations under the License.
 
 # https://mcr.microsoft.com/v2/dotnet/sdk/tags/list
-<<<<<<< HEAD
-FROM registry.ddbuild.io/images/mirror/dotnet:sdk-7.0.305 as builder
-=======
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.100-1 AS builder
+FROM registry.ddbuild.io/images/mirror/dotnet:sdk-8.0.100-1 AS builder
 ARG TARGETARCH
->>>>>>> main
 
 WORKDIR /usr/src/app/
 
 COPY ./src/cartservice/ ./
 COPY ./pb/ ./src/protos/
 
-<<<<<<< HEAD
-RUN \
-  RUNTIME_IDENTIIFER=linux-musl-x64; \
-  if [ "$(uname -m)" = "aarch64" ]; then RUNTIME_IDENTIIFER=linux-musl-arm64; fi; \
-  dotnet restore ./src/cartservice.csproj -r $RUNTIME_IDENTIIFER && \
-  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
-=======
 RUN dotnet restore ./src/cartservice.csproj -v d -r linux-musl-$TARGETARCH
 
 RUN dotnet publish ./src/cartservice.csproj -v d -r linux-musl-$TARGETARCH --no-restore -o /cartservice
->>>>>>> main
 
 # -----------------------------------------------------------------------------
 
 # https://mcr.microsoft.com/v2/dotnet/runtime-deps/tags/list
-<<<<<<< HEAD
-FROM registry.ddbuild.io/images/mirror/dotnet/runtime-deps:7.0.8-alpine3.18
-=======
-FROM mcr.microsoft.com/dotnet/runtime-deps:8.0.0-alpine3.18
->>>>>>> main
+FROM registry.ddbuild.io/images/mirror/dotnet/runtime-deps:8.0.0-alpine3.18
 
 WORKDIR /usr/src/app/
 COPY --from=builder /cartservice/ ./