Merge branch 'main' into add-splunk-rolling-restart-metric

Author: juanhotencoding

.chloggen/opampextension-conditional-tls.yaml

@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: opampextension
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Skips loading TLS config for insecure endpoints
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [39515]
+
+# (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:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# 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: []

.github/ALLOWLIST

@@ -36,12 +36,5 @@ exporter/opensearchexporter
 extension/observer/ecstaskobserver
 receiver/awscloudwatchmetricsreceiver
 receiver/carbonreceiver
-receiver/couchdbreceiver
-receiver/elasticsearchreceiver
-receiver/memcachedreceiver
-receiver/mysqlreceiver
-receiver/postgresqlreceiver
-receiver/zookeeperreceiver
-scraper/zookeeperscraper
 
 # End unmaintained components list

.github/CODEOWNERS

@@ -226,8 +226,10 @@ receiver/chronyreceiver/                                         @open-telemetry
 receiver/cloudflarereceiver/                                     @open-telemetry/collector-contrib-approvers @dehaansa
 receiver/cloudfoundryreceiver/                                   @open-telemetry/collector-contrib-approvers @crobert-1
 receiver/collectdreceiver/                                       @open-telemetry/collector-contrib-approvers @atoulme
+receiver/couchdbreceiver/                                        @open-telemetry/collector-contrib-approvers @antonblock
 receiver/datadogreceiver/                                        @open-telemetry/collector-contrib-approvers @boostchicken @gouthamve @MovieStoreGuy
 receiver/dockerstatsreceiver/                                    @open-telemetry/collector-contrib-approvers @jamesmoessis
+receiver/elasticsearchreceiver/                                  @open-telemetry/collector-contrib-approvers @jsirianni
 receiver/envoyalsreceiver/                                       @open-telemetry/collector-contrib-approvers @evan-bradley @zirain
 receiver/expvarreceiver/                                         @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy
 receiver/faroreceiver/                                           @open-telemetry/collector-contrib-approvers @dehaansa @rlankfo @mar4uk
@@ -268,8 +270,10 @@ receiver/kafkareceiver/                                          @open-telemetry
 receiver/kubeletstatsreceiver/                                   @open-telemetry/collector-contrib-approvers @dmitryax @TylerHelmuth @ChrsMark
 receiver/libhoneyreceiver/                                       @open-telemetry/collector-contrib-approvers @TylerHelmuth @mterhar
 receiver/lokireceiver/                                           @open-telemetry/collector-contrib-approvers @mar4uk
+receiver/memcachedreceiver/                                      @open-telemetry/collector-contrib-approvers @jsirianni
 receiver/mongodbatlasreceiver/                                   @open-telemetry/collector-contrib-approvers @schmikei
 receiver/mongodbreceiver/                                        @open-telemetry/collector-contrib-approvers @schmikei
+receiver/mysqlreceiver/                                          @open-telemetry/collector-contrib-approvers @antonblock
 receiver/namedpipereceiver/                                      @open-telemetry/collector-contrib-approvers @sinkingpoint @djaglowski
 receiver/netflowreceiver/                                        @open-telemetry/collector-contrib-approvers @evan-bradley @dlopes7
 receiver/nginxreceiver/                                          @open-telemetry/collector-contrib-approvers @djaglowski
@@ -281,6 +285,7 @@ receiver/osqueryreceiver/                                        @open-telemetry
 receiver/otelarrowreceiver/                                      @open-telemetry/collector-contrib-approvers @jmacd @moh-osman3
 receiver/otlpjsonfilereceiver/                                   @open-telemetry/collector-contrib-approvers @atoulme
 receiver/podmanreceiver/                                         @open-telemetry/collector-contrib-approvers @rogercoll
+receiver/postgresqlreceiver/                                     @open-telemetry/collector-contrib-approvers @antonblock
 receiver/pprofreceiver/                                          @open-telemetry/collector-contrib-approvers @MovieStoreGuy @atoulme
 receiver/prometheusreceiver/                                     @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
 receiver/prometheusremotewritereceiver/                          @open-telemetry/collector-contrib-approvers @dashpole @ArthurSens
@@ -319,6 +324,8 @@ receiver/windowseventlogreceiver/                                @open-telemetry
 receiver/windowsperfcountersreceiver/                            @open-telemetry/collector-contrib-approvers @dashpole @alxbl @pjanotti
 receiver/windowsservicereceiver/                                 @open-telemetry/collector-contrib-approvers @pjanotti @shalper2
 receiver/zipkinreceiver/                                         @open-telemetry/collector-contrib-approvers @MovieStoreGuy @andrzej-stencel @crobert-1
