Skip to content

Commit 4f80c64

Browse files
benjaminjbbenjaminjb
committed
remove context: log
1 parent 3fab41d commit 4f80c64

12 files changed

+18
-41
lines changed

‎internal/collector/generated/pgbackrest_logs_transforms.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/collector/generated/postgres_logs_transforms.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/collector/patroni.go

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ func EnablePatroniLogging(ctx context.Context,
6464
// https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/-/processor/transformprocessor#readme
6565
outConfig.Processors["transform/patroni_logs"] = map[string]any{
6666
"log_statements": []map[string]any{{
67-
"context": "log",
6867
"statements": []string{
6968
`set(instrumentation_scope.name, "patroni")`,
7069

‎internal/collector/patroni_test.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ processors:
7171
timeout: 30s
7272
transform/patroni_logs:
7373
log_statements:
74-
- context: log
75-
statements:
74+
- statements:
7675
- set(instrumentation_scope.name, "patroni")
7776
- set(log.cache, ParseJSON(log.body["original"]))
7877
- set(log.severity_text, log.cache["levelname"])
@@ -171,8 +170,7 @@ processors:
171170
timeout: 30s
172171
transform/patroni_logs:
173172
log_statements:
174-
- context: log
175-
statements:
173+
- statements:
176174
- set(instrumentation_scope.name, "patroni")
177175
- set(log.cache, ParseJSON(log.body["original"]))
178176
- set(log.severity_text, log.cache["levelname"])

‎internal/collector/pgadmin.go

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ func EnablePgAdminLogging(ctx context.Context, spec *v1beta1.InstrumentationSpec
5555
otelConfig.Processors["transform/pgadmin_log"] = map[string]any{
5656
"log_statements": []map[string]any{
5757
{
58-
"context": "log",
5958
"statements": []string{
6059
// Keep the unparsed log record in a standard attribute, and replace
6160
// the log record body with the message field.

‎internal/collector/pgadmin_test.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ collector.yaml: |
7575
timeout: 30s
7676
transform/pgadmin_log:
7777
log_statements:
78-
- context: log
79-
statements:
78+
- statements:
8079
- set(log.attributes["log.record.original"], log.body)
8180
- set(log.cache, ParseJSON(log.body))
8281
- merge_maps(log.attributes, ExtractPatterns(log.cache["message"], "(?P<webrequest>[A-Z]{3}.*?[\\d]{3})"),
@@ -201,8 +200,7 @@ collector.yaml: |
201200
timeout: 30s
202201
transform/pgadmin_log:
203202
log_statements:
204-
- context: log
205-
statements:
203+
- statements:
206204
- set(log.attributes["log.record.original"], log.body)
207205
- set(log.cache, ParseJSON(log.body))
208206
- merge_maps(log.attributes, ExtractPatterns(log.cache["message"], "(?P<webrequest>[A-Z]{3}.*?[\\d]{3})"),

‎internal/collector/pgbackrest_logs_transforms.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
#
44
# https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/-/processor/transformprocessor#readme
55

6-
- context: log
7-
statements:
6+
- statements:
87
- set(instrumentation_scope.name, "pgbackrest")
98
- set(instrumentation_scope.schema_url, "https://opentelemetry.io/schemas/1.29.0")
109

‎internal/collector/pgbackrest_test.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ processors:
7373
timeout: 30s
7474
transform/pgbackrest_logs:
7575
log_statements:
76-
- context: log
77-
statements:
76+
- statements:
7877
- set(instrumentation_scope.name, "pgbackrest")
7978
- set(instrumentation_scope.schema_url, "https://opentelemetry.io/schemas/1.29.0")
8079
- 'merge_maps(log.cache, ExtractPatterns(log.body, "^(?<timestamp>\\d{4}-\\d{2}-\\d{2}
@@ -180,8 +179,7 @@ processors:
180179
timeout: 30s
181180
transform/pgbackrest_logs:
182181
log_statements:
183-
- context: log
184-
statements:
182+
- statements:
185183
- set(instrumentation_scope.name, "pgbackrest")
186184
- set(instrumentation_scope.schema_url, "https://opentelemetry.io/schemas/1.29.0")
187185
- 'merge_maps(log.cache, ExtractPatterns(log.body, "^(?<timestamp>\\d{4}-\\d{2}-\\d{2}

‎internal/collector/pgbouncer.go

-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ func EnablePgBouncerLogging(ctx context.Context,
9696
// https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/-/processor/transformprocessor#readme
9797
outConfig.Processors["transform/pgbouncer_logs"] = map[string]any{
9898
"log_statements": []map[string]any{{
99-
"context": "log",
10099
"statements": []string{
101100
// Set instrumentation scope
102101
`set(instrumentation_scope.name, "pgbouncer")`,

‎internal/collector/pgbouncer_test.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ processors:
7070
timeout: 30s
7171
transform/pgbouncer_logs:
7272
log_statements:
73-
- context: log
74-
statements:
73+
- statements:
7574
- set(instrumentation_scope.name, "pgbouncer")
7675
- merge_maps(log.cache, ExtractPatterns(log.body, "^(?<timestamp>\\d{4}-\\d{2}-\\d{2}
7776
\\d{2}:\\d{2}:\\d{2}\\.\\d{3} [A-Z]{3}) \\[(?<pid>\\d+)\\] (?<log_level>[A-Z]+)
@@ -171,8 +170,7 @@ processors:
171170
timeout: 30s
172171
transform/pgbouncer_logs:
173172
log_statements:
174-
- context: log
175-
statements:
173+
- statements:
176174
- set(instrumentation_scope.name, "pgbouncer")
177175
- merge_maps(log.cache, ExtractPatterns(log.body, "^(?<timestamp>\\d{4}-\\d{2}-\\d{2}
178176
\\d{2}:\\d{2}:\\d{2}\\.\\d{3} [A-Z]{3}) \\[(?<pid>\\d+)\\] (?<log_level>[A-Z]+)

‎internal/collector/postgres_logs_transforms.yaml

+3-6
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
# TODO(postgres-14): We can stop parsing CSV logs when 14 is EOL.
99
# https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/-/pkg/ottl/contexts/ottllog#readme
10-
- context: log
11-
conditions:
10+
- conditions:
1211
- body["format"] == "csv"
1312
statements:
1413
# https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/-/pkg/ottl/ottlfuncs#parsecsv
@@ -81,8 +80,7 @@
8180

8281

8382
# https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/-/pkg/ottl/contexts/ottllog#readme
84-
- context: log
85-
statements:
83+
- statements:
8684
- set(instrumentation_scope.name, "postgres")
8785
- set(instrumentation_scope.version, resource.attributes["db.version"])
8886

@@ -191,8 +189,7 @@
191189
#
192190
# https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/-/pkg/ottl/contexts/ottllog#readme
193191
# https://github.com/pgaudit/pgaudit#format
194-
- context: log
195-
conditions:
192+
- conditions:
196193
# Messages from pgAudit have always been prefixed with "AUDIT:", but that
197194
# could change in the future.
198195
#

0 commit comments

Comments
 (0)