Skip to content

Commit

Permalink
remove broken webstore links (#225)
Browse files Browse the repository at this point in the history
* remove broken links

* fix broken links

* add datadog fork

* changelog merge
  • Loading branch information
cartersocha authored Jul 22, 2022
1 parent b4125aa commit 2a084c8
Show file tree
Hide file tree
Showing 22 changed files with 39 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/).
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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]
Expand Down Expand Up @@ -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:
Expand All @@ -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

Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Webstore Demo
# OpenTelemetry Demo

## Under Construction

Expand All @@ -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]
Expand Down Expand Up @@ -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)

Expand All @@ -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
Expand All @@ -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)
2 changes: 1 addition & 1 deletion docs/manual_span_attributes.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/checkoutservice/go.mod
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/checkoutservice/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion src/checkoutservice/money/money.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion src/checkoutservice/money/money_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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} }
Expand Down
2 changes: 1 addition & 1 deletion src/currencyservice/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/opentelemetry/opentelemetry-demo-webstore/src/frontend
module github.com/opentelemetry/opentelemetry-demo/src/frontend

go 1.17

Expand Down
6 changes: 3 additions & 3 deletions src/frontend/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/money/money.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/money/money_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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} }
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/templates/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
2 changes: 1 addition & 1 deletion src/paymentservice/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/productcatalogservice/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/opentelemetry/opentelemetry-demo-webstore/src/productcatalogservice
module github.com/opentelemetry/opentelemetry-demo/src/productcatalogservice

go 1.17

Expand Down
2 changes: 1 addition & 1 deletion src/productcatalogservice/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/productcatalogservice/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 2a084c8

Please sign in to comment.