+receiver/zookeeperreceiver/                                      @open-telemetry/collector-contrib-approvers @antonblock
+scraper/zookeeperscraper/                                        @open-telemetry/collector-contrib-approvers @antonblock
 testbed/                                                         @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
 testbed/mockdatasenders/mockdatadogagentexporter/                @open-telemetry/collector-contrib-approvers @boostchicken
 
@@ -353,12 +360,5 @@ exporter/opensearchexporter/                                     @open-telemetry
 extension/observer/ecstaskobserver/                              @open-telemetry/collector-contrib-approvers
 receiver/awscloudwatchmetricsreceiver/                           @open-telemetry/collector-contrib-approvers
 receiver/carbonreceiver/                                         @open-telemetry/collector-contrib-approvers
-receiver/couchdbreceiver/                                        @open-telemetry/collector-contrib-approvers
-receiver/elasticsearchreceiver/                                  @open-telemetry/collector-contrib-approvers
-receiver/memcachedreceiver/                                      @open-telemetry/collector-contrib-approvers
-receiver/mysqlreceiver/                                          @open-telemetry/collector-contrib-approvers
-receiver/postgresqlreceiver/                                     @open-telemetry/collector-contrib-approvers
-receiver/zookeeperreceiver/                                      @open-telemetry/collector-contrib-approvers
-scraper/zookeeperscraper/                                        @open-telemetry/collector-contrib-approvers
 
 # End unmaintained components list

.github/component_labels.txt

@@ -207,8 +207,10 @@ receiver/chronyreceiver receiver/chrony
 receiver/cloudflarereceiver receiver/cloudflare
 receiver/cloudfoundryreceiver receiver/cloudfoundry
 receiver/collectdreceiver receiver/collectd
+receiver/couchdbreceiver receiver/couchdb
 receiver/datadogreceiver receiver/datadog
 receiver/dockerstatsreceiver receiver/dockerstats
+receiver/elasticsearchreceiver receiver/elasticsearch
 receiver/envoyalsreceiver receiver/envoyals
 receiver/expvarreceiver receiver/expvar
 receiver/faroreceiver receiver/faro
@@ -249,8 +251,10 @@ receiver/kafkareceiver receiver/kafka
 receiver/kubeletstatsreceiver receiver/kubeletstats
 receiver/libhoneyreceiver receiver/libhoney
 receiver/lokireceiver receiver/loki
+receiver/memcachedreceiver receiver/memcached
 receiver/mongodbatlasreceiver receiver/mongodbatlas
 receiver/mongodbreceiver receiver/mongodb
+receiver/mysqlreceiver receiver/mysql
 receiver/namedpipereceiver receiver/namedpipe
 receiver/netflowreceiver receiver/netflow
 receiver/nginxreceiver receiver/nginx
@@ -262,6 +266,7 @@ receiver/osqueryreceiver receiver/osquery
 receiver/otelarrowreceiver receiver/otelarrow
 receiver/otlpjsonfilereceiver receiver/otlpjsonfile
 receiver/podmanreceiver receiver/podman
+receiver/postgresqlreceiver receiver/postgresql
 receiver/pprofreceiver receiver/pprof
 receiver/prometheusreceiver receiver/prometheus
 receiver/prometheusremotewritereceiver receiver/prometheusremotewrite
@@ -300,6 +305,8 @@ receiver/windowseventlogreceiver receiver/windowseventlog
 receiver/windowsperfcountersreceiver receiver/windowsperfcounters
 receiver/windowsservicereceiver receiver/windowsservice
 receiver/zipkinreceiver receiver/zipkin
+receiver/zookeeperreceiver receiver/zookeeper
+scraper/zookeeperscraper scraper/zookeeper
 testbed testbed
 testbed/mockdatasenders/mockdatadogagentexporter testbed/mockdatasenders/mockdatadogagentexporter
 reports/distributions/core.yaml reports/distributions/core.yaml
@@ -312,10 +319,3 @@ exporter/opensearchexporter exporter/opensearch
 extension/observer/ecstaskobserver extension/observer/ecstaskobserver
 receiver/awscloudwatchmetricsreceiver receiver/awscloudwatchmetrics
 receiver/carbonreceiver receiver/carbon
-receiver/couchdbreceiver receiver/couchdb
-receiver/elasticsearchreceiver receiver/elasticsearch
-receiver/memcachedreceiver receiver/memcached
-receiver/mysqlreceiver receiver/mysql
-receiver/postgresqlreceiver receiver/postgresql
-receiver/zookeeperreceiver receiver/zookeeper
-scraper/zookeeperscraper scraper/zookeeper

