[service] add resource attributes as labels to otel metrics (open-tel…

…emetry#9029) This ensures backwards compatibility with OpenCensus metrics. ### Collector metrics with OpenCensus: ``` # HELP otelcol_exporter_queue_capacity Fixed capacity of the retry queue (in batches) # TYPE otelcol_exporter_queue_capacity gauge otelcol_exporter_queue_capacity{exporter="otlp",service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 1000 # HELP otelcol_exporter_queue_size Current size of the retry queue (in batches) # TYPE otelcol_exporter_queue_size gauge otelcol_exporter_queue_size{exporter="otlp",service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 0 # HELP otelcol_process_cpu_seconds Total CPU user and system time in seconds # TYPE otelcol_process_cpu_seconds counter otelcol_process_cpu_seconds{service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 0.03 # HELP otelcol_process_memory_rss Total physical memory (resident set size) # TYPE otelcol_process_memory_rss gauge otelcol_process_memory_rss{service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 2.70336e+07 # HELP otelcol_process_runtime_heap_alloc_bytes Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc') # TYPE otelcol_process_runtime_heap_alloc_bytes gauge otelcol_process_runtime_heap_alloc_bytes{service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 2.445496e+06 # HELP otelcol_process_runtime_total_alloc_bytes Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc') # TYPE otelcol_process_runtime_total_alloc_bytes counter otelcol_process_runtime_total_alloc_bytes{service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 3.96812e+06 # HELP otelcol_process_runtime_total_sys_memory_bytes Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys') # TYPE otelcol_process_runtime_total_sys_memory_bytes gauge otelcol_process_runtime_total_sys_memory_bytes{service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 1.3601808e+07 # HELP otelcol_process_uptime Uptime of the process # TYPE otelcol_process_uptime counter otelcol_process_uptime{service_instance_id="e46d41fd-810a-4685-82d0-b01e177cfe7b",service_name="otelcorecol",service_version="0.90.0-dev"} 22.446733 ``` ### Collector metrics w/ `useOtelForInternalMetrics` before my this change ``` # HELP otelcol_exporter_queue_capacity Fixed capacity of the retry queue (in batches) # TYPE otelcol_exporter_queue_capacity gauge otelcol_exporter_queue_capacity{exporter="otlp"} 1000 # HELP otelcol_exporter_queue_size Current size of the retry queue (in batches) # TYPE otelcol_exporter_queue_size gauge otelcol_exporter_queue_size{exporter="otlp"} 0 # HELP otelcol_process_cpu_seconds Total CPU user and system time in seconds # TYPE otelcol_process_cpu_seconds counter otelcol_process_cpu_seconds 0.06 # HELP otelcol_process_memory_rss Total physical memory (resident set size) # TYPE otelcol_process_memory_rss gauge otelcol_process_memory_rss 2.9605888e+07 # HELP otelcol_process_runtime_heap_alloc_bytes Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc') # TYPE otelcol_process_runtime_heap_alloc_bytes gauge otelcol_process_runtime_heap_alloc_bytes 3.42064e+06 # HELP otelcol_process_runtime_total_alloc_bytes Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc') # TYPE otelcol_process_runtime_total_alloc_bytes counter otelcol_process_runtime_total_alloc_bytes 4.931072e+06 # HELP otelcol_process_runtime_total_sys_memory_bytes Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys') # TYPE otelcol_process_runtime_total_sys_memory_bytes gauge otelcol_process_runtime_total_sys_memory_bytes 1.2815376e+07 # HELP otelcol_process_uptime Uptime of the process # TYPE otelcol_process_uptime counter otelcol_process_uptime 21.149825 # HELP target_info Target metadata # TYPE target_info gauge target_info{service_instance_id="6ca6db28-5a67-419b-8f0a-a486bba59833",service_name="otelcorecol",service_version="0.90.0-dev"} 1 ``` ### With the change in this PR and using `useOtelForInternalMetrics` ``` # HELP otelcol_exporter_queue_capacity Fixed capacity of the retry queue (in batches) # TYPE otelcol_exporter_queue_capacity gauge otelcol_exporter_queue_capacity{exporter="otlp",service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 1000 # HELP otelcol_exporter_queue_size Current size of the retry queue (in batches) # TYPE otelcol_exporter_queue_size gauge otelcol_exporter_queue_size{exporter="otlp",service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 0 # HELP otelcol_process_cpu_seconds Total CPU user and system time in seconds # TYPE otelcol_process_cpu_seconds counter otelcol_process_cpu_seconds{service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 0.03 # HELP otelcol_process_memory_rss Total physical memory (resident set size) # TYPE otelcol_process_memory_rss gauge otelcol_process_memory_rss{service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 2.7508736e+07 # HELP otelcol_process_runtime_heap_alloc_bytes Bytes of allocated heap objects (see 'go doc runtime.MemStats.HeapAlloc') # TYPE otelcol_process_runtime_heap_alloc_bytes gauge otelcol_process_runtime_heap_alloc_bytes{service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 2.450768e+06 # HELP otelcol_process_runtime_total_alloc_bytes Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc') # TYPE otelcol_process_runtime_total_alloc_bytes counter otelcol_process_runtime_total_alloc_bytes{service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 3.97064e+06 # HELP otelcol_process_runtime_total_sys_memory_bytes Total bytes of memory obtained from the OS (see 'go doc runtime.MemStats.Sys') # TYPE otelcol_process_runtime_total_sys_memory_bytes gauge otelcol_process_runtime_total_sys_memory_bytes{service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 1.3339664e+07 # HELP otelcol_process_uptime Uptime of the process # TYPE otelcol_process_uptime counter otelcol_process_uptime{service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 3.938331 # HELP target_info Target metadata # TYPE target_info gauge target_info{service_instance_id="40f4a782-e5ee-47e1-acd0-17cb90bd16f1",service_name="otelcorecol",service_version="0.90.0-dev"} 1 ``` --------- Signed-off-by: Alex Boten <[email protected]>
pjanotti · Dec 1, 2023 · fcb7012 · fcb7012
1 parent f98f106
commit fcb7012
Show file tree

Hide file tree

Showing 28 changed files with 131 additions and 61 deletions.
diff --git a/.chloggen/codeboten_enable-otel-by-default.yaml b/.chloggen/codeboten_enable-otel-by-default.yaml
@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: service
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "add resource attributes as labels to otel metrics to ensures backwards compatibility with OpenCensus metrics."
+
+# One or more tracking issues or pull requests related to the change
+issues: [9029]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []
diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod
@@ -106,7 +106,7 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
-	go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect
 	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 // indirect
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 // indirect
 	go.opentelemetry.io/otel/metric v1.21.0 // indirect

diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum
diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod
@@ -59,7 +59,7 @@ require (
 	go.opentelemetry.io/collector/confmap v0.90.0 // indirect
 	go.opentelemetry.io/collector/extension v0.90.0 // indirect
 	go.opentelemetry.io/collector/featuregate v1.0.0 // indirect
-	go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect
 	go.opentelemetry.io/otel/metric v1.21.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect

diff --git a/config/configgrpc/go.sum b/config/configgrpc/go.sum
diff --git a/exporter/debugexporter/go.sum b/exporter/debugexporter/go.sum
diff --git a/exporter/go.mod b/exporter/go.mod
@@ -54,7 +54,7 @@ require (
 	github.com/prometheus/procfs v0.11.1 // indirect
 	github.com/prometheus/statsd_exporter v0.22.7 // indirect
 	go.opentelemetry.io/collector/confmap v0.90.0 // indirect
-	go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect
 	golang.org/x/net v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect

diff --git a/exporter/go.sum b/exporter/go.sum
diff --git a/exporter/loggingexporter/go.sum b/exporter/loggingexporter/go.sum
diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum
diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum
diff --git a/go.mod b/go.mod
@@ -21,7 +21,7 @@ require (
 	go.opentelemetry.io/collector/receiver v0.90.0
 	go.opentelemetry.io/contrib/config v0.1.1
 	go.opentelemetry.io/otel v1.21.0
-	go.opentelemetry.io/otel/exporters/prometheus v0.44.0
+	go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2
 	go.opentelemetry.io/otel/sdk v1.21.0
 	go.opentelemetry.io/otel/sdk/metric v1.21.0
 	go.uber.org/multierr v1.11.0

diff --git a/go.sum b/go.sum
diff --git a/otelcol/go.mod b/otelcol/go.mod
@@ -78,7 +78,7 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
-	go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect
 	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 // indirect
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 // indirect
 	go.opentelemetry.io/otel/metric v1.21.0 // indirect

diff --git a/otelcol/go.sum b/otelcol/go.sum
diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod
@@ -17,7 +17,7 @@ require (
 	go.opentelemetry.io/collector/pdata v1.0.0
 	go.opentelemetry.io/collector/processor v0.90.0
 	go.opentelemetry.io/otel v1.21.0
-	go.opentelemetry.io/otel/exporters/prometheus v0.44.0
+	go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2
 	go.opentelemetry.io/otel/metric v1.21.0
 	go.opentelemetry.io/otel/sdk v1.21.0
 	go.opentelemetry.io/otel/sdk/metric v1.21.0

diff --git a/processor/batchprocessor/go.sum b/processor/batchprocessor/go.sum
diff --git a/processor/go.mod b/processor/go.mod
@@ -48,7 +48,7 @@ require (
 	github.com/prometheus/procfs v0.11.1 // indirect
 	github.com/prometheus/statsd_exporter v0.22.7 // indirect
 	go.opentelemetry.io/collector/confmap v0.90.0 // indirect
-	go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect
 	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect
 	golang.org/x/net v0.18.0 // indirect

diff --git a/processor/go.sum b/processor/go.sum
diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum
diff --git a/receiver/go.mod b/receiver/go.mod
@@ -49,7 +49,7 @@ require (
 	github.com/prometheus/procfs v0.11.1 // indirect
 	github.com/prometheus/statsd_exporter v0.22.7 // indirect
 	go.opentelemetry.io/collector/confmap v0.90.0 // indirect
-	go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect
 	golang.org/x/net v0.18.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect

diff --git a/receiver/go.sum b/receiver/go.sum
diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod
@@ -70,7 +70,7 @@ require (
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
 	go.opentelemetry.io/otel v1.21.0 // indirect
-	go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.44.1-0.20231201153405-6027c1ae76f2 // indirect
 	go.opentelemetry.io/otel/metric v1.21.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect