diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 860bdcbf07..9f88832a65 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,4 +2,4 @@ # This file controls who is tagged for review for any given pull request. # For anything not explicitly taken by someone else: -* @open-telemetry/demo-webstore-approvers +* @open-telemetry/demo-approvers diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index e48d410bfe..95066b5f3c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -8,9 +8,9 @@ labels: bug Which version of the demo you are using? (please provide either a specific [commit -hash](https://github.com/open-telemetry/opentelemetry-demo-webstore/commits/main) +hash](https://github.com/open-telemetry/opentelemetry-demo/commits/main) or a specific -[release](https://github.com/open-telemetry/opentelemetry-demo-webstore/releases)). +[release](https://github.com/open-telemetry/opentelemetry-demo/releases)). ## Symptom diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index 26cfc4870f..182d1f4697 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -6,4 +6,4 @@ labels: question # Question -Use [Github Discussions](https://github.com/open-telemetry/opentelemetry-demo-webstore/discussions/). +Use [Github Discussions](https://github.com/open-telemetry/opentelemetry-demo/discussions/). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2ae334a759..b5d8432c48 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,7 +20,7 @@ resource for your first contribution, join our Slack channel and find a buddy! [otel-community-demo](https://app.slack.com/client/T08PSQ7BQ/C03B4CWV4DA) channel. 2. Post in the room with an introduction to yourself, what area you are interested in (check issues marked with [help - wanted](https://github.com/open-telemetry/opentelemetry-demo-webstore/labels/help%20wanted)), + wanted](https://github.com/open-telemetry/opentelemetry-demo/labels/help%20wanted)), and say you are looking for a buddy. We will match you with someone who has experience in that area. @@ -45,7 +45,7 @@ On all platforms, the minimum requirements are: - Clone the Webstore Demo repository: ```shell -git clone https://github.com/open-telemetry/opentelemetry-demo-webstore.git +git clone https://github.com/open-telemetry/opentelemetry-demo.git ``` ### Open Folder @@ -53,7 +53,7 @@ git clone https://github.com/open-telemetry/opentelemetry-demo-webstore.git - Navigate to the cloned folder: ```shell -cd opentelemetry-demo-webstore/ +cd opentelemetry-demo/ ``` ### Gradle Update [Windows Only] @@ -88,25 +88,25 @@ Once the images are built and containers are started you can access: ### How to Send Pull Requests -Everyone is welcome to contribute code to `opentelemetry-demo-webstore` via +Everyone is welcome to contribute code to `opentelemetry-demo` via GitHub pull requests (PRs). To create a new PR, fork the project in GitHub and clone the upstream repo: ```sh -git clone https://github.com/open-telemetry/opentelemetry-demo-webstore.git +git clone https://github.com/open-telemetry/opentelemetry-demo.git ``` Navigate to the repo root: ```sh -cd opentelemetry--demo-webstore +cd opentelemetry--demo ``` Add your fork as an origin: ```sh -git remote add fork https://github.com/open-telemetry/opentelemetry-demo-webstore.git +git remote add fork https://github.com/open-telemetry/opentelemetry-demo.git ``` Check out a new branch, make modifications and push the branch to your fork: @@ -118,7 +118,7 @@ $ git commit $ git push fork feature ``` -Open a pull request against the main `opentelemetry-demo-webstore` repo. +Open a pull request against the main `opentelemetry-demo` repo. ### How to Receive Comments diff --git a/README.md b/README.md index c95ee62341..f61c0a5164 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Webstore Demo +# OpenTelemetry Demo ## Under Construction @@ -17,7 +17,7 @@ This repo is a work in progress. If you'd like to help, check out our - Clone the Webstore Demo repository: ```shell -git clone https://github.com/open-telemetry/opentelemetry-demo-webstore.git +git clone https://github.com/open-telemetry/opentelemetry-demo.git ``` ### Open Folder @@ -25,7 +25,7 @@ git clone https://github.com/open-telemetry/opentelemetry-demo-webstore.git - Navigate to the cloned folder: ```shell -cd opentelemetry-demo-webstore/ +cd opentelemetry-demo/ ``` ### Gradle Update [Windows Only] @@ -249,6 +249,7 @@ Find the **Protocol Buffer Definitions** in the `/pb/` directory. ## Demos featuring Online Boutique +- [Datadog](https://github.com/DataDog/opentelemetry-demo-webstore) - [Honeycomb.io](https://github.com/honeycombio/opentelemetry-demo-webstore) - [Lightstep](https://github.com/lightstep/opentelemetry-demo-webstore) @@ -267,7 +268,7 @@ For edit access, get in touch on [Slack](https://cloud-native.slack.com/archives/C03B4CWV4DA). [Maintainers](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer) -([@open-telemetry/demo-webstore-maintainers](https://github.com/orgs/open-telemetry/teams/demo-webstore-maintainers)): +([@open-telemetry/demo-maintainers](https://github.com/orgs/open-telemetry/teams/demo-maintainers)): - [Austin Parker](https://github.com/austinlparker), Lightstep - [Carter Socha](https://github.com/cartersocha), Microsoft @@ -275,7 +276,7 @@ For edit access, get in touch on - [Pierre Tessier](https://github.com/puckpuck), Honeycomb [Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver) -([@open-telemetry/demo-webstore-approvers](https://github.com/orgs/open-telemetry/teams/demo-webstore-approvers)): +([@open-telemetry/demo-approvers](https://github.com/orgs/open-telemetry/teams/demo-approvers)): - [Juliano Costa](https://github.com/julianocosta89), Dynatrace - [Michael Maxwell](https://github.com/mic-max), Microsoft @@ -286,4 +287,4 @@ For edit access, get in touch on ### Thanks to all the people who have contributed -[![contributors](https://contributors-img.web.app/image?repo=open-telemetry/opentelemetry-demo-webstore)](https://github.com/open-telemetry/opentelemetry-demo-webstore/graphs/contributors) +[![contributors](https://contributors-img.web.app/image?repo=open-telemetry/opentelemetry-demo)](https://github.com/open-telemetry/opentelemetry-demo/graphs/contributors) diff --git a/docs/manual_span_attributes.md b/docs/manual_span_attributes.md index a43531bd57..8988b19a5d 100644 --- a/docs/manual_span_attributes.md +++ b/docs/manual_span_attributes.md @@ -1,6 +1,6 @@ # List of manual span attributes -This document contains the list of manual Span Attributes used throughout the demo-webstore: +This document contains the list of manual Span Attributes used throughout the demo: ## AdService diff --git a/src/checkoutservice/go.mod b/src/checkoutservice/go.mod index 775a1ddb3a..794df1280d 100644 --- a/src/checkoutservice/go.mod +++ b/src/checkoutservice/go.mod @@ -1,4 +1,4 @@ -module github.com/open-telemetry/opentelemetry-demo-webstore/src/checkoutservice +module github.com/open-telemetry/opentelemetry-demo/src/checkoutservice go 1.17 diff --git a/src/checkoutservice/main.go b/src/checkoutservice/main.go index ed47168091..352bd28f5d 100644 --- a/src/checkoutservice/main.go +++ b/src/checkoutservice/main.go @@ -41,8 +41,8 @@ import ( "go.opentelemetry.io/otel/propagation" sdktrace "go.opentelemetry.io/otel/sdk/trace" - pb "github.com/open-telemetry/opentelemetry-demo-webstore/src/checkoutservice/genproto/hipstershop" - money "github.com/open-telemetry/opentelemetry-demo-webstore/src/checkoutservice/money" + pb "github.com/open-telemetry/opentelemetry-demo/src/checkoutservice/genproto/hipstershop" + money "github.com/open-telemetry/opentelemetry-demo/src/checkoutservice/money" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/src/checkoutservice/money/money.go b/src/checkoutservice/money/money.go index a36e7ae62a..d4e61eb80f 100644 --- a/src/checkoutservice/money/money.go +++ b/src/checkoutservice/money/money.go @@ -17,7 +17,7 @@ package money import ( "errors" - pb "github.com/open-telemetry/opentelemetry-demo-webstore/src/checkoutservice/genproto/hipstershop" + pb "github.com/open-telemetry/opentelemetry-demo/src/checkoutservice/genproto/hipstershop" ) const ( diff --git a/src/checkoutservice/money/money_test.go b/src/checkoutservice/money/money_test.go index a133f0063e..b37f7e2647 100644 --- a/src/checkoutservice/money/money_test.go +++ b/src/checkoutservice/money/money_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - pb "github.com/open-telemetry/opentelemetry-demo-webstore/src/checkoutservice/genproto/hipstershop" + pb "github.com/open-telemetry/opentelemetry-demo/src/checkoutservice/genproto/hipstershop" ) func mmc(u int64, n int32, c string) *pb.Money { return &pb.Money{Units: u, Nanos: n, CurrencyCode: c} } diff --git a/src/currencyservice/README.md b/src/currencyservice/README.md index 0002bf080c..27a23f397f 100644 --- a/src/currencyservice/README.md +++ b/src/currencyservice/README.md @@ -6,7 +6,7 @@ It is a C++ based service. ## Building docker image To build the currency service, run the following from root directory -of opentelemetry-demo-webstore +of opentelemetry-demo ```sh docker-compose build currencyservice diff --git a/src/frontend/go.mod b/src/frontend/go.mod index 0063a5fe5b..2b03aa4a4f 100644 --- a/src/frontend/go.mod +++ b/src/frontend/go.mod @@ -1,4 +1,4 @@ -module github.com/opentelemetry/opentelemetry-demo-webstore/src/frontend +module github.com/opentelemetry/opentelemetry-demo/src/frontend go 1.17 diff --git a/src/frontend/handlers.go b/src/frontend/handlers.go index 550df03ba6..0d264239dd 100644 --- a/src/frontend/handlers.go +++ b/src/frontend/handlers.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/opentelemetry/opentelemetry-demo-webstore/src/frontend/instr" + "github.com/opentelemetry/opentelemetry-demo/src/frontend/instr" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" @@ -35,8 +35,8 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - pb "github.com/opentelemetry/opentelemetry-demo-webstore/src/frontend/genproto/hipstershop" - "github.com/opentelemetry/opentelemetry-demo-webstore/src/frontend/money" + pb "github.com/opentelemetry/opentelemetry-demo/src/frontend/genproto/hipstershop" + "github.com/opentelemetry/opentelemetry-demo/src/frontend/money" ) type platformDetails struct { diff --git a/src/frontend/middleware.go b/src/frontend/middleware.go index 1278211a58..49125088f4 100644 --- a/src/frontend/middleware.go +++ b/src/frontend/middleware.go @@ -19,7 +19,7 @@ import ( "net/http" "time" - "github.com/opentelemetry/opentelemetry-demo-webstore/src/frontend/instr" + "github.com/opentelemetry/opentelemetry-demo/src/frontend/instr" "go.opentelemetry.io/otel/metric/global" semconv "go.opentelemetry.io/otel/semconv/v1.10.0" "go.opentelemetry.io/otel/trace" diff --git a/src/frontend/money/money.go b/src/frontend/money/money.go index 31a4c90c9e..a783d5aafb 100644 --- a/src/frontend/money/money.go +++ b/src/frontend/money/money.go @@ -17,7 +17,7 @@ package money import ( "errors" - pb "github.com/opentelemetry/opentelemetry-demo-webstore/src/frontend/genproto/hipstershop" + pb "github.com/opentelemetry/opentelemetry-demo/src/frontend/genproto/hipstershop" ) const ( diff --git a/src/frontend/money/money_test.go b/src/frontend/money/money_test.go index 06f2ec1fc8..95dc50809e 100644 --- a/src/frontend/money/money_test.go +++ b/src/frontend/money/money_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - pb "github.com/opentelemetry/opentelemetry-demo-webstore/src/frontend/genproto/hipstershop" + pb "github.com/opentelemetry/opentelemetry-demo/src/frontend/genproto/hipstershop" ) func mmc(u int64, n int32, c string) *pb.Money { return &pb.Money{Units: u, Nanos: n, CurrencyCode: c} } diff --git a/src/frontend/rpc.go b/src/frontend/rpc.go index 6aba859bc0..67593facab 100644 --- a/src/frontend/rpc.go +++ b/src/frontend/rpc.go @@ -18,7 +18,7 @@ import ( "context" "time" - pb "github.com/opentelemetry/opentelemetry-demo-webstore/src/frontend/genproto/hipstershop" + pb "github.com/opentelemetry/opentelemetry-demo/src/frontend/genproto/hipstershop" "github.com/pkg/errors" ) diff --git a/src/frontend/templates/footer.html b/src/frontend/templates/footer.html index 03caef747d..6fbfd371ac 100644 --- a/src/frontend/templates/footer.html +++ b/src/frontend/templates/footer.html @@ -20,7 +20,7 @@