.github/workflows/changelog.yml

@@ -32,7 +32,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
-          fetch-depth: 0
+          fetch-depth: ${{ github.event_name == 'pull_request' && github.event.pull_request.commits || 1 }}
       - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
         with:
           go-version: "1.23.8"

.github/workflows/check-links.yaml

@@ -23,7 +23,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
-          fetch-depth: 0
+          fetch-depth: ${{ github.event_name == 'pull_request' && github.event.pull_request.commits || 1 }}
       - name: Get changed files
         id: changes
         run: |
@@ -42,7 +42,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
-          fetch-depth: 0
+          fetch-depth: 1
 
       - name: Link Checker
         id: lychee

.github/workflows/e2e-tests-windows.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
-          fetch-depth: 0
+          fetch-depth: ${{ github.event_name == 'pull_request' && github.event.pull_request.commits || 1 }}
       - name: Did windows files changed
         run: echo "changed=$(./.github/workflows/scripts/is_changed_file_windows.sh )" >> "$GITHUB_OUTPUT"
       - run: echo $(./.github/workflows/scripts/is_changed_file_windows.sh ${{ github.event.pull_request.base.sha }} ${{ github.sha }} )

.github/workflows/scoped-test.yaml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
-          fetch-depth: 0
+          fetch-depth: ${{ github.event_name == 'pull_request' && github.event.pull_request.commits || 1 }}
 
       - name: Get changes
         shell: bash

cmd/opampsupervisor/README.md

@@ -1,5 +1,15 @@
 # OpAMP Supervisor for the OpenTelemetry Collector
 
+<!-- status autogenerated section -->
+| Status        |           |
+| ------------- |-----------|
+| Stability     | [alpha]: metrics   |
+| Issues        | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Acmd%2Fopampsupervisor%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Acmd%2Fopampsupervisor) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Acmd%2Fopampsupervisor%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Acmd%2Fopampsupervisor) |
+| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner)    | [@evan-bradley](https://www.github.com/evan-bradley), [@atoulme](https://www.github.com/atoulme), [@tigrannajaryan](https://www.github.com/tigrannajaryan) |
+
+[alpha]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#alpha
+<!-- end autogenerated section -->
+
 This is an implementation of an OpAMP Supervisor that runs a Collector instance using configuration provided from an OpAMP server. This implementation
 is following a design specified [here](./specification/README.md).
 The design is still undergoing changes, and as such this implementation may change as well.

cmd/opampsupervisor/doc.go

@@ -0,0 +1,6 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+//go:generate mdatagen metadata.yaml
+
+package main // import "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor"

cmd/opampsupervisor/package_test.go renamed to cmd/opampsupervisor/generated_package_test.go

@@ -2,5 +2,7 @@ type: opampsupervisor
 
 status:
   class: cmd
+  stability:
+    alpha: [metrics]
   codeowners:
     active: [evan-bradley, atoulme, tigrannajaryan]

cmd/opampsupervisor/metadata.yaml

@@ -4,7 +4,7 @@ go 1.23.0
 
 require (
 	github.com/aws/aws-sdk-go-v2/config v1.29.14
-	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.35.3
+	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.35.4
 	github.com/stretchr/testify v1.10.0
 	go.opentelemetry.io/collector/confmap v1.30.0
 	go.uber.org/goleak v1.3.0

confmap/provider/secretsmanagerprovider/go.mod

@@ -60,7 +60,10 @@ func createDefaultConfig() component.Config {
 // defines the consumer type of the connector
 // we want to consume traces and export metrics therefore define nextConsumer as metrics, consumer is the next component in the pipeline
 func createTracesToMetricsConnector(_ context.Context, params connector.Settings, cfg component.Config, nextConsumer consumer.Metrics) (c connector.Traces, err error) {
-	metricsClient := metricsclient.InitializeMetricClient(params.MeterProvider, metricsclient.ConnectorSourceTag)
+	metricsClient, err := metricsclient.InitializeMetricClient(params.MeterProvider, metricsclient.ConnectorSourceTag)
+	if err != nil {
+		return nil, err
+	}
 	if NativeIngestFeatureGate.IsEnabled() {
 		params.Logger.Info("Datadog connector using the native OTel API to ingest OTel spans and produce APM stats. To revert to the legacy processing pipeline, disable the feature gate", zap.String("feature gate", nativeIngestFeatureGateName))
 		c, err = newTraceToMetricConnectorNative(params.TelemetrySettings, cfg, nextConsumer, metricsClient)