Opensearch monitoring prometheus metrics

.env

@@ -65,7 +65,7 @@ FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}
 # Load Generator
 LOCUST_WEB_PORT=8089
 LOCUST_USERS=10
-LOCUST_HOST=http://${FRONTEND_PROXY_ADDR}
+LOCUST_HOST=http://${NGINX_ADDR}
 LOCUST_WEB_HOST=loadgenerator
 LOCUST_AUTOSTART=true
 LOCUST_HEADLESS=false

.github/workflows/build-images.yml

@@ -58,6 +58,9 @@ jobs:
  - file: ./src/loadgenerator/Dockerfile
  tag_suffix: loadgenerator
  context: ./
+ - file: ./src/otelcollector/Dockerfile
+ tag_suffix: otelcollector
+ context: ./
  - file: ./src/paymentservice/Dockerfile
  tag_suffix: paymentservice
  context: ./
@@ -111,6 +114,8 @@ jobs:
 
  - name: Set up QEMU
  uses: docker/setup-qemu-action@v2
+ with:
+ image: tonistiigi/binfmt:master
 
  - name: Set up Docker Buildx
  uses: docker/setup-buildx-action@v2
@@ -120,7 +125,7 @@ jobs:
  max-parallelism = 2
 
  - name: Matrix Build and push demo images
- uses: docker/[email protected].0
+ uses: docker/[email protected].1
  with:
  context: ${{ matrix.file_tag.context }}
  file: ${{ matrix.file_tag.file }}

.github/workflows/checks.yml

@@ -3,8 +3,11 @@
 name: Checks
 
 on:
+ push:
+ branches: [ main ]
  pull_request:
  branches: [ main ]
+ workflow_dispatch:
 
 jobs:
  build_images:

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

@@ -15,4 +15,4 @@ jobs:
  steps:
  - uses: actions/checkout@v3
 
- - uses: gradle/wrapper-validation-action@v1.0.6
+ - uses: gradle/wrapper-validation-action@v1.1.0

.gitignore

@@ -45,6 +45,7 @@ src/shippingservice/target/
 /src/featureflagservice/src/ffs_demo_pb.erl
 /src/featureflagservice/src/ffs_service_*.erl
 /src/featureflagservice/src/oteldemo_*.erl
+/src/frauddetectionservice/src/main/proto
 /src/frontend/pb/
 /src/frontend/protos/
 /src/paymentservice/demo.proto

CHANGELOG.md

