Skip to content

Commit 731f32c

Browse files
ocelotlocelotl
authored
Remove Configuration (open-telemetry#1523)
1 parent 05ab4a7 commit 731f32c

49 files changed

Lines changed: 447 additions & 681 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
# Otherwise, set variable to the commit of your branch on
1111
# opentelemetry-python-contrib which is compatible with these Core repo
1212
# changes.
13-
CONTRIB_REPO_SHA: a67a23d0a0a4dd7c3c06c7050c220fa3b3689a77
13+
CONTRIB_REPO_SHA: f005d90ed3bc75ee6eb7297f9e3a6b55a55b22aa
1414

1515
jobs:
1616
build:
@@ -109,7 +109,7 @@ jobs:
109109
run: pip install -U tox
110110
- name: Cache tox environment
111111
# Preserves .tox directory between runs for faster installs
112-
uses: actions/cache@v2
112+
uses: actions/cache@v1
113113
with:
114114
path: .tox
115115
key: tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-core

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616
- Allow missing carrier headers to continue without raising AttributeError
1717
([#1545](https://github.com/open-telemetry/opentelemetry-python/pull/1545))
1818

19+
### Removed
20+
- Remove Configuration
21+
([#1523](https://github.com/open-telemetry/opentelemetry-python/pull/1523))
22+
1923
## [0.17b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v0.17b0) - 2021-01-20
2024

2125
### Added

‎docs/api/api.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ OpenTelemetry Python API
77
:maxdepth: 1
88

99
baggage
10-
configuration
1110
context
1211
metrics
1312
trace
13+
environment_variables

‎docs/api/configuration.rst‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎docs/api/environment_variables.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
opentelemetry.environment_variables package
2+
===========================================
3+
4+
Module contents
5+
---------------
6+
7+
.. automodule:: opentelemetry.environment_variables

‎docs/examples/auto-instrumentation/server_instrumented.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
from flask import Flask, request
1616

1717
from opentelemetry import propagators, trace
18-
from opentelemetry.instrumentation.wsgi import collect_request_attributes
1918
from opentelemetry.sdk.trace import TracerProvider
2019
from opentelemetry.sdk.trace.export import (
2120
ConsoleSpanExporter,
2221
SimpleExportSpanProcessor,
2322
)
2423
from opentelemetry.trace.propagation.textmap import DictGetter
24+
from opentelemetry.util.http.wsgi import collect_request_attributes
2525

2626
app = Flask(__name__)
2727

‎docs/sdk/environment_variables.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
opentelemetry.sdk.environment_variables
2+
=======================================
3+
4+
.. TODO: what is the SDK
5+
6+
.. toctree::
7+
:maxdepth: 1
8+
9+
.. automodule:: opentelemetry.sdk.environment_variables
10+
:members:
11+
:undoc-members:
12+
:show-inheritance:

‎docs/sdk/sdk.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ OpenTelemetry Python SDK
1010
resources
1111
trace
1212
error_handler
13+
environment_variables

‎exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,14 @@
6565
"""
6666
# pylint: disable=protected-access
6767

68-
import base64
6968
import logging
70-
import socket
71-
from typing import Optional, Union
72-
73-
from grpc import (
74-
ChannelCredentials,
75-
insecure_channel,
76-
secure_channel,
77-
ssl_channel_credentials,
78-
)
79-
from thrift.protocol import TBinaryProtocol, TCompactProtocol
80-
from thrift.transport import THttpClient, TTransport
69+
from os import environ
70+
from typing import Optional
71+
72+
from grpc import ChannelCredentials, insecure_channel, secure_channel
8173

82-
from opentelemetry.configuration import Configuration
8374
from opentelemetry.exporter.jaeger import util
8475
from opentelemetry.exporter.jaeger.gen import model_pb2
85-
from opentelemetry.exporter.jaeger.gen.agent import Agent as agent
8676
from opentelemetry.exporter.jaeger.gen.collector_pb2 import PostSpansRequest
8777
from opentelemetry.exporter.jaeger.gen.collector_pb2_grpc import (
8878
CollectorServiceStub,
@@ -92,9 +82,14 @@
9282
from opentelemetry.exporter.jaeger.translate import Translate
9383
from opentelemetry.exporter.jaeger.translate.protobuf import ProtobufTranslator
9484
from opentelemetry.exporter.jaeger.translate.thrift import ThriftTranslator
95-
from opentelemetry.sdk.trace.export import Span, SpanExporter, SpanExportResult
96-
from opentelemetry.trace import SpanKind
97-
from opentelemetry.trace.status import StatusCode
85+
from opentelemetry.sdk.environment_variables import (
86+
OTEL_EXPORTER_JAEGER_AGENT_HOST,
87+
OTEL_EXPORTER_JAEGER_AGENT_PORT,
88+
OTEL_EXPORTER_JAEGER_ENDPOINT,
89+
OTEL_EXPORTER_JAEGER_PASSWORD,
90+
OTEL_EXPORTER_JAEGER_USER,
91+
)
92+
from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
9893

9994
DEFAULT_AGENT_HOST_NAME = "localhost"
10095
DEFAULT_AGENT_PORT = 6831
@@ -142,30 +137,36 @@ def __init__(
142137
self.service_name = service_name
143138
self.agent_host_name = _parameter_setter(
144139
param=agent_host_name,
145-
env_variable=Configuration().EXPORTER_JAEGER_AGENT_HOST,
140+
env_variable=environ.get(OTEL_EXPORTER_JAEGER_AGENT_HOST),
146141
default=DEFAULT_AGENT_HOST_NAME,
147142
)
143+
144+
environ_agent_port = environ.get(OTEL_EXPORTER_JAEGER_AGENT_PORT)
145+
environ_agent_port = (
146+
int(environ_agent_port) if environ_agent_port is not None else None
147+
)
148+
148149
self.agent_port = _parameter_setter(
149150
param=agent_port,
150-
env_variable=Configuration().EXPORTER_JAEGER_AGENT_PORT,
151+
env_variable=environ_agent_port,
151152
default=DEFAULT_AGENT_PORT,
152153
)
153154
self._agent_client = AgentClientUDP(
154155
host_name=self.agent_host_name, port=self.agent_port
155156
)
156157
self.collector_endpoint = _parameter_setter(
157158
param=collector_endpoint,
158-
env_variable=Configuration().EXPORTER_JAEGER_ENDPOINT,
159+
env_variable=environ.get(OTEL_EXPORTER_JAEGER_ENDPOINT),
159160
default=None,
160161
)
161162
self.username = _parameter_setter(
162163
param=username,
163-
env_variable=Configuration().EXPORTER_JAEGER_USER,
164+
env_variable=environ.get(OTEL_EXPORTER_JAEGER_USER),
164165
default=None,
165166
)
166167
self.password = _parameter_setter(
167168
param=password,
168-
env_variable=Configuration().EXPORTER_JAEGER_PASSWORD,
169+
env_variable=environ.get(OTEL_EXPORTER_JAEGER_PASSWORD),
169170
default=None,
170171
)
171172
self._collector = None

‎exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/util.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,14 @@
1313
# limitations under the License.
1414

1515
import logging
16+
from os import environ
1617

1718
from grpc import ChannelCredentials, ssl_channel_credentials
1819

19-
from opentelemetry.configuration import Configuration
20+
from opentelemetry.sdk.environment_variables import (
21+
OTEL_EXPORTER_JAEGER_CERTIFICATE,
22+
OTEL_EXPORTER_JAEGER_INSECURE,
23+
)
2024

2125
logger = logging.getLogger(__name__)
2226

@@ -26,7 +30,7 @@
2630
def _get_insecure(param):
2731
if param is not None:
2832
return param
29-
insecure_env = Configuration().get("EXPORTER_JAEGER_INSECURE", None)
33+
insecure_env = environ.get(OTEL_EXPORTER_JAEGER_INSECURE)
3034
if insecure_env is not None:
3135
return insecure_env.lower() == "true"
3236
return DEFAULT_INSECURE
@@ -45,7 +49,7 @@ def _load_credential_from_file(path) -> ChannelCredentials:
4549
def _get_credentials(param):
4650
if param is not None:
4751
return param
48-
creds_env = Configuration().get("EXPORTER_JAEGER_CERTIFICATE", None)
52+
creds_env = environ.get(OTEL_EXPORTER_JAEGER_CERTIFICATE)
4953
if creds_env:
5054
return _load_credential_from_file(creds_env)
5155
return ssl_channel_credentials()

0 commit comments

Comments
 (0)