Merge branch 'main' into infra/separate-gen-workflow

open-telemetry · Nov 26, 2024 · 6a9aeac · 6a9aeac
2 parents 1095348 + 2ddb076
commit 6a9aeac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4311](https://github.com/open-telemetry/opentelemetry-python/pull/4311))
 - sdk: fix serialization of logs severity_number field to int
   ([#4324](https://github.com/open-telemetry/opentelemetry-python/pull/4324))
+- Remove `TestBase.assertEqualSpanInstrumentationInfo` method, use `assertEqualSpanInstrumentationScope` instead
+  ([#4310](https://github.com/open-telemetry/opentelemetry-python/pull/4310))
 
 ## Version 1.28.0/0.49b0 (2024-11-05)
 

diff --git a/tests/opentelemetry-test-utils/src/opentelemetry/test/test_base.py b/tests/opentelemetry-test-utils/src/opentelemetry/test/test_base.py
@@ -70,10 +70,6 @@ def get_finished_spans(self):
             self, self.memory_exporter.get_finished_spans()
         )
 
-    def assertEqualSpanInstrumentationInfo(self, span, module):
-        self.assertEqual(span.instrumentation_info.name, module.__name__)
-        self.assertEqual(span.instrumentation_info.version, module.__version__)
-
     def assertEqualSpanInstrumentationScope(self, span, module):
         self.assertEqual(span.instrumentation_scope.name, module.__name__)
         self.assertEqual(