Merge pull request #150 from elastic/update-from-upstream

Update from upstream

Author: girodav

.env

@@ -1,13 +1,13 @@
 
 
 # Demo App version
-IMAGE_VERSION=2.0.0
+IMAGE_VERSION=2.0.2
 IMAGE_NAME=ghcr.io/open-telemetry/demo
 DEMO_VERSION=latest
 
 # Build Args
 TRACETEST_IMAGE_VERSION=v1.7.1
-OTEL_JAVA_AGENT_VERSION=2.13.1
+OTEL_JAVA_AGENT_VERSION=2.13.3
 OPENTELEMETRY_CPP_VERSION=1.19.0
 
 # Dependent images
@@ -133,6 +133,7 @@ SHIPPING_DOCKERFILE=./src/shipping/Dockerfile
 # Flagd
 FLAGD_HOST=flagd
 FLAGD_PORT=8013
+FLAGD_OFREP_PORT=8016
 
 # Flagd UI
 FLAGD_UI_HOST=flagd-ui

.github/workflows/ossf-scorecard.yml

@@ -0,0 +1,50 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+name: OSSF Scorecard
+
+on:
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: "25 11 * * 3"    # once a week
+  workflow_dispatch:
+
+permissions: read-all
+
+jobs:
+  analysis:
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed for Code scanning upload
+      security-events: write
+      # Needed for GitHub OIDC token if publish_results is true
+      id-token: write
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683    # v4.2.2
+        with:
+          persist-credentials: false
+
+      - uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186    # v2.4.1
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable
+      # uploads of run results in SARIF format to the repository Actions tab.
+      # https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02    # v4.6.2
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard (optional).
+      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@5f8171a638ada777af81d42b55959a643bb29017    # v3.28.12
+        with:
+          sarif_file: results.sarif

CHANGELOG.md

@@ -7,10 +7,27 @@ the release.
 
 ## Unreleased
 
