Merge branch 'master' into 📥❌🐍

Author: michaelkedar

CONTRIBUTING.md

@@ -68,7 +68,9 @@ poetry self add poetry-plugin-shell
 poetry shell
 ```
 
-### Running tests
+### Backend development
+
+#### Running tests
 
 Certain tests require you to auth with the Google Cloud SDK and to install the
 Firestore Emulator:
@@ -93,7 +95,7 @@ By default, this skips long tests, enable them by setting the `LONG_TESTS` varia
 LONG_TESTS=1 make api-server-tests
 ```
 
-#### Test result generation
+##### Test result generation
 
 Many tests are written using a
 [simple framework](https://github.com/google/osv.dev/blob/a4b682a32575cc3314a5ef83c8e91b70c60f7b77/osv/tests.py#L32)
@@ -109,49 +111,63 @@ the environment variable `TESTS_GENERATE=1` and run the tests:
 TESTS_GENERATE=1 make all-tests
 ```
 
-### Linting and formatting
+#### Running a local API instance (maintainers only)
 
-To lint your code, run
+Running a local instance of the API server requires the path to application
+default credentials. This is required so that the ESP container has credentials
+to download API configuration.
 
 ```shell
-make lint
+gcloud auth login --update-adc
+make run-api-server
 ```
 
-To format your code, run
+#### API E2E Snapshots
+
+If you have made any changes to the API, please update the API query snapshots with
+
 ```shell
-yapf -i <file>.py
+gcloud auth login --update-adc
+make update-api-snapshots
 ```
 
-### Running local UI and API instances (maintainers only)
+and check the git diff to see if the API result changes are expected.
+
+### Frontend development
 
-#### UI
+#### Running a local UI instance (maintainers only)
 
 ```shell
 gcloud auth login --update-adc
 make run-website
 ```
 
-#### API
+#### Running a local UI instance
 
-Running a local instance of the API server requires the path to application
-default credentials. The is required so that the ESP container has credentials
-to download API configuration.
+For contributors without access to the GCP project, you can use the website emulator which does
+not require Google Cloud project access. This emulator uses a local datastore
+and loads data from a local directory.
 
 ```shell
-gcloud auth login --update-adc
-make run-api-server
+make run-website-emulator
 ```
 
-#### API E2E Snapshots
+You can add testcase records to `gcp/website/testdata/osv/` to test odd cases.
+See [gcp/website/testdata/osv/README.md](gcp/website/testdata/osv/README.md)
+for more information on the format of these records.
 
-If you have made any changes to the API, please update the API query snapshots with
+### Linting and formatting
+
+To lint your code, run
 
 ```shell
-gcloud auth login --update-adc
-make update-api-snapshots
+make lint
 ```
 
-and check the git diff to see if the API result changes are expected.
+To format your code, run
+```shell
+yapf -i <file>.py
+```
 
 ### Making commits
 

gcp/indexer/go.mod

@@ -60,11 +60,11 @@ require (
 	go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
-	go.opentelemetry.io/otel v1.39.0 // indirect
-	go.opentelemetry.io/otel/metric v1.39.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.39.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
-	go.opentelemetry.io/otel/trace v1.39.0 // indirect
+	go.opentelemetry.io/otel v1.40.0 // indirect
+	go.opentelemetry.io/otel/metric v1.40.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.40.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
+	go.opentelemetry.io/otel/trace v1.40.0 // indirect
 	golang.org/x/crypto v0.47.0 // indirect
 	golang.org/x/net v0.49.0 // indirect
 	golang.org/x/oauth2 v0.35.0 // indirect

gcp/indexer/go.sum

@@ -194,16 +194,26 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6h
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
 go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
 go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
+go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
+go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.39.0 h1:5gn2urDL/FBnK8OkCfD1j3/ER79rUuTYmCvlXBKeYL8=
 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.39.0/go.mod h1:0fBG6ZJxhqByfFZDwSwpZGzJU671HkwpWaNe2t4VUPI=
 go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
 go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
+go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
+go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
 go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
 go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
+go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
+go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
 go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
 go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
+go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw=
+go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg=
 go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
 go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
+go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
+go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=