version bump up to 1.4.0 beta (#7)

* Changelog entry for PR 797 (open-telemetry#803) * Changelog entry for PR 797 * Changelog ordered * lint fix * Move Michael Maxwell to Emeritus (open-telemetry#800) Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com> Co-authored-by: Juliano Costa <julianocosta89@outlook.com> * Bump actions/stale from 7 to 8 (open-telemetry#804) Bumps [actions/stale](https://github.com/actions/stale) from 7 to 8. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](actions/stale@v7...v8) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * use absolute path (open-telemetry#806) Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * use yamllint 1.3.0 (open-telemetry#807) Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * [chore] add kubernetes manifest (open-telemetry#791) * add kubernetes manifest Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * add kubernetes manifest Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * use absolute path Signed-off-by: Pierre Tessier <pierre@pierretessier.com> --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Juliano Costa <julianocosta89@outlook.com> * Cart Service - minor cleanup (open-telemetry#801) * Cart Service - minor cleanup * fix file encoding Signed-off-by: Pierre Tessier <pierre@pierretessier.com> --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Pierre Tessier <pierre@pierretessier.com> * [frontend] update JS SDKs (open-telemetry#805) * update JS SDKs Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * update JS SDKs for frontend Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * fix formatting Signed-off-by: Pierre Tessier <pierre@pierretessier.com> --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Juliano Costa <julianocosta89@outlook.com> Co-authored-by: Austin Parker <austin@ap2.io> * Otlp env variables (open-telemetry#809) * standardize OTEL_* env vars Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * standardize OTEL_* env vars Signed-off-by: Pierre Tessier <pierre@pierretessier.com> --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Juliano Costa <julianocosta89@outlook.com> * [frontend] fix http.status_code on error (open-telemetry#810) * fix http.status_code on error Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * only end span when synthetic Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * fix http.status_code on error Signed-off-by: Pierre Tessier <pierre@pierretessier.com> --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * Fix to shipping calculation (open-telemetry#814) * reduce kafka mem allocation (open-telemetry#798) * add kafka mem allocation to changelog (open-telemetry#817) * Changed web tracer to use batch processor (open-telemetry#819) * Updated ENV_PLATFORM flag (open-telemetry#818) * Added elastic's forked opentelemetry demo repo (open-telemetry#813) * Update collector (open-telemetry#822) * use async php runtime (open-telemetry#823) * use async php runtime To better demonstrate PHP's capabilities, use an async runtime (react/http). This means that batch exporters (traces and metrics) are long-lived and more efficient, and they can now use export delays to only send batches after the configured time has elapsed. Update auto-instrumentation extension to install from PECL (the preferred mechanism, which we've just set up), and bump other dependencies to their latest beta versions. * update changelog * Add license check (open-telemetry#825) * adding license check * add/update copyrights * add checklicense to gh checks * add make target to add license * fixup * swap to short form license * add copyright to yaml * and the rest of the yaml * fixup * address comments * fix prometheus scrape bug (open-telemetry#827) Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> Co-authored-by: Austin Parker <austin@ap2.io> * prep for beta (open-telemetry#828) --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> Co-authored-by: Devrim Demiroz <62701796+devrimdemiroz@users.noreply.github.com> Co-authored-by: Reiley Yang <reyang@microsoft.com> Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com> Co-authored-by: Juliano Costa <julianocosta89@outlook.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Austin Parker <austin@ap2.io> Co-authored-by: Martin Kuba <martin@martinkuba.com> Co-authored-by: Bahubali Shetti <billshetti@gmail.com> Co-authored-by: Brett McBride <brett@deakin.edu.au> Co-authored-by: Ziqi Zhao <zhaoziqi9146@gmail.com>
openinsight-proj · Apr 10, 2023 · 5473c7c · 5473c7c
1 parent 77a329c
commit 5473c7c
Show file tree

Hide file tree

Showing 243 changed files with 9,713 additions and 4,315 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,16 +1,4 @@
-# Copyright The OpenTelemetry Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+
 
 .github
 docs

diff --git a/.env b/.env
@@ -1,19 +1,7 @@
-# Copyright The OpenTelemetry Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+
 
 # Images
-IMAGE_VERSION=1.3.1
+IMAGE_VERSION=1.4.0-beta
 IMAGE_NAME=ghcr.io/open-telemetry/demo
 
 # Demo Platform
@@ -23,16 +11,8 @@ ENV_PLATFORM=local
 OTEL_COLLECTOR_HOST=otelcol
 OTEL_COLLECTOR_PORT=4317
 OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT}
-OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}
-OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}
-OTEL_EXPORTER_OTLP_LOGS_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}
 PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4318/v1/traces
 
-# Exporter protocol configuration
-OTEL_TRACES_EXPORTER=otlp
-OTEL_METRICS_EXPORTER=otlp
-OTEL_LOGS_EXPORTER=otlp
-
 # OpenTelemetry Resource Definitions
 OTEL_RESOURCE_ATTRIBUTES="service.namespace=opentelemetry-demo"
 

