Skip to content

Create a single resource instance #3118

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
srikanthccv merged 15 commits into from
Feb 6, 2023
Merged

Create a single resource instance #3118

Changes from 4 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0348b3d
create single resource instance
srikanthccv Jan 6, 2023
340e7e9
Fix lint
srikanthccv Jan 6, 2023
ff8c590
Fix lint
srikanthccv Jan 6, 2023
a9336a0
Update CHANGELOG.md
srikanthccv Jan 6, 2023
14a8c72
Merge branch 'main' into single-resource
srikanthccv Jan 11, 2023
5e606dc
Merge branch 'main' into single-resource
srikanthccv Jan 14, 2023
e69ca3b
Merge branch 'main' into single-resource
srikanthccv Feb 2, 2023
548db26
Add another test
srikanthccv Feb 2, 2023
c3e849b
resolve conflicts
srikanthccv Feb 2, 2023
33c4bba
Black format
srikanthccv Feb 2, 2023
db835bd
Merge branch 'main' into single-resource
srikanthccv Feb 2, 2023
634c828
Fix tests for < py3.8
srikanthccv Feb 3, 2023
f0f8ec9
Merge branch 'single-resource' of github.com:srikanthccv/opentelemetr…
srikanthccv Feb 3, 2023
db9b8d4
Merge branch 'main' into single-resource
srikanthccv Feb 3, 2023
64fa42a
Merge branch 'main' into single-resource
lzchen Feb 3, 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
20 changes: 12 additions & 8 deletions opentelemetry-sdk/tests/test_configurator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,12 @@ def test_trace_init_otlp(self):

@patch.dict(environ, {OTEL_PYTHON_ID_GENERATOR: "custom_id_generator"})
@patch("opentelemetry.sdk._configuration.IdGenerator", new=IdGenerator)
@patch("opentelemetry.sdk._configuration.iter_entry_points")
def test_trace_init_custom_id_generator(self, mock_iter_entry_points):
mock_iter_entry_points.configure_mock(
return_value=[IterEntryPoint("custom_id_generator", CustomIdGenerator)]
@patch("opentelemetry.sdk._configuration.entry_points")
def test_trace_init_custom_id_generator(self, mock_entry_points):
mock_entry_points.configure_mock(
return_value=[
IterEntryPoint("custom_id_generator", CustomIdGenerator)
]
)

id_generator_name = _get_id_generator()
Expand Down Expand Up @@ -442,8 +444,8 @@ def test_trace_init_custom_sampler_with_env_unused_arg(
OTEL_TRACES_SAMPLER_ARG: "0.5",
},
)
def test_trace_init_custom_ratio_sampler_with_env(self, mock_iter_entry_points):
mock_iter_entry_points.configure_mock(
def test_trace_init_custom_ratio_sampler_with_env(self, mock_entry_points):
mock_entry_points.configure_mock(
return_value=[
IterEntryPoint(
"custom_ratio_sampler_factory",
Expand Down Expand Up @@ -603,8 +605,10 @@ def test_logging_init_exporter(self):
"otlp-service",
)
self.assertIsInstance(provider.processor, DummyLogRecordProcessor)
self.assertIsInstance(provider.processor.exporter, DummyOTLPLogExporter)
logging.getLogger(__name__).error("hello")
self.assertIsInstance(
provider.processor.exporter, DummyOTLPLogExporter
)
getLogger(__name__).error("hello")
self.assertTrue(provider.processor.exporter.export_called)

@patch.dict(
Expand Down