Skip to content

Commit 651ef93

Browse files
committed
Update logic to set log name
1 parent 27f602b commit 651ef93

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

dev-constraints.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ setuptools==69.5.1
1717

1818
# pinned for snapshot tests. this should be bumped regularly and snapshots updated by running
1919
# tox -f py311-test -- --snapshot-update
20-
opentelemetry-api==1.30.0
21-
opentelemetry-sdk==1.30.0
20+
opentelemetry-api==1.35.0
21+
opentelemetry-sdk==1.35.0

opentelemetry-exporter-gcp-logging/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
Added support for when `bytes` or `list['bytes']` is in `LogRecord.body` and
66
body is of type Mapping. Update opentelemetry-api/sdk dependencies to 1.3.
77

8+
The suffix part of `LogEntry.log_name` will be the `LogRecord.event_name` when
9+
that is present and the `gcp.log_name` is not.
10+
811
## Version 1.9.0a0
912

1013
Released 2025-02-03

opentelemetry-exporter-gcp-logging/src/opentelemetry/exporter/cloud_logging/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757

5858
HTTP_REQUEST_ATTRIBUTE_KEY = "gcp.http_request"
5959
LOG_NAME_ATTRIBUTE_KEY = "gcp.log_name"
60-
EVENT_NAME_ATTRIBUTE_KEY = "event.name"
6160
SOURCE_LOCATION_ATTRIBUTE_KEY = "gcp.source_location"
6261
TRACE_SAMPLED_ATTRIBUTE_KEY = "gcp.trace_sampled"
6362
PROJECT_ID_ATTRIBUTE_KEY = "gcp.project_id"
@@ -201,8 +200,8 @@ def export(self, batch: Sequence[LogData]):
201200
log_suffix = self.default_log_name
202201
if attributes.get(LOG_NAME_ATTRIBUTE_KEY):
203202
log_suffix = urllib.parse.quote_plus(attributes.get(LOG_NAME_ATTRIBUTE_KEY))
204-
elif attributes.get(EVENT_NAME_ATTRIBUTE_KEY):
205-
log_suffix = urllib.parse.quote_plus(attributes.get(EVENT_NAME_ATTRIBUTE_KEY))
203+
elif log_record.event_name:
204+
log_suffix = urllib.parse.quote_plus(log_record.event_name.replace('.', '_'))
206205
log_entry.log_name = f"projects/{project_id}/logs/{log_suffix}"
207206
# If timestamp is unset fall back to observed_time_unix_nano as recommended,
208207
# see https://github.com/open-telemetry/opentelemetry-proto/blob/4abbb78/opentelemetry/proto/logs/v1/logs.proto#L176-L179

opentelemetry-exporter-gcp-logging/tests/__snapshots__/test_cloud_logging/test_convert_otlp_dict_body.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"gen_ai.system": "true",
2626
"test": "23"
2727
},
28-
"logName": "projects/fakeproject/logs/test",
28+
"logName": "projects/fakeproject/logs/random_genai_event",
2929
"resource": {
3030
"labels": {
3131
"location": "global",

opentelemetry-exporter-gcp-logging/tests/test_cloud_logging.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ def test_convert_otlp_dict_body(
7474
log_data = [
7575
LogData(
7676
log_record=LogRecord(
77+
event_name='random.genai.event',
7778
timestamp=1736976310997977393,
7879
severity_number=SeverityNumber(20),
7980
trace_id=25,

0 commit comments

Comments
 (0)