diff --git a/.gitattributes b/.gitattributes
@@ -1,16 +1,4 @@
-# Copyright The OpenTelemetry Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+
 
 * text=auto
 

diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -1,3 +1,5 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
 # this file is used by .github/workflows/assign-reviewers.yml
 components:
   src/adservice:

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,3 +1,5 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
 version: 2
 updates:
   - package-ecosystem: "github-actions"

diff --git a/.github/workflows/assign-reviewers.yml b/.github/workflows/assign-reviewers.yml
@@ -1,3 +1,5 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
 # assigns reviewers to pull requests in a similar way as CODEOWNERS, but doesn't require reviewers
 # to have write access to the repository
 # see .github/component_owners.yaml for the list of components and their owners

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -1,3 +1,5 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
 name: Checks
 
 on:
@@ -62,3 +64,13 @@ jobs:
 
     - name: run sanitycheck.py
       run: python3 ./internal/tools/sanitycheck.py
+
+  checklicense:
+    runs-on: ubuntu-latest
+    steps:
+    - name: check out code
+      uses: actions/checkout@v3
+    - name: install tools
+      run: make install-tools
+    - name: run checklicense
+      run: make checklicense
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -1,3 +1,5 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
 name: Gradle wrapper validation
 on:
   pull_request:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,3 +1,5 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
 name: "Build and Publish"
 
 on:

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -1,3 +1,5 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
 # Syntax: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
 # Github Actions Stale: https://github.com/actions/stale
 
@@ -10,7 +12,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v8
         with:
           stale-pr-message: 'This PR was marked stale due to lack of activity. It will be closed in 7 days.'
           close-pr-message: 'Closed as inactive. Feel free to reopen if this PR is still being worked on.'

diff --git a/.gitignore b/.gitignore
@@ -1,16 +1,4 @@
-# Copyright The OpenTelemetry Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+
 
 *~
 *.iml

diff --git a/.licenserc.json b/.licenserc.json
@@ -0,0 +1,38 @@
+{
+    "**/*.{go,cs,h,cpp,js,ts,tsx,rs}": [
+      "// Copyright The OpenTelemetry Authors",
+      "// SPDX-License-Identifier: Apache-2.0"
+    ],
+    "**/*.php": [
+      "<?php",
+      "// Copyright The OpenTelemetry Authors",
+      "// SPDX-License-Identifier: Apache-2.0"
+    ],
+    "**/*.java": [
+      "/*",
+      "* Copyright The OpenTelemetry Authors",
+      "* SPDX-License-Identifier: Apache-2.0",
+      "*/"
+    ],
+    "**/*.py": [
+      "#!/usr/bin/python",
+      "# Copyright The OpenTelemetry Authors",
+      "# SPDX-License-Identifier: Apache-2.0"
+    ],
+    "**/*.{ex,exs,rb,yaml,yml,sh,yamllint}": [
+      "# Copyright The OpenTelemetry Authors",
+      "# SPDX-License-Identifier: Apache-2.0"
+    ],
+    "**/{Dockerfile,Makefile}": [
+      "# Copyright The OpenTelemetry Authors",
+      "# SPDX-License-Identifier: Apache-2.0"
+    ],
+    "ignore": [
+        "node_modules/",
+        "src/cartservice/src/obj/",
+        "src/cartservice/tests/obj/",
+        "src/featureflagservice/assets/vendor/",
+        "src/featureflagservice/priv/",
+        "internal/tools/"
+    ]
+  }
diff --git a/.markdownlint.yaml b/.markdownlint.yaml
@@ -1,16 +1,5 @@
 # Copyright The OpenTelemetry Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
 
 # Default state for all rules
 default: true

diff --git a/.yamllint b/.yamllint
@@ -1,17 +1,5 @@
 # Copyright The OpenTelemetry Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
+# SPDX-License-Identifier: Apache-2.0
 extends: default
 
 ignore-from-file: [.gitignore, .yamlignore]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,18 +7,36 @@ release.
 
 ## Unreleased
 
