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

NH-46870 Otel Python 1.19.0/0.40b0 #178

Merged
merged 2 commits into from
Jul 20, 2023
Merged

NH-46870 Otel Python 1.19.0/0.40b0 #178

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
a5f1f7d
Otel Python 1.19.0/0.40b0
tammy-baylis-swi Jul 19, 2023
9b9426c
Update test span name asserts
tammy-baylis-swi Jul 19, 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
6 changes: 3 additions & 3 deletions dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opentelemetry-test-utils==0.39b0
opentelemetry-instrumentation-flask==0.39b0
opentelemetry-instrumentation-requests==0.39b0
opentelemetry-test-utils==0.40b0
opentelemetry-instrumentation-flask==0.40b0
opentelemetry-instrumentation-requests==0.40b0
pytest
pytest-cov
pytest-mock
Expand Down
8 changes: 4 additions & 4 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ classifiers =
[options]
python_requires = >=3.7
install_requires =
opentelemetry-api == 1.18.0
opentelemetry-sdk == 1.18.0
opentelemetry-instrumentation == 0.39b0
opentelemetry-instrumentation-logging == 0.39b0
opentelemetry-api == 1.19.0
opentelemetry-sdk == 1.19.0
opentelemetry-instrumentation == 0.40b0
opentelemetry-instrumentation-logging == 0.40b0
packages = solarwinds_apm, solarwinds_apm.api, solarwinds_apm.certs, solarwinds_apm.extension

[options.package_data]
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_scenario_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def test_scenario_1_sampled(self):
span_client = spans[0]
assert span_server.name == "/test_trace/"
assert span_server.kind == trace_api.SpanKind.SERVER
assert span_client.name == "HTTP GET"
assert span_client.name == "GET"
assert span_client.kind == trace_api.SpanKind.CLIENT

# Check root span tracestate has no `sw` key
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_scenario_4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def test_scenario_4_sampled(self):
span_client = spans[0]
assert span_server.name == "/test_trace/"
assert span_server.kind == trace_api.SpanKind.SERVER
assert span_client.name == "HTTP GET"
assert span_client.name == "GET"
assert span_client.kind == trace_api.SpanKind.CLIENT

# Check spans' trace_id, which should match traceparent of original request
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/test_scenario_8.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def test_sampled_both_trace_context_and_xtraceoptions_valid(self):
span_client = spans[0]
assert span_server.name == "/test_trace/"
assert span_server.kind == trace_api.SpanKind.SERVER
assert span_client.name == "HTTP GET"
assert span_client.name == "GET"
assert span_client.kind == trace_api.SpanKind.CLIENT

# Check spans' trace_id, which should match traceparent of original request
Expand Down Expand Up @@ -435,7 +435,7 @@ def test_sampled_both_trace_context_and_xtraceoptions_valid_without_tt(self):
span_client = spans[0]
assert span_server.name == "/test_trace/"
assert span_server.kind == trace_api.SpanKind.SERVER
assert span_client.name == "HTTP GET"
assert span_client.name == "GET"
assert span_client.kind == trace_api.SpanKind.CLIENT

# Check spans' trace_id, which should match traceparent of original request
Expand Down Expand Up @@ -706,7 +706,7 @@ def test_sampled_invalid_trace_context_and_valid_unsigned_with_tt(self):
span_client = spans[0]
assert span_server.name == "/test_trace/"
assert span_server.kind == trace_api.SpanKind.SERVER
assert span_client.name == "HTTP GET"
assert span_client.name == "GET"
assert span_client.kind == trace_api.SpanKind.CLIENT

# Check root span tracestate has `xtrace_options_response` key but no `sw` key
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_signed_tt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def test_signed_with_tt_auth_ok(self):
span_client = spans[0]
assert span_server.name == "/test_trace/"
assert span_server.kind == trace_api.SpanKind.SERVER
assert span_client.name == "HTTP GET"
assert span_client.name == "GET"
assert span_client.kind == trace_api.SpanKind.CLIENT

# Check root span tracestate has `xtrace_options_response` key but no `sw` key
Expand Down Expand Up @@ -267,7 +267,7 @@ def test_signed_without_tt_auth_ok(self):
span_client = spans[0]
assert span_server.name == "/test_trace/"
assert span_server.kind == trace_api.SpanKind.SERVER
assert span_client.name == "HTTP GET"
assert span_client.name == "GET"
assert span_client.kind == trace_api.SpanKind.CLIENT

# Check root span tracestate has `xtrace_options_response` key but no `sw` key
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_unsigned_tt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def test_unsigned_with_tt_sampled(self):
span_client = spans[0]
assert span_server.name == "/test_trace/"
assert span_server.kind == trace_api.SpanKind.SERVER
assert span_client.name == "HTTP GET"
assert span_client.name == "GET"
assert span_client.kind == trace_api.SpanKind.CLIENT

# Check root span tracestate has `xtrace_options_response` key but no `sw` key
Expand Down Expand Up @@ -426,7 +426,7 @@ def test_unsigned_without_tt_sampled(self):
span_client = spans[0]
assert span_server.name == "/test_trace/"
assert span_server.kind == trace_api.SpanKind.SERVER
assert span_client.name == "HTTP GET"
assert span_client.name == "GET"
assert span_client.kind == trace_api.SpanKind.CLIENT

# Check root span tracestate has `xtrace_options_response` key but no `sw` key
Expand Down