Skip to content

Commit

Permalink
Release 1.12.0 (#143)
Browse files Browse the repository at this point in the history
  • Loading branch information
ocelotl authored Feb 27, 2023
1 parent 7d33e71 commit 536af1a
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 27 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
## Unreleased

## 1.12.0

- Add support for OTEL_METRIC_EXPORT_INTERVAL
- Updated dependencies to 1.16.0 & 0.37b0

## 1.11.0

- Add support for LS_METRICS_ENABLED
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def coverage(session):
)


@session(python=["3.7"], reuse_venv=True)
@session(python=["3.9"], reuse_venv=True)
def example(session):
session.install(".")
session.install("-r", "requirements-test.txt")
Expand Down
22 changes: 11 additions & 11 deletions requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
opentelemetry-api==1.14.0
opentelemetry-exporter-otlp==1.14.0
opentelemetry-instrumentation==0.35b0
opentelemetry-instrumentation-flask==0.35b0
opentelemetry-instrumentation-requests==0.35b0
opentelemetry-instrumentation-wsgi==0.35b0
opentelemetry-propagator-b3==1.14.0
opentelemetry-proto==1.14.0
opentelemetry-sdk==1.14.0
opentelemetry-util-http==0.35b0
opentelemetry-propagator-ot-trace==0.35b0
opentelemetry-api==1.16.0
opentelemetry-exporter-otlp==1.16.0
opentelemetry-instrumentation==0.37b0
opentelemetry-instrumentation-flask==0.37b0
opentelemetry-instrumentation-requests==0.37b0
opentelemetry-instrumentation-wsgi==0.37b0
opentelemetry-propagator-b3==1.16.0
opentelemetry-proto==1.16.0
opentelemetry-sdk==1.16.0
opentelemetry-util-http==0.37b0
opentelemetry-propagator-ot-trace==0.37b0
pytest
flask
10 changes: 5 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ package_dir=
packages=find_namespace:
install_requires =
environs >= 8.0.0
opentelemetry-api == 1.14.0
opentelemetry-sdk == 1.14.0
opentelemetry-exporter-otlp == 1.14.0
opentelemetry-propagator-b3 == 1.14.0
opentelemetry-instrumentation == 0.35b0
opentelemetry-api == 1.16.0
opentelemetry-sdk == 1.16.0
opentelemetry-exporter-otlp == 1.16.0
opentelemetry-propagator-b3 == 1.16.0
opentelemetry-instrumentation == 0.37b0

[options.extras_require]
test =
Expand Down
9 changes: 0 additions & 9 deletions src/opentelemetry/launcher/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ def configure_opentelemetry(
log_level = log_level.upper()

if log_level not in log_levels:

message = (
f"Invalid configuration: invalid log_level value. "
f"It must be one of {', '.join(log_levels.keys())}"
Expand All @@ -268,7 +267,6 @@ def configure_opentelemetry(
_logger.debug("configuration")

if not _validate_service_name(service_name):

message = (
"Invalid configuration: service name missing. "
"Set environment variable OTEL_SERVICE_NAME"
Expand Down Expand Up @@ -316,7 +314,6 @@ def configure_opentelemetry(
propagator_instances = []

for propagator in propagators:

try:
propagator_instance = next(
iter_entry_points("opentelemetry_propagator", name=propagator),
Expand Down Expand Up @@ -359,7 +356,6 @@ def configure_opentelemetry(
if _ATTRIBUTE_HOST_NAME not in resource_attributes.keys() or not (
resource_attributes[_ATTRIBUTE_HOST_NAME]
):

no_hostname_message = (
"set it with the environment variable OTEL_RESOURCE_ATTRIBUTES or "
'with the resource_attributes argument. Use "host.name" as key '
Expand All @@ -380,7 +376,6 @@ def configure_opentelemetry(
tracer_provider = get_tracer_provider()

if isinstance(tracer_provider, TracerProvider):

# FIXME: Accessing a private attribute here because resource is no
# longer settable since:
# https://github.com/open-telemetry/opentelemetry-python/pull/1652
Expand Down Expand Up @@ -433,15 +428,13 @@ def configure_opentelemetry(
)

if metrics_enabled:

_logger.debug("configuring metrics")

logged_attributes[
"metrics_exporter_endpoint"
] = metrics_exporter_endpoint

if metrics_exporter_temporality_preference == "DELTA":

instrument_class_temporality = {
Counter: AggregationTemporality.DELTA,
UpDownCounter: AggregationTemporality.CUMULATIVE,
Expand All @@ -452,7 +445,6 @@ def configure_opentelemetry(
}

elif metrics_exporter_temporality_preference == "CUMULATIVE":

instrument_class_temporality = {
Counter: AggregationTemporality.CUMULATIVE,
UpDownCounter: AggregationTemporality.CUMULATIVE,
Expand All @@ -463,7 +455,6 @@ def configure_opentelemetry(
}

else:

message = (
f"Invalid configuration: "
f"invalid metrics_exporter_temporality_preference: "
Expand Down
2 changes: 1 addition & 1 deletion src/opentelemetry/launcher/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.11.0"
__version__ = "1.12.0"

0 comments on commit 536af1a

Please sign in to comment.