Merge branch 'main' into fix-router-random-statements

cmd/otelcontribcol/go.mod

@@ -586,7 +586,7 @@ require (
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/leodido/go-syslog/v4 v4.1.0 // indirect
 	github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect
-	github.com/lestrrat-go/strftime v1.0.6 // indirect
+	github.com/lestrrat-go/strftime v1.1.0 // indirect
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/lightstep/go-expohisto v1.0.0 // indirect
 	github.com/linkedin/goavro/v2 v2.13.0 // indirect
@@ -671,7 +671,7 @@ require (
 	github.com/open-telemetry/otel-arrow v0.25.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
-	github.com/opencontainers/runc v1.1.13 // indirect
+	github.com/opencontainers/runc v1.1.14 // indirect
 	github.com/opencontainers/runtime-spec v1.2.0 // indirect
 	github.com/opencontainers/selinux v1.10.0 // indirect
 	github.com/opensearch-project/opensearch-go/v2 v2.3.0 // indirect

exporter/elasticsearchexporter/go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/elastic/go-docappender/v2 v2.3.0
 	github.com/elastic/go-elasticsearch/v7 v7.17.10
 	github.com/elastic/go-structform v0.0.12
-	github.com/lestrrat-go/strftime v1.0.6
+	github.com/lestrrat-go/strftime v1.1.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.108.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.108.0
 	github.com/stretchr/testify v1.9.0

exporter/elasticsearchexporter/integrationtest/go.mod

@@ -77,7 +77,7 @@ require (
 	github.com/knadh/koanf/v2 v2.1.1 // indirect
 	github.com/leodido/go-syslog/v4 v4.1.0 // indirect
 	github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect
-	github.com/lestrrat-go/strftime v1.0.6 // indirect
+	github.com/lestrrat-go/strftime v1.1.0 // indirect
 	github.com/lightstep/go-expohisto v1.0.0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a // indirect
 	github.com/magefile/mage v1.15.0 // indirect

exporter/googlemanagedprometheusexporter/README.md

@@ -280,13 +280,21 @@ logic from OpenTelemetry resource to Google Cloud's `prometheus_target`
 monitored resouce didn't preserve a resource attribute that was needed to
 distinguish timeseries. This can be mitigated by adding resource
 attributes as metric labels using `resource_filters` configuration in the
-exporter:
+exporter. The following example adds common identifying resource attributes.
+You may need to expand this list with other resource attributes to fix
+duplicate timeseries errors:
 
 ```yaml
   googlemanagedprometheus:
     metric:
       resource_filters:
-        regex: ".*"
+      - prefix: "cloud"
+      - prefix: "k8s"
+      - prefix: "faas"
+      - regex: "container.id"
+      - regex: "process.pid"
+      - regex: "host.name"
+      - regex: "host.id"
 ```
 
 If you need to troubleshoot errors further, start by filtering down to a single

exporter/googlemanagedprometheusexporter/config_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector"
 	"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -54,6 +55,29 @@ func TestLoadConfig(t *testing.T) {
 						},
 					},
 					Prefix: "my-metric-domain.com",
+					ResourceFilters: []collector.ResourceFilter{
+						{
+							Prefix: "cloud",
+						},
+						{
+							Prefix: "k8s",
+						},
+						{
+							Prefix: "faas",
+						},
+						{
+							Regex: "container.id",
+						},
+						{
+							Regex: "process.pid",
+						},
+						{
+							Regex: "host.name",
+						},
+						{
+							Regex: "host.id",
+						},
+					},
 				},
 			},
 			QueueSettings: exporterhelper.QueueSettings{

exporter/googlemanagedprometheusexporter/testdata/config.yaml

@@ -20,6 +20,14 @@ exporters:
       extra_metrics_config:
         enable_target_info: false
         enable_scope_info: false
+      resource_filters:
+      - prefix: "cloud"
+      - prefix: "k8s"
+      - prefix: "faas"
+      - regex: "container.id"
+      - regex: "process.pid"
+      - regex: "host.name"
+      - regex: "host.id"
 
 
 service:

pkg/stanza/fileconsumer/matcher/internal/finder/finder.go

@@ -6,6 +6,7 @@ package finder // import "github.com/open-telemetry/opentelemetry-collector-cont
 import (
 	"errors"
 	"fmt"
+	"slices"
 
 	"github.com/bmatcuk/doublestar/v4"
 	"golang.org/x/exp/maps"
@@ -46,5 +47,7 @@ func FindFiles(includes []string, excludes []string) ([]string, error) {
 		}
 	}
 
-	return maps.Keys(allSet), errs
+	keys := maps.Keys(allSet)
+	slices.Sort(keys)
+	return keys, errs
 }