This website is hosted for demo purposes only. It is not an actual shop. This is not a Google product.

-

@ 2022 OpenTelemetry (Source Code)

+

@ 2022 OpenTelemetry (Source Code)

{{ if $.session_id }}session-id: {{ $.session_id }} - {{end}} diff --git a/src/paymentservice/package.json b/src/paymentservice/package.json index b9f404f2c2..a128d4212a 100644 --- a/src/paymentservice/package.json +++ b/src/paymentservice/package.json @@ -2,7 +2,7 @@ "name": "paymentservice", "version": "0.0.1", "description": "Payment Microservice", - "repository": "https://github.com/opentelemetry/opentelemetry-demo-webstore", + "repository": "https://github.com/opentelemetry/opentelemetry-demo", "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", diff --git a/src/productcatalogservice/go.mod b/src/productcatalogservice/go.mod index 81450ea619..704a4b6cc2 100644 --- a/src/productcatalogservice/go.mod +++ b/src/productcatalogservice/go.mod @@ -1,4 +1,4 @@ -module github.com/opentelemetry/opentelemetry-demo-webstore/src/productcatalogservice +module github.com/opentelemetry/opentelemetry-demo/src/productcatalogservice go 1.17 diff --git a/src/productcatalogservice/server.go b/src/productcatalogservice/server.go index 325d8e3ac1..6ad027febc 100644 --- a/src/productcatalogservice/server.go +++ b/src/productcatalogservice/server.go @@ -27,7 +27,7 @@ import ( "syscall" "time" - pb "github.com/opentelemetry/opentelemetry-demo-webstore/src/productcatalogservice/genproto/hipstershop" + pb "github.com/opentelemetry/opentelemetry-demo/src/productcatalogservice/genproto/hipstershop" healthpb "google.golang.org/grpc/health/grpc_health_v1" "github.com/sirupsen/logrus" diff --git a/src/productcatalogservice/server_test.go b/src/productcatalogservice/server_test.go index 50cc134b6c..c7053ef6f7 100644 --- a/src/productcatalogservice/server_test.go +++ b/src/productcatalogservice/server_test.go @@ -18,7 +18,7 @@ import ( "context" "testing" - pb "github.com/opentelemetry/opentelemetry-demo-webstore/src/productcatalogservice/genproto/hipstershop" + pb "github.com/opentelemetry/opentelemetry-demo/src/productcatalogservice/genproto/hipstershop" "github.com/google/go-cmp/cmp" "google.golang.org/grpc" "google.golang.org/grpc/codes"