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

Jump to bottom

Implement Otel semantic convention stability opt-in #1987

Merged
merged 12 commits into from
Nov 10, 2023
Merged

Implement Otel semantic convention stability opt-in #1987

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
79e7dd6
sem
lzchen Oct 3, 2023
df71baf
lint
lzchen Oct 3, 2023
0f141fd
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
lzchen Oct 5, 2023
571f9e2
Update utils.py
lzchen Oct 5, 2023
7b0d0fa
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
lzchen Oct 11, 2023
fb34c86
Using enum
jeremydvoss Oct 17, 2023
edfa99e
lint
jeremydvoss Oct 18, 2023
50f0ea2
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
lzchen Nov 7, 2023
706b22a
Merge branch 'sem' of https://github.com/lzchen/opentelemetry-python-…
lzchen Nov 7, 2023
15d6794
Merge branch 'main' into sem
lzchen Nov 9, 2023
5c2d603
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
lzchen Nov 10, 2023
f0ed7a5
Merge branch 'sem' of https://github.com/lzchen/opentelemetry-python-…
lzchen Nov 10, 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
Prev Previous commit
Next Next commit
Using enum
  • Loading branch information
@jeremydvoss
jeremydvoss committed Oct 17, 2023
commit fb34c86b8636c403846b82a1e7bb1df071caf525
7 changes: 4 additions & 3 deletions opentelemetry-instrumentation/src/opentelemetry/instrumentation/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import os
import threading
import urllib.parse
from enum import Enum
from re import escape, sub
from typing import Dict, Sequence

Expand Down Expand Up @@ -163,7 +164,7 @@ class _OpenTelemetryStabilitySignalType:
HTTP = "http"


class _OpenTelemetryStabilityMode:
class _OpenTelemetryStabilityMode(Enum):
# http - emit the new, stable HTTP and networking conventions ONLY
jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved
HTTP = "http"
# http/dup - emit both the old and the stable HTTP and networking conventions
Expand Down Expand Up @@ -191,9 +192,9 @@ def _initialize(cls):
if opt_in_list:
# Process http opt-in
# http/dup takes priority over http
if _OpenTelemetryStabilityMode.HTTP_DUP in opt_in_list:
if _OpenTelemetryStabilityMode.HTTP_DUP.value in opt_in_list:
http_opt_in = _OpenTelemetryStabilityMode.HTTP_DUP
elif _OpenTelemetryStabilityMode.HTTP in opt_in_list:
elif _OpenTelemetryStabilityMode.HTTP.value in opt_in_list:
http_opt_in = _OpenTelemetryStabilityMode.HTTP
_OpenTelemetrySemanticConventionStability._OTEL_SEMCONV_STABILITY_SIGNAL_MAPPING[
_OpenTelemetryStabilitySignalType.HTTP
Expand Down
Loading