Merge branch 'main' into fix-2051

Author: owais

Diff for: CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2044](https://github.com/open-telemetry/opentelemetry-python/pull/2044))
 - `opentelemetry-sdk` Add support for `OTEL_ATTRIBUTE_VALUE_LENGTH_LIMIT` env var
   ([#2056](https://github.com/open-telemetry/opentelemetry-python/pull/2056))
+
 ## [0.23.1](https://github.com/open-telemetry/opentelemetry-python/pull/1987) - 2021-07-26
 
 ### Changed

Diff for: opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py

@@ -593,6 +593,10 @@ def __init__(
             OTEL_LINK_ATTRIBUTE_COUNT_LIMIT,
             _DEFAULT_OTEL_LINK_ATTRIBUTE_COUNT_LIMIT,
         )
+        self.max_attribute_length = self._from_env_if_absent(
+            max_attribute_length,
+            OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT,
+        )
 
         self.max_attribute_length = self._from_env_if_absent(
             max_attribute_length,

Diff for: opentelemetry-sdk/tests/trace/test_trace.py

@@ -1350,7 +1350,9 @@ def test_limits_attribute_length_limits_code(self):
         self.assertEqual(limits.max_span_attribute_length, 22)
 
         # global and span limits set to different values
-        limits = trace.SpanLimits(max_attribute_length=22, max_span_attribute_length=33)
+        limits = trace.SpanLimits(
+            max_attribute_length=22, max_span_attribute_length=33
+        )
         self.assertEqual(limits.max_attribute_length, 22)
         self.assertEqual(limits.max_span_attribute_length, 33)
 
@@ -1393,6 +1395,101 @@ def test_limits_values_env(self):
             self.assertEqual(limits.max_events, max_events)
             self.assertEqual(limits.max_links, max_links)
 
+    def _test_span_limits(
+        self, tracer, max_attrs, max_events, max_links, max_attr_len
+    ):
+        id_generator = RandomIdGenerator()
+        some_links = [
+            trace_api.Link(
+                trace_api.SpanContext(
+                    trace_id=id_generator.generate_trace_id(),
+                    span_id=id_generator.generate_span_id(),
+                    is_remote=False,
+                ),
+                attributes={"k": self.long_val},
+            )
+            for _ in range(100)
+        ]
+
+        some_attrs = {
+            "init_attribute_{}".format(idx): self.long_val
+            for idx in range(100)
+        }
+        with tracer.start_as_current_span(
+            "root", links=some_links, attributes=some_attrs
+        ) as root:
+            self.assertEqual(len(root.links), max_links)
+            self.assertEqual(len(root.attributes), max_attrs)
+            for idx in range(100):
+                root.set_attribute(
+                    "my_str_attribute_{}".format(idx), self.long_val
+                )
+                root.set_attribute(
+                    "my_byte_attribute_{}".format(idx), self.long_val.encode()
+                )
+                root.set_attribute(
+                    "my_int_attribute_{}".format(idx), self.long_val.encode()
+                )
+                root.add_event(
+                    "my_event_{}".format(idx), attributes={"k": self.long_val}
+                )
+
+            self.assertEqual(len(root.attributes), max_attrs)
+            self.assertEqual(len(root.events), max_events)
+
+            for link in root.links:
+                for attr_val in link.attributes.values():
+                    self._assert_attr_length(attr_val, max_attr_len)
+
+            for event in root.events:
+                for attr_val in event.attributes.values():
+                    self._assert_attr_length(attr_val, max_attr_len)
+
+            for attr_val in root.attributes.values():
+                self._assert_attr_length(attr_val, max_attr_len)
+
+    def _test_span_no_limits(self, tracer):
+        num_links = int(trace._DEFAULT_OTEL_SPAN_LINK_COUNT_LIMIT) + randint(
+            1, 100
+        )
+
+        id_generator = RandomIdGenerator()
+        some_links = [
+            trace_api.Link(
+                trace_api.SpanContext(
+                    trace_id=id_generator.generate_trace_id(),
+                    span_id=id_generator.generate_span_id(),
+                    is_remote=False,
+                )
+            )
+            for _ in range(num_links)
+        ]
+        with tracer.start_as_current_span("root", links=some_links) as root:
+            self.assertEqual(len(root.links), num_links)
+
+        num_events = int(trace._DEFAULT_OTEL_SPAN_EVENT_COUNT_LIMIT) + randint(
+            1, 100
+        )
+        with tracer.start_as_current_span("root") as root:
+            for idx in range(num_events):
+                root.add_event(
+                    "my_event_{}".format(idx), attributes={"k": self.long_val}
+                )
+
+            self.assertEqual(len(root.events), num_events)
+
+        num_attributes = int(
+            trace._DEFAULT_OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT
+        ) + randint(1, 100)
+        with tracer.start_as_current_span("root") as root:
+            for idx in range(num_attributes):
+                root.set_attribute(
+                    "my_attribute_{}".format(idx), self.long_val
+                )
+
+            self.assertEqual(len(root.attributes), num_attributes)
+            for attr_val in root.attributes.values():
+                self.assertEqual(attr_val, self.long_val)
 
     @mock.patch.dict(
         "os.environ",
@@ -1469,7 +1566,6 @@ def test_span_limits_code(self):
             OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT: "unset",
         },
     )
-
     def test_span_no_limits_env(self):
         self._test_span_no_limits(new_tracer())
 
@@ -1495,7 +1591,13 @@ def test_dropped_attributes(self):
         self.assertEqual(2, span.resource.attributes.dropped)
 
     def _test_span_limits(
-        self, tracer, max_attrs, max_events, max_links, max_attr_len, max_span_attr_len,
+        self,
+        tracer,
+        max_attrs,
+        max_events,
+        max_links,
+        max_attr_len,
+        max_span_attr_len,
     ):
         id_generator = RandomIdGenerator()
         some_links = [
@@ -1588,4 +1690,4 @@ def _test_span_no_limits(self, tracer):
 
             self.assertEqual(len(root.attributes), num_attributes)
             for attr_val in root.attributes.values():
-                self.assertEqual(attr_val, self.long_val)
+                self.assertEqual(attr_val, self.long_val)