Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Exporter 1.0.0b14 #295

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

Merged
jeremydvoss merged 2 commits into from
Jun 21, 2023
Merged

Exporter 1.0.0b14 #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db5b43b
Exporter 1.0.0b14 and otel 1.18/0.39
jeremydvoss Jun 16, 2023
3d970e6
lint and vendoring fixes
jeremydvoss Jun 16, 2023
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

- Upgrade to exporter 1.0.0b14 and OTel 1.18
([#295](https://github.com/microsoft/ApplicationInsights-Python/pull/295))

## [1.0.0b13](https://github.com/microsoft/ApplicationInsights-Python/releases/tag/v1.0.0b13) - 2023-06-14

- Vendor Instrumentations
Expand Down
4 changes: 2 additions & 2 deletions azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
SAMPLING_RATIO_ARG,
)
from azure.monitor.opentelemetry._types import ConfigurationValue
from azure.monitor.opentelemetry._vendor.v0_38b0.opentelemetry.instrumentation.dependencies import (
from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.dependencies import (
Copy link
Contributor

@lzchen lzchen Jun 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did we release a version of the distro which vendored v0.38b0 before?

Copy link
Member Author

@jeremydvoss jeremydvoss Jun 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. Can do.

Copy link
Member Author

@jeremydvoss jeremydvoss Jun 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#296

Copy link
Contributor

@lzchen lzchen Jun 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's fine that we didn't. I'm just wondering if, before we go GA, should we have one folder that we keep updating, or should we add a new vendored folder for each version of the instrumentations? i.e. have a vendor folder for 0.38b0 and one for 0.39b0 and so on for every release

Copy link
Member Author

@jeremydvoss jeremydvoss Jun 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think one folder is ultimately better. Far less unused code. Easier to notice iterations. But if there's ever a breaking bug where we need to keep more than one, we can.

get_dependency_conflicts,
)
from azure.monitor.opentelemetry._vendor.v0_38b0.opentelemetry.instrumentation.instrumentor import (
from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.instrumentor import (
BaseInstrumentor,
)
from azure.monitor.opentelemetry.exporter import (
Expand Down
15 changes: 0 additions & 15 deletions ...e/monitor/opentelemetry/_vendor/v0_38b0/opentelemetry/instrumentation/psycopg2/version.py
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ...e/monitor/opentelemetry/_vendor/v0_38b0/opentelemetry/instrumentation/requests/version.py
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ...re/monitor/opentelemetry/_vendor/v0_38b0/opentelemetry/instrumentation/urllib3/version.py
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ...etry/azure/monitor/opentelemetry/_vendor/v0_38b0/opentelemetry/instrumentation/version.py
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ...azure/monitor/opentelemetry/_vendor/v0_38b0/opentelemetry/instrumentation/wsgi/version.py
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ...ntelemetry/azure/monitor/opentelemetry/_vendor/v0_38b0/opentelemetry/util/http/version.py
View file
Open in desktop

This file was deleted.

0 ...opentelemetry/_vendor/v0_38b0/__init__.py → ...opentelemetry/_vendor/v0_39b0/__init__.py
View file
Open in desktop
File renamed without changes.
0 ..._vendor/v0_38b0/opentelemetry/__init__.py → ..._vendor/v0_39b0/opentelemetry/__init__.py
View file
Open in desktop
File renamed without changes.
0 ...opentelemetry/instrumentation/__init__.py → ...opentelemetry/instrumentation/__init__.py
View file
Open in desktop
File renamed without changes.
15 changes: 8 additions & 7 deletions ...elemetry/instrumentation/asgi/__init__.py → ...elemetry/instrumentation/asgi/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
from asgiref.compatibility import guarantee_single_callable

from opentelemetry import context, trace
from azure.monitor.opentelemetry._vendor.v0_38b0.opentelemetry.instrumentation.asgi.version import (
__version__,
from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.asgi.version import (
__version__
) # noqa
from azure.monitor.opentelemetry._vendor.v0_38b0.opentelemetry.instrumentation.propagators import (
from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.propagators import (
get_global_response_propagator,
)
from azure.monitor.opentelemetry._vendor.v0_38b0.opentelemetry.instrumentation.utils import (
from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.utils import (
_start_internal_or_server_span,
http_status_to_status_code,
)
Expand All @@ -39,7 +39,7 @@
from opentelemetry.semconv.trace import SpanAttributes
from opentelemetry.trace import Span, set_span_in_context
from opentelemetry.trace.status import Status, StatusCode
from azure.monitor.opentelemetry._vendor.v0_38b0.opentelemetry.util.http import (
from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.util.http import (
OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SANITIZE_FIELDS,
OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_REQUEST,
OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_RESPONSE,
Expand Down Expand Up @@ -358,15 +358,16 @@ async def __call__(self, scope, receive, send):

span_name, additional_attributes = self.default_span_details(scope)

attributes = collect_request_attributes(scope)
attributes.update(additional_attributes)
span, token = _start_internal_or_server_span(
tracer=self.tracer,
span_name=span_name,
start_time=None,
context_carrier=scope,
context_getter=asgi_getter,
attributes=attributes,
)
attributes = collect_request_attributes(scope)
attributes.update(additional_attributes)
active_requests_count_attrs = _parse_active_request_count_attrs(
attributes
)
Expand Down
0 ...telemetry/instrumentation/asgi/package.py → ...telemetry/instrumentation/asgi/package.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...elemetry/instrumentation/flask/version.py → ...telemetry/instrumentation/asgi/version.py
View file
Open in desktop
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__ = "0.38b0"
__version__ = "0.39b0"
4 changes: 2 additions & 2 deletions ...entation/auto_instrumentation/__init__.py → ...entation/auto_instrumentation/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

from pkg_resources import iter_entry_points

from azure.monitor.opentelemetry._vendor.v0_38b0.opentelemetry.instrumentation.version import (
__version__,
from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.version import (
__version__
)

_logger = getLogger(__name__)
Expand Down
18 changes: 9 additions & 9 deletions ...ion/auto_instrumentation/sitecustomize.py → ...ion/auto_instrumentation/sitecustomize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@

from pkg_resources import iter_entry_points

from azure.monitor.opentelemetry._vendor.v0_38b0.opentelemetry.instrumentation.dependencies import (
from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.dependencies import (
get_dist_dependency_conflicts,
)
from azure.monitor.opentelemetry._vendor.v0_38b0.opentelemetry.instrumentation.distro import (
from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.distro import (
BaseDistro,
DefaultDistro,
DefaultDistro
)
from azure.monitor.opentelemetry._vendor.v0_38b0.opentelemetry.instrumentation.environment_variables import (
from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.environment_variables import (
OTEL_PYTHON_DISABLED_INSTRUMENTATIONS,
)
from azure.monitor.opentelemetry._vendor.v0_38b0.opentelemetry.instrumentation.utils import (
_python_path_without_directory,
)
from azure.monitor.opentelemetry._vendor.v0_38b0.opentelemetry.instrumentation.version import (
__version__,
from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.utils import (
_python_path_without_directory
)
from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.version import (
__version__
)

logger = getLogger(__name__)

Expand Down
6 changes: 3 additions & 3 deletions ...pentelemetry/instrumentation/bootstrap.py → ...pentelemetry/instrumentation/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@

import pkg_resources

from azure.monitor.opentelemetry._vendor.v0_38b0.opentelemetry.instrumentation.bootstrap_gen import (
from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.bootstrap_gen import (
default_instrumentations,
libraries,
)
from azure.monitor.opentelemetry._vendor.v0_38b0.opentelemetry.instrumentation.version import (
__version__,
from azure.monitor.opentelemetry._vendor.v0_39b0.opentelemetry.instrumentation.version import (
__version__
)

logger = logging.getLogger(__name__)
Expand Down
Loading