Merge branch 'main' into main

Author: k-shaikh

.chloggen/remove-scope.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: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: azureauthextension
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Use credentials to handle the access token.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [39057]
+
+# (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: []

.chloggen/stefreceiver.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: new_component
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: stefreceiver
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Make the receiver initially code complete
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [38979]
+
+# (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/CODEOWNERS

@@ -23,7 +23,7 @@ cmd/opampsupervisor/                                             @open-telemetry
 cmd/otelcontribcol/                                              @open-telemetry/collector-contrib-approvers
 cmd/oteltestbedcol/                                              @open-telemetry/collector-contrib-approvers
 cmd/telemetrygen/                                                @open-telemetry/collector-contrib-approvers @mx-psi @codeboten @Erog38
-confmap/provider/aesprovider/                                    @open-telemetry/collector-contrib-approvers @djaglowski @shazlehu
+confmap/provider/aesprovider/                                    @open-telemetry/collector-contrib-approvers @djaglowski
 confmap/provider/s3provider/                                     @open-telemetry/collector-contrib-approvers @Aneurysm9
 confmap/provider/secretsmanagerprovider/                         @open-telemetry/collector-contrib-approvers @driverpt @atoulme
 connector/countconnector/                                        @open-telemetry/collector-contrib-approvers @djaglowski @jpkrohling
@@ -112,7 +112,7 @@ extension/jaegerremotesampling/                                  @open-telemetry
 extension/k8sleaderelector/                                      @open-telemetry/collector-contrib-approvers @dmitryax @rakesh-garimella
 extension/oauth2clientauthextension/                             @open-telemetry/collector-contrib-approvers @pavankrish123 @jpkrohling
 extension/observer/                                              @open-telemetry/collector-contrib-approvers @dmitryax
-extension/observer/cfgardenobserver/                             @open-telemetry/collector-contrib-approvers @crobert-1 @cemdk @m1rp @jriguera
+extension/observer/cfgardenobserver/                             @open-telemetry/collector-contrib-approvers @crobert-1 @cemdk @jriguera
 extension/observer/dockerobserver/                               @open-telemetry/collector-contrib-approvers @MovieStoreGuy
 extension/observer/ecsobserver/                                  @open-telemetry/collector-contrib-approvers @dmitryax
 extension/observer/hostobserver/                                 @open-telemetry/collector-contrib-approvers @MovieStoreGuy
@@ -239,7 +239,7 @@ receiver/githubreceiver/                                         @open-telemetry
 receiver/gitlabreceiver/                                         @open-telemetry/collector-contrib-approvers @adrielp @atoulme
 receiver/googlecloudmonitoringreceiver/                          @open-telemetry/collector-contrib-approvers @dashpole @TylerHelmuth @abhishek-at-cloudwerx
 receiver/googlecloudpubsubreceiver/                              @open-telemetry/collector-contrib-approvers @alexvanboxel
-receiver/googlecloudspannerreceiver/                             @open-telemetry/collector-contrib-approvers @dashpole @dsimil @KiranmayiB @harishbohara11
+receiver/googlecloudspannerreceiver/                             @open-telemetry/collector-contrib-approvers @dashpole @dsimil @KiranmayiB
 receiver/haproxyreceiver/                                        @open-telemetry/collector-contrib-approvers @atoulme @MovieStoreGuy
 receiver/hostmetricsreceiver/                                    @open-telemetry/collector-contrib-approvers @dmitryax @braydonk
 receiver/hostmetricsreceiver/internal/scraper/cpuscraper/        @open-telemetry/collector-contrib-approvers @dmitryax @braydonk

cmd/githubgen/allowlist.txt

@@ -2,12 +2,9 @@ abhishek-at-cloudwerx
 cemdk
 driverpt
 dsimil
-harishbohara11
 heitorganzeli
 Hemansh31
 KiranmayiB
-m1rp
-shazlehu
 swar8080
 zpzhuSplunk
 h0cheung

cmd/opampsupervisor/README.md

@@ -4,36 +4,50 @@ This is an implementation of an OpAMP Supervisor that runs a Collector instance
 is following a design specified [here](./specification/README.md).
 The design is still undergoing changes, and as such this implementation may change as well.
 