@@ -49,6 +49,24 @@ release.
  ([#872](https:/open-telemetry/opentelemetry-demo/pull/872))
 * [frontendproxy]Envoy expose a route for the collector to route frontend spans
  ([#938](https:/open-telemetry/opentelemetry-demo/pull/938))
+* [frontend] update JS SDKs to 1.15.0/0.41.0
+ ([#853](https:/open-telemetry/opentelemetry-demo/pull/853))
+* [shippingservice] Update Rust dependencies and add TelemetryResourceDetector
+ ([#972](https:/open-telemetry/opentelemetry-demo/pull/972))
+* Update frontendproxy's env for minimal
+ ([#983](https:/open-telemetry/opentelemetry-demo/pull/983))
+* [FeatureFlagService] Update dependencies
+ ([#992](https:/open-telemetry/opentelemetry-demo/pull/992))
+* [currencyService] Update OTel dependency
+ ([#991](https:/open-telemetry/opentelemetry-demo/pull/991))
+* [LoadGenerator & RecommendatationService] update dependencies
+ ([#988](https:/open-telemetry/opentelemetry-demo/pull/988))
+* [FraudDetectionService] Updated Kotlin version and OTel dependencies
+ ([#987](https:/open-telemetry/opentelemetry-demo/pull/987))
+* [otelcol] Use the collector builder to produce otelcol docker image
+ ([#944](https:/open-telemetry/opentelemetry-demo/pull/944))
+* [quoteservice] update php dependencies
+ ([#994](https:/open-telemetry/opentelemetry-demo/issues/994))
 
 ## 1.4.0
 

README.md

@@ -53,16 +53,16 @@ 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.
 
-| | | |
-| ----------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- | -------------------------------------------------------------------------------------------- |
-| [AlibabaCloud LogService](https:/aliyun-sls/opentelemetry-demo) | [Elastic](https:/elastic/opentelemetry-demo) | [OpenSearch](https:/opensearch-project/opentelemetry-demo) |
-| [AppDynamics](https://www.appdynamics.com/blog/cloud/how-to-observe-opentelemetry-demo-app-in-appdynamics-cloud/) | [Grafana Labs](https:/grafana/opentelemetry-demo) | [Sentry](https://github.com/getsentry/opentelemetry-demo)  |
-| [Aspecto](https:/aspecto-io/opentelemetry-demo) | [Helios](https://otelsandbox.gethelios.dev) | [Splunk](https:/signalfx/opentelemetry-demo) |
-| [Axiom](https://play.axiom.co/axiom-play-qf1k/dashboards/otel.traces.otel-demo-traces) | [Honeycomb.io](https:/honeycombio/opentelemetry-demo) | [Sumo Logic](https://www.sumologic.com/blog/common-opentelemetry-demo-application/) |
-| [Azure Data Explorer](https:/Azure/Azure-kusto-opentelemetry-demo) | [Instana](https:/instana/opentelemetry-demo) | [TelemetryHub](https:/TelemetryHub/opentelemetry-demo/tree/telemetryhub-backend) |
-| [Coralogix](https://coralogix.com/blog/configure-otel-demo-send-telemetry-data-coralogix) | [Kloudfuse](https:/kloudfuse/opentelemetry-demo) | [Teletrace](https:/teletrace/opentelemetry-demo) |
-| [Datadog](https:/DataDog/opentelemetry-demo) | [Lightstep](https:/lightstep/opentelemetry-demo) | [Uptrace](https:/uptrace/uptrace/tree/master/example/opentelemetry-demo) |
-| [Dynatrace](https://www.dynatrace.com/news/blog/opentelemetry-demo-application-with-dynatrace/) | [New Relic](https:/newrelic/opentelemetry-demo) | |
+| | |  |
+|-------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------|
+| [AlibabaCloud LogService](https:/aliyun-sls/opentelemetry-demo) | [Elastic](https:/elastic/opentelemetry-demo) | [Sentry](https:/getsentry/opentelemetry-demo)  |
+| [AppDynamics](https://www.appdynamics.com/blog/cloud/how-to-observe-opentelemetry-demo-app-in-appdynamics-cloud/) | [Grafana Labs](https:/grafana/opentelemetry-demo) | [ServiceNow Cloud Observability](https://docs.lightstep.com/otel/quick-start-operator#send-data-from-the-opentelemetry-demo) |
+| [Aspecto](https:/aspecto-io/opentelemetry-demo) | [Helios](https://otelsandbox.gethelios.dev) | [Splunk](https:/signalfx/opentelemetry-demo)  |
+| [Axiom](https://play.axiom.co/axiom-play-qf1k/dashboards/otel.traces.otel-demo-traces) | [Honeycomb.io](https:/honeycombio/opentelemetry-demo) | [Sumo Logic](https://www.sumologic.com/blog/common-opentelemetry-demo-application/)  |
+| [Azure Data Explorer](https:/Azure/Azure-kusto-opentelemetry-demo) | [Instana](https:/instana/opentelemetry-demo) | [TelemetryHub](https:/TelemetryHub/opentelemetry-demo/tree/telemetryhub-backend)  |
+| [Coralogix](https://coralogix.com/blog/configure-otel-demo-send-telemetry-data-coralogix) | [Kloudfuse](https:/kloudfuse/opentelemetry-demo) | [Teletrace](https:/teletrace/opentelemetry-demo)  |
+| [Datadog](https:/DataDog/opentelemetry-demo) | [New Relic](https:/newrelic/opentelemetry-demo)  | [Uptrace](https:/uptrace/uptrace/tree/master/example/opentelemetry-demo)  |
+| [Dynatrace](https://www.dynatrace.com/news/blog/opentelemetry-demo-application-with-dynatrace/) | [OpenSearch](https:/opensearch-project/opentelemetry-demo) |   |
 
 ## Contributing
 

docker-compose.minimal.yml

@@ -255,6 +255,7 @@ services:
  - JAEGER_SERVICE_HOST
  - OTEL_COLLECTOR_HOST
  - OTEL_COLLECTOR_PORT_GRPC
+ - OTEL_COLLECTOR_PORT_HTTP
  - ENVOY_PORT
  depends_on:
  frontend:
@@ -288,7 +289,8 @@ services:
  - LOCUST_HOST
  - LOCUST_HEADLESS
  - LOCUST_AUTOSTART
- - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:4318/v1/traces
+ - OTEL_EXPORTER_OTLP_ENDPOINT
+ - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_SERVICE_NAME=loadgenerator
  - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python

docker-compose.yml

@@ -320,47 +320,6 @@
  condition: service_started
  logging: *logging
 
- # Frontend Proxy (Envoy)
- frontendproxy:
- image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontendproxy
- container_name: frontend-proxy
- build:
- context: ./
- dockerfile: src/frontendproxy/Dockerfile
- deploy:
- resources:
- limits:
- memory: 50M
- ports:
- - "${ENVOY_PORT}:${ENVOY_PORT}"
- - 10000:10000
- environment:
- - FRONTEND_PORT
- - FRONTEND_HOST
- - FEATURE_FLAG_SERVICE_PORT
- - FEATURE_FLAG_SERVICE_HOST
- - LOCUST_WEB_HOST
- - LOCUST_WEB_PORT
- - GRAFANA_SERVICE_PORT
- - GRAFANA_SERVICE_HOST
- - JAEGER_SERVICE_PORT
- - JAEGER_SERVICE_HOST
- - OTEL_COLLECTOR_HOST
- - OTEL_COLLECTOR_PORT_GRPC
- - OTEL_COLLECTOR_PORT_HTTP
- - ENVOY_PORT
- depends_on:
- frontend:
- condition: service_started
- featureflagservice:
- condition: service_started
- loadgenerator:
- condition: service_started
- jaeger:
- condition: service_started
- grafana:
- condition: service_started
-
  # Load Generator
  loadgenerator:
  image: ${IMAGE_NAME}:${IMAGE_VERSION}-loadgenerator
@@ -383,7 +342,8 @@
  - LOCUST_HOST
  - LOCUST_HEADLESS
  - LOCUST_AUTOSTART
- - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:4318/v1/traces
+ - OTEL_EXPORTER_OTLP_ENDPOINT
+ - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
  - OTEL_RESOURCE_ATTRIBUTES
  - OTEL_SERVICE_NAME=loadgenerator
  - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
@@ -726,8 +686,13 @@
 
  # OpenTelemetry Collector
  otelcol:
- image: otel/opentelemetry-collector-contrib:0.76.1
+ image: ${IMAGE_NAME}:${IMAGE_VERSION}-otelcol
  container_name: otel-col
+ build:
+ context: ./
+ dockerfile: ./src/otelcollector/Dockerfile
+ cache_from:
+ - ${IMAGE_NAME}:${IMAGE_VERSION}-otelcol
  deploy:
  resources:
  limits:
@@ -773,25 +738,27 @@
  logging: *logging
 
  # OpenSearch store - node1
  opensearch-node1: # This is also the hostname of the container within the Docker network (i.e. https://opensearch-node1/)
- image: opensearchproject/opensearch:2.8.0 # Specifying the latest available image - modify if you want a specific version
  container_name: opensearch-node1
+ build:
+ context: ./
+ dockerfile: ./src/opensearch/Dockerfile
  environment:
  - cluster.name=opensearch-cluster # Name the cluster
  - node.name=opensearch-node1 # Name the node that will run in this container
  - discovery.seed_hosts=opensearch-node1,opensearch-node2 # Nodes to look for when discovering the cluster
  - cluster.initial_cluster_manager_nodes=opensearch-node1,opensearch-node2 # Nodes eligible to serve as cluster manager
  - bootstrap.memory_lock=true # Disable JVM heap memory swapping
  - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" # Set min and max JVM heap sizes to at least 50% of system RAM
  ulimits:
  memlock:
  soft: -1 # Set memlock to unlimited (no soft or hard limit)
  hard: -1
  nofile:
  soft: 65536 # Maximum number of open files for the opensearch user - set to at least 65536
  hard: 65536
  volumes:
  - opensearch-data1:/usr/share/opensearch/data # Creates volume called opensearch-data1 and mounts it to the container
  healthcheck:
  test: ["CMD", "curl", "-f", "https://opensearch-node1:9200/_cluster/health?wait_for_status=yellow", "-ku admin:admin"]
  interval: 5s
@@ -803,8 +770,10 @@
 
  # OpenSearch store - node2
  opensearch-node2:
- image: opensearchproject/opensearch:2.8.0 # This should be the same image used for opensearch-node1 to avoid issues
  container_name: opensearch-node2
+ build:
+ context: ./
+ dockerfile: ./src/opensearch/Dockerfile
  environment:
  - cluster.name=opensearch-cluster
  - node.name=opensearch-node2
@@ -824,7 +793,7 @@
 
  # OpenSearch store - dashboard
  opensearch-dashboards:
- image: opensearchproject/opensearch-dashboards:2.8.0 # Make sure the version of opensearch-dashboards matches the version of opensearch installed on other nodes
+ image: opensearchproject/opensearch-dashboards:${VERSION} # Make sure the version of opensearch-dashboards matches the version of opensearch installed on other nodes
  container_name: opensearch-dashboards
  ports:
  - 5601:5601 # Map host port 5601 to container port 5601
@@ -980,8 +949,6 @@
  interval: 1s
  timeout: 3s
  retries: 60
- environment:
- TRACETEST_DEV: ${TRACETEST_DEV}
 
  tracetest-postgres:
  image: postgres:14

src/adservice/Dockerfile

@@ -20,7 +20,7 @@ RUN ./gradlew installDist -PprotoSourceDir=./proto
 
 FROM eclipse-temurin:17-jre
 
-ARG version=1.24.0
+ARG version=1.28.0
 WORKDIR /usr/src/app/
 
 COPY --from=builder /usr/src/app/ ./

src/adservice/build.gradle

@@ -1,9 +1,10 @@
 
 plugins {
- id 'com.google.protobuf' version '0.8.18'
+ id 'com.google.protobuf' version '0.9.4'
  id 'com.github.sherter.google-java-format' version '0.9'
  id 'idea'
  id 'application'
+ id 'com.github.ben-manes.versions' version '0.47.0'
 }
 
 repositories {
@@ -15,10 +16,10 @@ description = 'Ad Service'
 group = "adservice"
 version = "0.1.0-SNAPSHOT"
 
-def opentelemetryVersion = "1.19.0"
-def opentelemetryInstrumentationAlphaVersion = "1.19.1-alpha"
-def grpcVersion = "1.45.2"
-def jacksonVersion = "2.13.4.1"
+def opentelemetryVersion = "1.28.0"
+def opentelemetryInstrumentationAlphaVersion = "1.28.0-alpha"
+def grpcVersion = "1.56.1"
+def jacksonVersion = "2.15.2"
 def protocVersion = "3.20.0"
 
 tasks.withType(JavaCompile) {
@@ -38,7 +39,7 @@ dependencies {
  implementation platform("io.opentelemetry:opentelemetry-bom:${opentelemetryVersion}")
  implementation platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${opentelemetryInstrumentationAlphaVersion}")
 
- implementation "com.google.api.grpc:proto-google-common-protos:2.8.0",
+ implementation "com.google.api.grpc:proto-google-common-protos:2.22.1",
  "javax.annotation:javax.annotation-api:1.3.2",
  "io.grpc:grpc-protobuf:${grpcVersion}",
  "io.grpc:grpc-stub:${grpcVersion}",
@@ -47,11 +48,11 @@ dependencies {
  "io.opentelemetry:opentelemetry-api",
  "io.opentelemetry:opentelemetry-sdk",
  "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations",
- "org.apache.logging.log4j:log4j-core:2.17.2"
+ "org.apache.logging.log4j:log4j-core:2.20.0"
 
  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"
+ "io.netty:netty-tcnative-boringssl-static:2.0.61.Final"
  }
 }
 

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

@@ -1,5 +1,6 @@
+#Wed Jul 19 11:27:42 EDT 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

src/adservice/src/main/java/oteldemo/AdService.java

@@ -1,17 +1,12 @@
 /*
-* Copyright The OpenTelemetry Authors
-* SPDX-License-Identifier: Apache-2.0
-*/
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 package oteldemo;
 
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.Iterables;
-import oteldemo.Demo.Ad;
-import oteldemo.Demo.AdRequest;
-import oteldemo.Demo.AdResponse;
-import oteldemo.Demo.GetFlagResponse;
-import oteldemo.FeatureFlagServiceGrpc.FeatureFlagServiceBlockingStub;
 import io.grpc.*;
 import io.grpc.health.v1.HealthCheckResponse.ServingStatus;
 import io.grpc.protobuf.services.*;
@@ -36,6 +31,11 @@
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import oteldemo.Demo.Ad;
+import oteldemo.Demo.AdRequest;
+import oteldemo.Demo.AdResponse;
+import oteldemo.Demo.GetFlagResponse;
+import oteldemo.FeatureFlagServiceGrpc.FeatureFlagServiceBlockingStub;
 
 public final class AdService {
 
@@ -73,12 +73,12 @@ private void start() throws IOException {
  healthMgr = new HealthStatusManager();
 
  String featureFlagServiceAddr =
- Optional.ofNullable(System.getenv("FEATURE_FLAG_GRPC_SERVICE_ADDR"))
- .orElse("");
+ Optional.ofNullable(System.getenv("FEATURE_FLAG_GRPC_SERVICE_ADDR")).orElse("");
  FeatureFlagServiceBlockingStub featureFlagServiceStub = null;
  if (!featureFlagServiceAddr.isEmpty()) {
- featureFlagServiceStub = oteldemo.FeatureFlagServiceGrpc.newBlockingStub(
- ManagedChannelBuilder.forTarget(featureFlagServiceAddr).usePlaintext().build());
+ featureFlagServiceStub =
+ oteldemo.FeatureFlagServiceGrpc.newBlockingStub(
+ ManagedChannelBuilder.forTarget(featureFlagServiceAddr).usePlaintext().build());
  }
 
  server =

src/cartservice/src/Dockerfile

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # https://mcr.microsoft.com/v2/dotnet/sdk/tags/list
-FROM mcr.microsoft.com/dotnet/sdk:7.0.304 AS builder
+FROM mcr.microsoft.com/dotnet/sdk:6.0.412 AS builder
 
 WORKDIR /usr/src/app/
 
@@ -25,13 +25,17 @@ COPY ./pb/ ./src/protos/
 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
+ dotnet restore ./src/cartservice.csproj -v d -r $RUNTIME_IDENTIIFER
+
+RUN \
+ RUNTIME_IDENTIIFER=linux-musl-x64; \
+ if [ "$(uname -m)" = "aarch64" ]; then RUNTIME_IDENTIIFER=linux-musl-arm64; fi; \
+ dotnet publish ./src/cartservice.csproj -v d -p:PublishSingleFile=true -r $RUNTIME_IDENTIIFER --self-contained true -p:PublishTrimmed=False -p:TrimMode=Link -c Release -o /cartservice --no-restore
 
 # -----------------------------------------------------------------------------
 
 # https://mcr.microsoft.com/v2/dotnet/runtime-deps/tags/list
-FROM mcr.microsoft.com/dotnet/runtime-deps:7.0.7-alpine3.17
+FROM mcr.microsoft.com/dotnet/runtime-deps:6.0.15-alpine3.16
 
 WORKDIR /usr/src/app/
 COPY --from=builder /cartservice/ ./