-* spanmetrics dashboard service&operation rates%latencies
-([#787](https://github.com/open-telemetry/opentelemetry-demo/pull/787))
 * [cart] use 60m TTL for cart entries in redis
-([#779](https://github.com/open-telemetry/opentelemetry-demo/pull/779))
+  ([#779](https://github.com/open-telemetry/opentelemetry-demo/pull/779))
+* spanmetrics dashboard service&operation rates & latencies
+  ([#787](https://github.com/open-telemetry/opentelemetry-demo/pull/787))
+* Adds Kubernetes manifests for the demo
+  ([#791](https://github.com/open-telemetry/opentelemetry-demo/pull/791))
 * [bug] fixing quoteservice metrics exporting (PHP)
-([#793](https://github.com/open-telemetry/opentelemetry-demo/pull/793))
+  ([#793](https://github.com/open-telemetry/opentelemetry-demo/pull/793))
 * Added app.session.id attribute to frontend spans
-([#795](https://github.com/open-telemetry/opentelemetry-demo/pull/795))
+  ([#795](https://github.com/open-telemetry/opentelemetry-demo/pull/795))
 * Add logs for Ad service and Recommendation service
-([#796](https://github.com/open-telemetry/opentelemetry-demo/pull/796))
+  ([#796](https://github.com/open-telemetry/opentelemetry-demo/pull/796))
+* Opentelemetry Collector Data Flow Dashboard
+  ([#797](https://github.com/open-telemetry/opentelemetry-demo/pull/797))
 * Fixed shipping update in the frontend UI when number of products in cart changes
-([#799](https://github.com/open-telemetry/opentelemetry-demo/pull/799))
+  ([#799](https://github.com/open-telemetry/opentelemetry-demo/pull/799))
+* Update frontend JavaScript SDKs to: 1.10.1/0.36.x
+  ([#805](https://github.com/open-telemetry/opentelemetry-demo/pull/805))
+* Fix http.status_code on error in frontend
+  ([#810](https://github.com/open-telemetry/opentelemetry-demo/pull/810))
+* Fix bug in shipping calculation
+  ([#814](https://github.com/open-telemetry/opentelemetry-demo/pull/814))
+* Reduce Kafka mem allocation
+  ([#798](https://github.com/open-telemetry/opentelemetry-demo/pull/798))
+* Updated frontend web tracer to us batch processor
+  ([#819](https://github.com/open-telemetry/opentelemetry-demo/pull/819))
+* Moved env platform flag to the footer, changed it to free text
+  ([#818](https://github.com/open-telemetry/opentelemetry-demo/pull/818))
+* Update OTel Collector
+  ([#822](https://github.com/open-telemetry/opentelemetry-demo/pull/822))
 
 ## v0.1.0
 
@@ -281,3 +299,5 @@ significant modifications will be credited to OpenTelemetry Authors.
   ([#764](https://github.com/open-telemetry/opentelemetry-demo/pull/764))
 * [chore] align memory limits with Helm chart
   ([#781](https://github.com/open-telemetry/opentelemetry-demo/pull/781))
+* Use an async PHP runtime, bump versions to latest betas
+  ([#823](https://github.com/open-telemetry/opentelemetry-demo/pull/823))
diff --git a/Makefile b/Makefile
@@ -1,16 +1,6 @@
 # Copyright The OpenTelemetry Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
+
 
 # All documents to be used in spell check.
 ALL_DOCS := $(shell find . -type f -name '*.md' -not -path './.github/*' -not -path '*/node_modules/*' -not -path '*/_build/*' -not -path '*/deps/*' | sort)
@@ -51,15 +41,25 @@ markdownlint:
 .PHONY: install-yamllint
 install-yamllint:
     # Using a venv is recommended
-	pip install -U yamllint~=1.26.1
+	pip install -U yamllint~=1.30.0
 
 .PHONY: yamllint
 yamllint:
 	yamllint .
 
+.PHONY: checklicense
+checklicense:
+	@echo "Checking license headers..."
+	npx @kt3k/license-checker -q
+
+.PHONY: addlicense
+addlicense:
+	@echo "Adding license headers..."
+	npx @kt3k/license-checker -q -i
+
 # Run all checks in order of speed / likely failure.
 .PHONY: check
-check: misspell markdownlint
+check: misspell markdownlint checklicense
 	@echo "All checks complete"
 
 # Attempt to fix issues / regenerate tables.

diff --git a/README.md b/README.md
@@ -61,6 +61,7 @@ keeping it up to date for you.
 | [Coralogix](https://coralogix.com/blog/configure-otel-demo-send-telemetry-data-coralogix)                         | [Instana](https://github.com/instana/opentelemetry-demo)          | [Sumo Logic](https://www.sumologic.com/blog/common-opentelemetry-demo-application/)          |
 | [Datadog](https://github.com/DataDog/opentelemetry-demo)                                                          | [Kloudfuse](https://github.com/kloudfuse/opentelemetry-demo)      | [TelemetryHub](https://github.com/TelemetryHub/opentelemetry-demo/tree/telemetryhub-backend) |
 | [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)         |
+| [Elastic](https://github.com/elastic/opentelemetry-demo)                                                          |                                                                   |                                                                                              |
 |                                                                                                                   |                                                                   |                                                                                              |
 
 ## Contributing
@@ -82,14 +83,14 @@ documentation. Our [SIG Calls](CONTRIBUTING.md#join-a-sig-call) are Mondays at
 [Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
 ([@open-telemetry/demo-approvers](https://github.com/orgs/open-telemetry/teams/demo-approvers)):
 
-- [Michael Maxwell](https://github.com/mic-max), Microsoft
 - [Mikko Viitanen](https://github.com/mviitane), Dynatrace
 - [Penghan Wang](https://github.com/wph95), AppDynamics
 - [Reiley Yang](https://github.com/reyang), Microsoft
 - [Ziqi Zhao](https://github.com/fatsheep9146), Alibaba
 
 Emeritus:
 
+- [Michael Maxwell](https://github.com/mic-max)
 - [Morgan McLean](https://github.com/mtwo)
 
 ### Thanks to all the people who have contributed