-## Experimenting with the supervisor
+Binary and container images for the Supervisor are available under tags starting with `cmd/opampsupervisor` [here](https://github.com/open-telemetry/opentelemetry-collector-releases/tags).
 
-The supervisor is currently undergoing heavy development and is not ready for any serious use. However, if you would like to test it, you can follow the steps below:
+## More information.
 
-1. Download the [opamp-go](https://github.com/open-telemetry/opamp-go) repository, and run the OpAMP example server in the `internal/examples/server` directory.
+If you'd like to learn more about OpAMP, see the
+[OpAMP specification](https://github.com/open-telemetry/opamp-spec/blob/main/specification.md#open-agent-management-protocol).
+For production-ready client and server implementations in Go, see the
+[OpAMP Go repository](https://github.com/open-telemetry/opamp-go).
 
-   ```shell
-   git clone [email protected]:open-telemetry/opamp-go.git
-   cd opamp-go/internal/examples/server
-   go run .
-   ```
+If you have questions or would like to participate, we'd love to hear from you.
+There is a regular SIG meeting, see the
+[meeting notes](https://docs.google.com/document/d/19WA5-ex8rNFIBIyVb5VqMXfWNmUQwppGhN8zBeNG0f4)
+for more information. You can also get in touch with us in the
+[#otel-opamp](https://cloud-native.slack.com/archives/C02J58HR58R) channel on
+the CNCF Slack workspace.
 
-   Visit [localhost:4321](http://localhost:4321) to verify that the server is running.
+## Using the Supervisor
 
-2. From the Collector contrib repository root, build the Collector:
+See tags starting with `cmd/opampsupervisor` for binary and container image
+builds of the Supervisor
+[here](https://github.com/open-telemetry/opentelemetry-collector-releases/tags).
 
-   ```shell
-   make otelcontribcol
-   ```
+To use the Supervisor, you will need four things:
 
-3. Run the supervisor in the `cmd/opampsupervisor` directory of Collector contrib repository, substituting `<OS>` for your operating system (`darwin` for MacOS, `linux` or `windows`):
+1. A Supervisor binary, which can be obtained through the link above.
+2. A Collector binary that you would like to control through the Supervisor.
+3. A Supervisor config file. See examples [here](./examples/).
+4. A running OpAMP server.
+
+To test the Supervisor with an example server, download the
+[opamp-go](https://github.com/open-telemetry/opamp-go) repository, and run the
+OpAMP example server in the `internal/examples/server` directory.
 
    ```shell
-   cd cmd/opampsupervisor
-   go run . --config examples/supervisor_<OS>.yaml
+   git clone [email protected]:open-telemetry/opamp-go.git
+   cd opamp-go/internal/examples/server
+   go run .
    ```
 
-4. The supervisor should connect to the OpAMP server and start a Collector instance.
+   Visit [localhost:4321](http://localhost:4321) to verify that the server is running.
+
 
 ## Persistent data storage
+
 The supervisor persists some data to disk in order to mantain state between restarts. The directory where this data is stored may be specified via the supervisor configuration:
 ```yaml
 storage:
@@ -59,34 +73,33 @@ For a list of open issues related to the Supervisor, see [these issues](https://
 
 ⚠️: Implemented with caveats
 
-📅: Planned, but no issue to track implementation
-
 ### OpAMP capabilities
 
 | OpAMP capability               | Status                                                                           |
 |--------------------------------|----------------------------------------------------------------------------------|
 | AcceptsRemoteConfig            | ✅                                                                               |
-| ReportsEffectiveConfig         | ⚠️                                                                               |
+| ReportsEffectiveConfig         | ✅                                                                               |
 | AcceptsPackages                | <https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/34734> |
-| ReportsPackageStatuses         | 📅                                                                               |
-| ReportsOwnTraces               | 📅                                                                               |
-| ReportsOwnMetrics              | ⚠️                                                                               |
-| ReportsOwnLogs                 | 📅                                                                               |
-| AcceptsOpAMPConnectionSettings | <https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/21043> |
-| AcceptsOtherConnectionSettings | <https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/21043> |
-| AcceptsRestartCommand          | <https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/21077> |
+| ReportsPackageStatuses         | <https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/38727> |
+| ReportsOwnTraces               | ✅                                                                               |
+| ReportsOwnMetrics              | ✅                                                                               |
+| ReportsOwnLogs                 | ✅                                                                               |
+| AcceptsOpAMPConnectionSettings | ✅                                                                               |
+| AcceptsOtherConnectionSettings | ✅                                                                               |
+| AcceptsRestartCommand          | ✅                                                                               |
 | ReportsHealth                  | ⚠️                                                                               |
+| ReportsStatus                  | <https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/38729> |
 | ReportsRemoteConfig            | <https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/21079> |
-| ReportsAvailableComponents     | <https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/37247> |
+| ReportsAvailableComponents     | ✅                                                                               |
 
 ### Supervisor specification features
 
 | Feature                                                            | Status                                                                           |
 |--------------------------------------------------------------------|----------------------------------------------------------------------------------|
 | Offers Supervisor configuration including configuring capabilities | ✅                                                                               |
-| Starts and stops a Collector using remote configuration            | ⚠️                                                                               |
-| Communicates with OpAMP extension running in the Collector         | <https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/21071> |
-| Updates the Collector binary                                       | 📅                                                                               |
-| Configures the Collector to report it's own metrics over OTLP      | 📅                                                                               |
-| Configures the Collector to report it's own logs over OTLP         | 📅                                                                               |
+| Starts and stops a Collector using remote configuration            | ✅                                                                               |
+| Communicates with OpAMP extension running in the Collector         | ✅                                                                               |
+| Updates the Collector binary                                       | <https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33947> |
+| Configures the Collector to report it's own metrics over OTLP      | ✅                                                                               |
+| Configures the Collector to report it's own logs over OTLP         | ✅                                                                               |
 | Sanitization or restriction of Collector config                    | <https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24310> |

cmd/telemetrygen/internal/e2etest/logs_test.go

@@ -25,6 +25,7 @@ func TestGenerateLogs(t *testing.T) {
 	rCfg := f.CreateDefaultConfig()
 	endpoint := testutil.GetAvailableLocalAddress(t)
 	rCfg.(*otlpreceiver.Config).GRPC.NetAddr.Endpoint = endpoint
+	rCfg.(*otlpreceiver.Config).HTTP = nil
 	r, err := f.CreateLogs(context.Background(), receivertest.NewNopSettings(f.Type()), rCfg, sink)
 	require.NoError(t, err)
 	err = r.Start(context.Background(), componenttest.NewNopHost())

cmd/telemetrygen/internal/e2etest/metrics_test.go

@@ -25,6 +25,7 @@ func TestGenerateMetrics(t *testing.T) {
 	rCfg := f.CreateDefaultConfig()
 	endpoint := testutil.GetAvailableLocalAddress(t)
 	rCfg.(*otlpreceiver.Config).GRPC.NetAddr.Endpoint = endpoint
+	rCfg.(*otlpreceiver.Config).HTTP = nil
 	r, err := f.CreateMetrics(context.Background(), receivertest.NewNopSettings(f.Type()), rCfg, sink)
 	require.NoError(t, err)
 	err = r.Start(context.Background(), componenttest.NewNopHost())

cmd/telemetrygen/internal/e2etest/traces_test.go

@@ -25,6 +25,7 @@ func TestGenerateTraces(t *testing.T) {
 	rCfg := f.CreateDefaultConfig()
 	endpoint := testutil.GetAvailableLocalAddress(t)
 	rCfg.(*otlpreceiver.Config).GRPC.NetAddr.Endpoint = endpoint
+	rCfg.(*otlpreceiver.Config).HTTP = nil
 	r, err := f.CreateTraces(context.Background(), receivertest.NewNopSettings(f.Type()), rCfg, sink)
 	require.NoError(t, err)
 	err = r.Start(context.Background(), componenttest.NewNopHost())

confmap/provider/aesprovider/README.md

@@ -6,7 +6,8 @@
 | Stability     | [alpha]  |
 | Distributions | [contrib] |
 | Issues        | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aprovider%2Faesprovider%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aprovider%2Faesprovider) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aprovider%2Faesprovider%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aprovider%2Faesprovider) |
-| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner)    | [@djaglowski](https://www.github.com/djaglowski), [@shazlehu](https://www.github.com/shazlehu) |
+| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner)    | [@djaglowski](https://www.github.com/djaglowski) |
+| Emeritus      | [@shazlehu](https://www.github.com/shazlehu) |
 
 [alpha]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#alpha
 [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib

confmap/provider/aesprovider/metadata.yaml

@@ -6,4 +6,5 @@ status:
     alpha: [provider]
   distributions: [contrib]
   codeowners:
-    active: [djaglowski, shazlehu]
+    active: [djaglowski]
+    emeritus: [shazlehu]

extension/azureauthextension/README.md

@@ -11,6 +11,7 @@
 <!-- end autogenerated section -->
 
 This extension implements both `extensionauth.HTTPClient` and `extensionauth.Server`, so it can be used in both exporters and receivers.
+**Currently, this part is still not implemented.**
 
 Additionally, the extension also implements `azcore.TokenCredential` so that Azure components can get the token by running the function `GetToken`. If the component supports HTTP client, then this should not be necessary, as the token will be placed in the authorization header.
 
@@ -20,8 +21,6 @@ It supports 4 different types of authentication:
 - Service principal with either a client secret or client certificate path for non Azure.
 - And the default credentials. This is not recommended for production.
 
-Each type of authentication requires the [scope of the permissions](https://learn.microsoft.com/en-us/entra/identity-platform/scopes-oidc) for the token.
-
 ## Examples
 
 ### Managed identity
@@ -30,7 +29,6 @@ User based:
 ```yaml
 extensions:
   azureauth:
-    scope: https://management.azure.com/.default
     managed_identity:
       client_id: ${CLIENT_ID}
 ```
@@ -39,7 +37,6 @@ System based (leave `client_id` field empty):
 ```yaml
 extensions:
   azureauth:
-    scope: https://management.azure.com/.default
     managed_identity:
 ```
 
@@ -48,7 +45,6 @@ extensions:
 ```yaml
 extensions:
   azureauth:
-    scope: https://management.azure.com/.default
     workload_identity:
       client_id: ${CLIENT_ID}
       federated_token_file: ${FILE}
@@ -61,7 +57,6 @@ With client secret:
 ```yaml
 extensions:
   azureauth:
-    scope: https://management.azure.com/.default
     service_principal:
       client_id: ${CLIENT_ID}
       tenant_id: ${TENANT_ID}
@@ -72,7 +67,6 @@ With client certificate path:
 ```yaml
 extensions:
   azureauth:
-    scope: https://management.azure.com/.default
     service_principal:
       client_id: ${CLIENT_ID}
       tenant_id: ${TENANT_ID}
@@ -85,6 +79,5 @@ Not recommended for production.
 ```yaml
 extensions:
   azureauth:
-    scope: https://management.azure.com/.default
     use_default: true
 ```