diff --git a/apps/otlp.go b/apps/otlp.go index 6ceb70e637..ba61406f9b 100644 --- a/apps/otlp.go +++ b/apps/otlp.go @@ -137,7 +137,11 @@ func (r ReceiverOTLP) Pipelines(ctx context.Context) ([]otel.ReceiverPipeline, e receiverPipelineType, metricsRDM, metricsProcessors := r.metricsProcessors(ctx) - return []otel.ReceiverPipeline{{ + converter := confgenerator.ConvertGCMOtelExporterToOtlpExporter + if r.MetricsMode != "googlecloudmonitoring" { + converter = confgenerator.ConvertOtlpPrometheusExporterToOtlpExporter + } + return []otel.ReceiverPipeline{converter(otel.ReceiverPipeline{ ExporterTypes: map[string]otel.ExporterType{ "metrics": receiverPipelineType, "traces": otel.OTel, @@ -163,7 +167,7 @@ func (r ReceiverOTLP) Pipelines(ctx context.Context) ([]otel.ReceiverPipeline, e "traces": otel.SetIfMissing, "logs": otel.SetIfMissing, }, - }}, nil + }, ctx)}, nil } func init() { diff --git a/confgenerator/confgenerator.go b/confgenerator/confgenerator.go index cbb5489fab..5f4170d6b0 100644 --- a/confgenerator/confgenerator.go +++ b/confgenerator/confgenerator.go @@ -57,15 +57,19 @@ func googleCloudExporter(userAgent string, instrumentationLabels bool, serviceRe } } +func ConvertOtlpPrometheusExporterToOtlpExporter(receiver otel.ReceiverPipeline, ctx context.Context) otel.ReceiverPipeline { + return ConvertToOtlpExporter(receiver, ctx, true, true) +} + func ConvertPrometheusExporterToOtlpExporter(receiver otel.ReceiverPipeline, ctx context.Context) otel.ReceiverPipeline { - return ConvertToOtlpExporter(receiver, ctx, true) + return ConvertToOtlpExporter(receiver, ctx, true, false) } func ConvertGCMOtelExporterToOtlpExporter(receiver otel.ReceiverPipeline, ctx context.Context) otel.ReceiverPipeline { - return ConvertToOtlpExporter(receiver, ctx, false) + return ConvertToOtlpExporter(receiver, ctx, false, false) } -func ConvertToOtlpExporter(receiver otel.ReceiverPipeline, ctx context.Context, isPrometheus bool) otel.ReceiverPipeline { +func ConvertToOtlpExporter(receiver otel.ReceiverPipeline, ctx context.Context, isPrometheus, isOtlp bool) otel.ReceiverPipeline { expOtlpExporter := experimentsFromContext(ctx)["otlp_exporter"] resource, _ := platform.FromContext(ctx).GetResource() if !expOtlpExporter { @@ -81,6 +85,11 @@ func ConvertToOtlpExporter(receiver otel.ReceiverPipeline, ctx context.Context, if isPrometheus { receiver.Processors["metrics"] = append(receiver.Processors["metrics"], otel.MetricUnknownCounter()) receiver.Processors["metrics"] = append(receiver.Processors["metrics"], otel.MetricStartTime()) + // if isOtlp { + // receiver.Processors["metrics"] = append(receiver.Processors["metrics"], + // otel.MetricsTransform( + // otel.AddPrefix("prometheus.googleapis.com"))) + // } } return receiver } diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/EXPERIMENTAL_FEATURES b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/EXPERIMENTAL_FEATURES new file mode 100644 index 0000000000..9d450f37a8 --- /dev/null +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/EXPERIMENTAL_FEATURES @@ -0,0 +1 @@ +otlp_exporter diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/0f15dbe303dc7122d43443c9a4c31632.lua b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/0f15dbe303dc7122d43443c9a4c31632.lua new file mode 100644 index 0000000000..dda27aee97 --- /dev/null +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/0f15dbe303dc7122d43443c9a4c31632.lua @@ -0,0 +1,28 @@ + +function process(tag, timestamp, record) +local v = "ops-agent"; +(function(value) +if record["logging.googleapis.com/labels"] == nil +then +record["logging.googleapis.com/labels"] = {} +end +record["logging.googleapis.com/labels"]["agent.googleapis.com/health/agentKind"] = value +end)(v) +local v = "latest"; +(function(value) +if record["logging.googleapis.com/labels"] == nil +then +record["logging.googleapis.com/labels"] = {} +end +record["logging.googleapis.com/labels"]["agent.googleapis.com/health/agentVersion"] = value +end)(v) +local v = "v1"; +(function(value) +if record["logging.googleapis.com/labels"] == nil +then +record["logging.googleapis.com/labels"] = {} +end +record["logging.googleapis.com/labels"]["agent.googleapis.com/health/schemaVersion"] = value +end)(v) +return 2, timestamp, record +end diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/4d6012ff003886818fb9b9285b4af962.lua b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/4d6012ff003886818fb9b9285b4af962.lua new file mode 100644 index 0000000000..c225be24d5 --- /dev/null +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/4d6012ff003886818fb9b9285b4af962.lua @@ -0,0 +1,19 @@ + +function process(tag, timestamp, record) +local __field_0 = (function() +return record["severity"] +end)(); +(function(value) +record["severity"] = value +end)(nil); +local v = __field_0; +if v == "debug" then v = "DEBUG" +elseif v == "error" then v = "ERROR" +elseif v == "info" then v = "INFO" +elseif v == "warn" then v = "WARNING" +end +(function(value) +record["logging.googleapis.com/severity"] = value +end)(v) +return 2, timestamp, record +end diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/5fc5f42c16c9e1ab8292e3d42f74f3be.lua b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/5fc5f42c16c9e1ab8292e3d42f74f3be.lua new file mode 100644 index 0000000000..c5465182b5 --- /dev/null +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/5fc5f42c16c9e1ab8292e3d42f74f3be.lua @@ -0,0 +1,49 @@ + + function shallow_merge(record, parsedRecord) + -- If no exiting record exists + if (record == nil) then + return parsedRecord + end + + for k, v in pairs(parsedRecord) do + record[k] = v + end + + return record +end + +function merge(record, parsedRecord) + -- If no exiting record exists + if record == nil then + return parsedRecord + end + + -- Potentially overwrite or merge the original records. + for k, v in pairs(parsedRecord) do + -- If there is no conflict + if k == "logging.googleapis.com/logName" then + -- Ignore the parsed payload since the logName is controlled + -- by the OpsAgent. + elseif k == "logging.googleapis.com/labels" then + -- LogEntry.labels are basically a map[string]string and so only require a + -- shallow merge (one level deep merge). + record[k] = shallow_merge(record[k], v) + else + record[k] = v + end + end + + return record +end + +function parser_merge_record(tag, timestamp, record) + originalPayload = record["logging.googleapis.com/__tmp"] + if originalPayload == nil then + return 0, timestamp, record + end + + -- Remove original payload + record["logging.googleapis.com/__tmp"] = nil + record = merge(originalPayload, record) + return 2, timestamp, record +end diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/adea349dc2d92cd07daa1d7847f5e96a.lua b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/adea349dc2d92cd07daa1d7847f5e96a.lua new file mode 100644 index 0000000000..b2a60a042b --- /dev/null +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/adea349dc2d92cd07daa1d7847f5e96a.lua @@ -0,0 +1,74 @@ + +function process(tag, timestamp, record) +local __field_0 = (function() +return record["agent.googleapis.com/log_file_path"] +end)(); +local __field_1 = (function() +if record["logging.googleapis.com/labels"] == nil +then +return nil +end +return record["logging.googleapis.com/labels"]["compute.googleapis.com/instance_group_manager/name"] +end)(); +local __field_2 = (function() +if record["logging.googleapis.com/labels"] == nil +then +return nil +end +return record["logging.googleapis.com/labels"]["compute.googleapis.com/instance_group_manager/zone"] +end)(); +local __field_3 = (function() +if record["logging.googleapis.com/labels"] == nil +then +return nil +end +return record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"] +end)(); +local __field_4 = (function() +return record["logging.googleapis.com/logName"] +end)(); +(function(value) +record["agent.googleapis.com/log_file_path"] = value +end)(nil); +local v = __field_0; +(function(value) +if record["logging.googleapis.com/labels"] == nil +then +record["logging.googleapis.com/labels"] = {} +end +record["logging.googleapis.com/labels"]["agent.googleapis.com/log_file_path"] = value +end)(v) +local v = __field_1; +if v == nil then v = "test-mig" end; +(function(value) +if record["logging.googleapis.com/labels"] == nil +then +record["logging.googleapis.com/labels"] = {} +end +record["logging.googleapis.com/labels"]["compute.googleapis.com/instance_group_manager/name"] = value +end)(v) +local v = __field_2; +if v == nil then v = "test-zone" end; +(function(value) +if record["logging.googleapis.com/labels"] == nil +then +record["logging.googleapis.com/labels"] = {} +end +record["logging.googleapis.com/labels"]["compute.googleapis.com/instance_group_manager/zone"] = value +end)(v) +local v = __field_3; +if v == nil then v = "" end; +(function(value) +if record["logging.googleapis.com/labels"] == nil +then +record["logging.googleapis.com/labels"] = {} +end +record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"] = value +end)(v) +local v = __field_4; +if v == nil then v = "syslog" end; +(function(value) +record["logging.googleapis.com/logName"] = value +end)(v) +return 2, timestamp, record +end diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/b4a0dead382dce7b4fe011d3f59fdb6d.lua b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/b4a0dead382dce7b4fe011d3f59fdb6d.lua new file mode 100644 index 0000000000..6263563b66 --- /dev/null +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/b4a0dead382dce7b4fe011d3f59fdb6d.lua @@ -0,0 +1,17 @@ + +function parser_nest(tag, timestamp, record) + local nestedRecord = {} + local parseKey = "message" + for k, v in pairs(record) do + if k ~= parseKey then + nestedRecord[k] = v + end + end + + local result = {} + result[parseKey] = record[parseKey] + result["logging.googleapis.com/__tmp"] = nestedRecord + + return 2, timestamp, result +end + diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/enabled_receivers_otlp.json b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/enabled_receivers_otlp.json new file mode 100644 index 0000000000..61c807e5a5 --- /dev/null +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/enabled_receivers_otlp.json @@ -0,0 +1 @@ +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/ops_agent/enabled_receivers","gauge":{"dataPoints":[{"attributes":[{"key":"telemetry_type","value":{"stringValue":"metrics"}},{"key":"receiver_type","value":{"stringValue":"hostmetrics"}}],"asInt":"1"},{"attributes":[{"key":"telemetry_type","value":{"stringValue":"metrics"}},{"key":"receiver_type","value":{"stringValue":"otlp"}}],"asInt":"1"},{"attributes":[{"key":"telemetry_type","value":{"stringValue":"logs"}},{"key":"receiver_type","value":{"stringValue":"files"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/feature_tracking_otlp.json b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/feature_tracking_otlp.json new file mode 100644 index 0000000000..6a883d24cd --- /dev/null +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/feature_tracking_otlp.json @@ -0,0 +1 @@ +{"resourceMetrics":[{"resource":{"attributes":[{"key":"k","value":{"stringValue":"v"}}]},"scopeMetrics":[{"scope":{},"metrics":[{"name":"agent.googleapis.com/agent/internal/ops/feature_tracking","gauge":{"dataPoints":[{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"metrics"}},{"key":"feature","value":{"stringValue":"service:pipelines"}},{"key":"key","value":{"stringValue":"default_pipeline_overridden"}},{"key":"value","value":{"stringValue":"false"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"global"}},{"key":"feature","value":{"stringValue":"default:self_log"}},{"key":"key","value":{"stringValue":"default_self_log_file_collection"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"logging"}},{"key":"feature","value":{"stringValue":"service:otel_logging"}},{"key":"key","value":{"stringValue":"otel_logging_supported_config"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"combined"}},{"key":"feature","value":{"stringValue":"receivers:otlp"}},{"key":"key","value":{"stringValue":"[0].enabled"}},{"key":"value","value":{"stringValue":"true"}}],"asInt":"1"},{"attributes":[{"key":"module","value":{"stringValue":"combined"}},{"key":"feature","value":{"stringValue":"receivers:otlp"}},{"key":"key","value":{"stringValue":"[0].metrics_mode"}},{"key":"value","value":{"stringValue":"googlemanagedprometheus"}}],"asInt":"1"}]}}]}]}]} \ No newline at end of file diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/features.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/features.yaml new file mode 100644 index 0000000000..375ca7a387 --- /dev/null +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/features.yaml @@ -0,0 +1,24 @@ +- module: logging + feature: service:pipelines + key: default_pipeline_overridden + value: "false" +- module: metrics + feature: service:pipelines + key: default_pipeline_overridden + value: "false" +- module: global + feature: default:self_log + key: default_self_log_file_collection + value: "true" +- module: logging + feature: service:otel_logging + key: otel_logging_supported_config + value: "true" +- module: combined + feature: receivers:otlp + key: "[0].enabled" + value: "true" +- module: combined + feature: receivers:otlp + key: "[0].metrics_mode" + value: googlemanagedprometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/fluent_bit_main.conf b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/fluent_bit_main.conf new file mode 100644 index 0000000000..a41f7f5311 --- /dev/null +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/fluent_bit_main.conf @@ -0,0 +1,187 @@ +@SET buffers_dir=/var/lib/google-cloud-ops-agent/fluent-bit/buffers +@SET logs_dir=/var/log/google-cloud-ops-agent + +[SERVICE] + Daemon off + Flush 1 + Log_Level info + dns.resolver legacy + storage.backlog.mem_limit 50M + storage.checksum off + storage.max_chunks_up 128 + storage.metrics on + storage.sync normal + +[INPUT] + Name fluentbit_metrics + Scrape_Interval 60 + Scrape_On_Start True + +[INPUT] + Buffer_Chunk_Size 512k + Buffer_Max_Size 2M + DB ${buffers_dir}/default_pipeline_syslog + DB.locking true + Key message + Mem_Buf_Limit 10M + Name tail + Path /var/log/messages,/var/log/syslog + Read_from_Head True + Rotate_Wait 30 + Skip_Long_Lines On + Tag default_pipeline.syslog + storage.type filesystem + +[INPUT] + Dummy {"code": "LogPingOpsAgent", "severity": "DEBUG"} + Interval_NSec 0 + Interval_Sec 600 + Name dummy + Tag ops-agent-health + +[INPUT] + Buffer_Chunk_Size 512k + Buffer_Max_Size 2M + DB ${buffers_dir}/ops-agent-fluent-bit + DB.locking true + Key message + Mem_Buf_Limit 10M + Name tail + Path ${logs_dir}/subagents/logging-module.log + Read_from_Head True + Rotate_Wait 30 + Skip_Long_Lines On + Tag ops-agent-fluent-bit + storage.type memory + +[INPUT] + Buffer_Chunk_Size 512k + Buffer_Max_Size 2M + DB ${buffers_dir}/ops-agent-health + DB.locking true + Key message + Mem_Buf_Limit 10M + Name tail + Path ${logs_dir}/health-checks.log + Read_from_Head True + Rotate_Wait 30 + Skip_Long_Lines On + Tag ops-agent-health + storage.type memory + +[FILTER] + Match default_pipeline.syslog + Name lua + call process + script adea349dc2d92cd07daa1d7847f5e96a.lua + +[FILTER] + Match ops-agent-fluent-bit + Name lua + call parser_nest + script b4a0dead382dce7b4fe011d3f59fdb6d.lua + +[FILTER] + Key_Name message + Match ops-agent-fluent-bit + Name parser + Preserve_Key True + Reserve_Data True + Parser ops-agent-fluent-bit.fluent-bit-self-log-regex-parsing + +[FILTER] + Match ops-agent-fluent-bit + Name lua + call parser_merge_record + script 5fc5f42c16c9e1ab8292e3d42f74f3be.lua + +[FILTER] + Match ops-agent-health + Name lua + call parser_nest + script b4a0dead382dce7b4fe011d3f59fdb6d.lua + +[FILTER] + Key_Name message + Match ops-agent-health + Name parser + Reserve_Data True + Parser ops-agent-health.health-checks-json + +[FILTER] + Match ops-agent-health + Name lua + call parser_merge_record + script 5fc5f42c16c9e1ab8292e3d42f74f3be.lua + +[FILTER] + Match ops-agent-health + Name grep + Regex severity INFO|ERROR|WARNING|DEBUG|info|error|warning|debug + +[FILTER] + Match ops-agent-fluent-bit + Name rewrite_tag + Rule message \[error\]\s\[lib\]\sbackend\sfailed ops-agent-health true + +[FILTER] + Name modify + Match ops-agent-health + Condition Key_value_matches message \[error\]\s\[lib\]\sbackend\sfailed + Set code LogPipelineErr + Set message "[Runtime Check] Result: FAIL, Error code: LogPipelineErr, Failure: Ops Agent logging pipeline failed, Solution: Refer to provided documentation link., Resource: https://cloud.google.com/stackdriver/docs/solutions/agents/ops-agent/troubleshoot-find-info" + +[FILTER] + Match ops-agent-fluent-bit + Name rewrite_tag + Rule message \[error\]\s\[parser\]\scannot\sparse ops-agent-health true + +[FILTER] + Name modify + Match ops-agent-health + Condition Key_value_matches message \[error\]\s\[parser\]\scannot\sparse + Set code LogParseErr + Set message "[Runtime Check] Result: WARNING, Error code: LogParseErr, Failure: Ops Agent failed to parse logs, Solution: Refer to provided documentation link., Resource: https://cloud.google.com/stackdriver/docs/solutions/agents/ops-agent/troubleshoot-find-info" + +[FILTER] + Match ops-agent-health + Name lua + call process + script 0f15dbe303dc7122d43443c9a4c31632.lua + +[FILTER] + Match ops-agent-* + Name lua + call process + script 4d6012ff003886818fb9b9285b4af962.lua + +[OUTPUT] + Match_Regex ^(default_pipeline\.syslog)$ + Name stackdriver + Retry_Limit 3 + http_request_key logging.googleapis.com/httpRequest + net.connect_timeout_log_error False + resource gce_instance + stackdriver_agent Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) + storage.total_limit_size 2G + tls On + tls.verify Off + workers 8 + +[OUTPUT] + Match_Regex ^(ops-agent-health|ops-agent-fluent-bit)$ + Name stackdriver + Retry_Limit 3 + http_request_key logging.googleapis.com/httpRequest + net.connect_timeout_log_error False + resource gce_instance + stackdriver_agent Google-Cloud-Ops-Agent-Logging/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) + tls On + tls.verify Off + workers 8 + +[OUTPUT] + Match * + Name prometheus_exporter + host 0.0.0.0 + port 20202 diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/fluent_bit_parser.conf b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/fluent_bit_parser.conf new file mode 100644 index 0000000000..e6c4f531ea --- /dev/null +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_otlphttp/golden/linux-gpu/fluent_bit_parser.conf @@ -0,0 +1,13 @@ +[PARSER] + Format regex + Name ops-agent-fluent-bit.fluent-bit-self-log-regex-parsing + Regex (?\[[ ]*(?