Skip to content

Commit 04cb9f9

Browse files
committed
Revert changes adding event name to the log
1 parent 7256c1a commit 04cb9f9

File tree

4 files changed

+1
-12
lines changed
  • exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/_internal/_log_encoder
  • opentelemetry-api/src/opentelemetry/_logs/_internal
  • opentelemetry-sdk

4 files changed

+1
-12
lines changed

exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/_internal/_log_encoder/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ def _encode_log(log_data: LogData) -> PB2LogRecord:
6262
),
6363
dropped_attributes_count=log_data.log_record.dropped_attributes,
6464
severity_number=log_data.log_record.severity_number.value,
65-
event_name=log_data.log_record.event_name,
6665
)
6766

6867

opentelemetry-api/src/opentelemetry/_logs/_internal/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ def __init__(
6969
severity_number: Optional[SeverityNumber] = None,
7070
body: AnyValue = None,
7171
attributes: Optional[_ExtendedAttributes] = None,
72-
event_name: Optional[str] = None,
7372
) -> None: ...
7473

7574
@overload
@@ -85,7 +84,6 @@ def __init__(
8584
severity_number: Optional[SeverityNumber] = None,
8685
body: AnyValue = None,
8786
attributes: Optional[_ExtendedAttributes] = None,
88-
event_name: Optional[str] = None,
8987
) -> None: ...
9088

9189
def __init__(
@@ -101,7 +99,6 @@ def __init__(
10199
severity_number: Optional[SeverityNumber] = None,
102100
body: AnyValue = None,
103101
attributes: Optional[_ExtendedAttributes] = None,
104-
event_name: Optional[str] = None,
105102
) -> None:
106103
self.timestamp = timestamp
107104
if observed_timestamp is None:
@@ -115,7 +112,6 @@ def __init__(
115112
self.severity_number = severity_number
116113
self.body = body
117114
self.attributes = attributes
118-
self.event_name = event_name
119115

120116

121117
class Logger(ABC):

opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/__init__.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ def __init__(
206206
resource: Resource | None = None,
207207
attributes: _ExtendedAttributes | None = None,
208208
limits: LogLimits | None = _UnsetLogLimits,
209-
event_name: str | None = None,
210209
): ...
211210

212211
@overload
@@ -223,7 +222,6 @@ def __init__(
223222
resource: Resource | None = None,
224223
attributes: _ExtendedAttributes | None = None,
225224
limits: LogLimits | None = _UnsetLogLimits,
226-
event_name: str | None = None,
227225
): ...
228226

229227
def __init__( # pylint:disable=too-many-locals
@@ -240,7 +238,6 @@ def __init__( # pylint:disable=too-many-locals
240238
resource: Resource | None = None,
241239
attributes: _ExtendedAttributes | None = None,
242240
limits: LogLimits | None = _UnsetLogLimits,
243-
event_name: str | None = None,
244241
):
245242
if trace_id or span_id or trace_flags:
246243
warnings.warn(
@@ -278,7 +275,6 @@ def __init__( # pylint:disable=too-many-locals
278275
max_value_len=limits.max_attribute_length,
279276
extended_attributes=True,
280277
),
281-
"event_name": event_name,
282278
}
283279
)
284280
self.resource = (
@@ -322,7 +318,6 @@ def to_json(self, indent: int | None = 4) -> str:
322318
),
323319
"trace_flags": self.trace_flags,
324320
"resource": json.loads(self.resource.to_json()),
325-
"event_name": self.event_name if self.event_name else "",
326321
},
327322
indent=indent,
328323
cls=BytesEncoder,

opentelemetry-sdk/tests/logs/test_log_record.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,11 @@ def test_log_record_to_json(self):
4242
"sequence": [1, 2],
4343
"str": "string",
4444
},
45-
event_name="a.event",
4645
)
4746

4847
self.assertEqual(
4948
log_record.to_json(indent=None),
50-
'{"body": {"key": "logLine", "bytes": "MTIz"}, "severity_number": null, "severity_text": null, "attributes": {"mapping": {"key": "value"}, "none": null, "sequence": [1, 2], "str": "string"}, "dropped_attributes": 0, "timestamp": "1970-01-01T00:00:00.000000Z", "observed_timestamp": "1970-01-01T00:00:00.000000Z", "trace_id": "", "span_id": "", "trace_flags": null, "resource": {"attributes": {"service.name": "foo"}, "schema_url": ""}, "event_name": "a.event"}',
49+
'{"body": {"key": "logLine", "bytes": "MTIz"}, "severity_number": null, "severity_text": null, "attributes": {"mapping": {"key": "value"}, "none": null, "sequence": [1, 2], "str": "string"}, "dropped_attributes": 0, "timestamp": "1970-01-01T00:00:00.000000Z", "observed_timestamp": "1970-01-01T00:00:00.000000Z", "trace_id": "", "span_id": "", "trace_flags": null, "resource": {"attributes": {"service.name": "foo"}, "schema_url": ""}}',
5150
)
5251

5352
def test_log_record_to_json_serializes_severity_number_as_int(self):

0 commit comments

Comments
 (0)