Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

default value is invalid, was renamed #755

Merged
merged 3 commits into from
Oct 19, 2021
+15 −7
Merged

default value is invalid, was renamed #755

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bd72e6
default value is invalid, was renamed
codeboten Oct 19, 2021
2ae71fe
Merge branch 'main' into codeboten/fix-default
owais Oct 19, 2021
38c87ac
Update CHANGELOG.md
Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion opentelemetry-distro/src/opentelemetry/distro/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ class OpenTelemetryDistro(BaseDistro):

# pylint: disable=no-self-use
def _configure(self, **kwargs):
os.environ.setdefault(OTEL_TRACES_EXPORTER, "otlp_proto_grpc_span")
os.environ.setdefault(OTEL_TRACES_EXPORTER, "otlp_proto_grpc")
2 changes: 1 addition & 1 deletion opentelemetry-distro/tests/test_distro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ def test_default_configuration(self):
self.assertIsNone(os.environ.get(OTEL_TRACES_EXPORTER))
distro.configure()
self.assertEqual(
"otlp_proto_grpc_span", os.environ.get(OTEL_TRACES_EXPORTER)
"otlp_proto_grpc", os.environ.get(OTEL_TRACES_EXPORTER)
)
6 changes: 3 additions & 3 deletions opentelemetry-instrumentation/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ Well known trace exporter names:
- jaeger_thrift
- opencensus
- otlp
- otlp_proto_grpc_span
- otlp_proto_http_span
- otlp_proto_grpc
- otlp_proto_http
- zipkin_json
- zipkin_proto

``otlp`` is an alias for ``otlp_proto_grpc_span``.
``otlp`` is an alias for ``otlp_proto_grpc``.

* ``--id-generator`` or ``OTEL_PYTHON_ID_GENERATOR``

Expand Down