+## 2.0.2
+
+* [frontend] Update OpenTelemetry Browser SDK initialization
+  ([#2092](https://github.com/open-telemetry/opentelemetry-demo/pull/2092))
+* [quote] Updated open-telemetry/exporter-otlp to 1.2.1 which includes the
+  fix for `IS_REMOTE` flag feature
+  ([#2112](https://github.com/open-telemetry/opentelemetry-demo/pull/2112))
+* [load-generator] Change OpenFeature Evaluation to Remote Evaluation Protocol,
+  based on [this issue in OpenFeature/python-sdk-contrib](https://github.com/open-feature/python-sdk-contrib/issues/198)
+  ([#2114](https://github.com/open-telemetry/opentelemetry-demo/pull/2114))
+* [flagd-ui] increase memory to 100MB
+  ([#2120](https://github.com/open-telemetry/opentelemetry-demo/pull/2120))
+
+## 2.0.1
+
 * [chore] Use Linkspector to check links
   ([#2070](https://github.com/open-telemetry/opentelemetry-demo/pull/2070))
 * [frontend] Cypress tests base image updated to 14.0.3
   ([#2072](https://github.com/open-telemetry/opentelemetry-demo/pull/2072))
+* [grafana] Update dashboards with service map
+  ([#2085](https://github.com/open-telemetry/opentelemetry-demo/pull/2085))
 
 ## 2.0.0
 

CONTRIBUTING.md

@@ -296,13 +296,17 @@ Maintainers can create a new release when desired by following these steps.
    notes.
 3. After images for the new release are built and published, create a new Pull
    Request that updates the `CHANGELOG.md` with the new version leaving the
-   `Unreleased` section for the next release.
+   `Unreleased` section for the next release. Merge the Pull Request.
 4. Create a new Pull Request to update the deployment of the demo in the
    [OpenTelemetry Helm
    Charts](https://github.com/open-telemetry/opentelemetry-helm-charts) repo.
+   Merge the Pull Request.
 5. After the Helm chart is released, create a new Pull Request which updates the
-   Demo's Kubernetes manifest by running `make generate-kubernetes-manifests`
-   and committing the changes.
+   Demo's Kubernetes manifest by running `make generate-kubernetes-manifests`.
+   Merge the Pull Request.
+6. Create a new Tag for the _new_ version with a suffix of `-k8s`. This tag
+   will be used to deploy the new version of the demo to Kubernetes using the
+   supplied manifests.
 
 [docs]: https://opentelemetry.io/docs/demo/
 

Makefile

@@ -94,7 +94,7 @@ install-tools: $(MISSPELL)
 
 .PHONY: build
 build:
-	$(DOCKER_COMPOSE_CMD) build $(DOCKER_COMPOSE_BUILD_ARGS)
+	$(DOCKER_COMPOSE_CMD) $(DOCKER_COMPOSE_ENV) build $(DOCKER_COMPOSE_BUILD_ARGS)
 
 .PHONY: build-and-push
 build-and-push:

README.md

@@ -58,22 +58,23 @@ keeping it up to date for you.
 
 |                           |                |                                  |
 |---------------------------|----------------|----------------------------------|
-| [AlibabaCloud LogService] | [Elastic]      | [OpenSearch]                     |
-| [AppDynamics]             | [Google Cloud] | [Oracle]                         |
-| [Aspecto]                 | [Grafana Labs] | [Sentry]                         |
-| [Axiom]                   | [Guance]       | [ServiceNow Cloud Observability] |
-| [Axoflow]                 | [Honeycomb.io] | [Splunk]                         |
-| [Azure Data Explorer]     | [Instana]      | [Sumo Logic]                     |
-| [Coralogix]               | [Kloudfuse]    | [TelemetryHub]                   |
-| [Dash0]                   | [Liatrio]      | [Teletrace]                      |
-| [Datadog]                 | [Logz.io]      | [Tracetest]                      |
-| [Dynatrace]               | [New Relic]    | [Uptrace]                        |
+| [AlibabaCloud LogService] | [Google Cloud] |  [Sentry]                        |
+| [AppDynamics]             | [Grafana Labs] |  [ServiceNow Cloud Observability]|
+| [Aspecto]                 | [Guance]       |  [SigNoz]                        |
+| [Axiom]                   | [Honeycomb.io] |  [Splunk]                        |
+| [Axoflow]                 | [Instana]      |  [Sumo Logic]                    |
+| [Azure Data Explorer]     | [Kloudfuse]    |  [TelemetryHub]                  |
+| [Coralogix]               | [Liatrio]      |  [Teletrace]                     |
+| [Dash0]                   | [Logz.io]      |  [Tracetest]                     |
+| [Datadog]                 | [New Relic]    |  [Uptrace]                       |
+| [Dynatrace]               | [OpenSearch]   |                                  |
+| [Elastic]                 | [Oracle]       |                                  |
 
 ## Contributing
 
 To get involved with the project see our [CONTRIBUTING](CONTRIBUTING.md)
 documentation. Our [SIG Calls](CONTRIBUTING.md#join-a-sig-call) are every other
-Monday at 8:30 AM PST and anyone is welcome.
+Wednesday at 8:30 AM PST and anyone is welcome.
 
 ## Project leadership
 
@@ -132,6 +133,7 @@ Emeritus:
 [Oracle]: https://github.com/oracle-quickstart/oci-o11y-solutions/blob/main/knowledge-content/opentelemetry-demo
 [Sentry]: https://github.com/getsentry/opentelemetry-demo
 [ServiceNow Cloud Observability]: https://docs.lightstep.com/otel/quick-start-operator#send-data-from-the-opentelemetry-demo
+[SigNoz]: https://signoz.io/blog/opentelemetry-demo/
 [Splunk]: https://github.com/signalfx/opentelemetry-demo
 [Sumo Logic]: https://www.sumologic.com/blog/common-opentelemetry-demo-application/
 [TelemetryHub]: https://github.com/TelemetryHub/opentelemetry-demo/tree/telemetryhub-backend

docker-compose.minimal.yml

@@ -345,7 +345,7 @@ services:
       - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
       - LOCUST_WEB_HOST=0.0.0.0
       - FLAGD_HOST
-      - FLAGD_PORT
+      - FLAGD_OFREP_PORT
     depends_on:
       frontend:
         condition: service_started
@@ -522,7 +522,8 @@ services:
       "file:./etc/flagd/demo.flagd.json"
     ]
     ports:
-      - 8013
+      - "${FLAGD_PORT}"
+      - "${FLAGD_OFREP_PORT}"
     volumes:
       - ./src/flagd:/etc/flagd
     logging:

docker-compose.yml

@@ -421,7 +421,7 @@ services:
       - PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
       - LOCUST_WEB_HOST=0.0.0.0
       - FLAGD_HOST
-      - FLAGD_PORT
+      - FLAGD_OFREP_PORT
     depends_on:
       frontend:
         condition: service_started
@@ -608,7 +608,8 @@ services:
       "file:./etc/flagd/demo.flagd.json"
     ]
     ports:
-      - 8013
+      - "${FLAGD_PORT}"
+      - "${FLAGD_OFREP_PORT}"
     volumes:
       - ./src/flagd:/etc/flagd
     logging:
@@ -624,7 +625,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 75M
+          memory: 100M
     restart: unless-stopped
     environment:
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}