remove broken webstore links (#225)

* remove broken links

* fix broken links

* add datadog fork

* changelog merge

Author: cartersocha

.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

.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
 

.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/).

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,15 +45,15 @@ 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
 
 - 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
 

README.md

@@ -1,4 +1,4 @@
-# Webstore Demo
+# OpenTelemetry Demo
 
 ## Under Construction
 
@@ -17,15 +17,15 @@ 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
 
 - 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,15 +268,15 @@ 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
 - [Morgan McLean](https://github.com/mtwo), Splunk
 - [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)

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
 

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
 

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"
 )
 

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 (

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} }

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

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
 

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 {

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"

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 (

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} }

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"
 )

src/frontend/templates/footer.html

@@ -20,7 +20,7 @@
     <div class="footer-top">
         <div class="container footer-social">
             <p class="footer-text">This website is hosted for demo purposes only. It is not an actual shop. This is not a Google product.</p>
-            <p class="footer-text">@ 2022 OpenTelemetry (<a href="https://github.com/open-telemetry/opentelemetry-demo-webstore">Source Code</a>)</p>
+            <p class="footer-text">@ 2022 OpenTelemetry (<a href="https://github.com/open-telemetry/opentelemetry-demo">Source Code</a>)</p>
             <p class="footer-text">
                 <small>
                     {{ if $.session_id }}session-id: {{ $.session_id }} - {{end}}

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",

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
 

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"

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"