diff --git a/CHANGELOG.md b/CHANGELOG.md index 79f16ad..9f258dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/noxfile.py b/noxfile.py index 8f6df49..5e7843c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -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") diff --git a/requirements-test.txt b/requirements-test.txt index 54f5f9b..6cb5bb0 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -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 diff --git a/setup.cfg b/setup.cfg index 279b96a..27015f9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 = diff --git a/src/opentelemetry/launcher/configuration.py b/src/opentelemetry/launcher/configuration.py index b938371..4398014 100644 --- a/src/opentelemetry/launcher/configuration.py +++ b/src/opentelemetry/launcher/configuration.py @@ -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())}" @@ -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" @@ -316,7 +314,6 @@ def configure_opentelemetry( propagator_instances = [] for propagator in propagators: - try: propagator_instance = next( iter_entry_points("opentelemetry_propagator", name=propagator), @@ -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 ' @@ -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 @@ -433,7 +428,6 @@ def configure_opentelemetry( ) if metrics_enabled: - _logger.debug("configuring metrics") logged_attributes[ @@ -441,7 +435,6 @@ def configure_opentelemetry( ] = metrics_exporter_endpoint if metrics_exporter_temporality_preference == "DELTA": - instrument_class_temporality = { Counter: AggregationTemporality.DELTA, UpDownCounter: AggregationTemporality.CUMULATIVE, @@ -452,7 +445,6 @@ def configure_opentelemetry( } elif metrics_exporter_temporality_preference == "CUMULATIVE": - instrument_class_temporality = { Counter: AggregationTemporality.CUMULATIVE, UpDownCounter: AggregationTemporality.CUMULATIVE, @@ -463,7 +455,6 @@ def configure_opentelemetry( } else: - message = ( f"Invalid configuration: " f"invalid metrics_exporter_temporality_preference: " diff --git a/src/opentelemetry/launcher/version.py b/src/opentelemetry/launcher/version.py index 9609ab6..358a935 100644 --- a/src/opentelemetry/launcher/version.py +++ b/src/opentelemetry/launcher/version.py @@ -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"