Merge remote-tracking branch 'upstream/main'

Author: abhinav283

.codespellrc

@@ -1,4 +1,9 @@
 [codespell]
 # skipping auto generated folders
+<<<<<<< HEAD
 skip = ./.tox,./.mypy_cache,./docs/_build,./target,*/LICENSE,./venv
 ignore-words-list = ot
+=======
+skip = ./.tox,./.mypy_cache,./docs/_build,./target,*/LICENSE,./venv,.git,./opentelemetry-semantic-conventions
+ignore-words-list = ans,ue,ot,hist,ro
+>>>>>>> upstream/main

.flake8

@@ -23,11 +23,19 @@ exclude =
   venv*/
   target
   __pycache__
+<<<<<<< HEAD
   exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/
   exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/
   exporter/opentelemetry-exporter-jaeger/build/*
+=======
+  exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/v2/gen/
+>>>>>>> upstream/main
   docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/gen/
   docs/examples/opentelemetry-example-app/build/*
   opentelemetry-proto/build/*
   opentelemetry-proto/src/opentelemetry/proto/
+<<<<<<< HEAD
   scripts/*
+=======
+  */build/lib/*
+>>>>>>> upstream/main