Merge branch 'main' into log-simple-handle-zero

.github/workflows/benchmark.yml

@@ -24,7 +24,15 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ./benchmarks
-          key: ${{ runner.os }}-benchmark
+          # Use the current commit SHA as the cache key.
+          # This key won't exist on the first run, so the cache match falls back to restore-keys.
+          # Though, it won't be matched, the cache created will use this key as the cache key.
+          # So the next commit will be able to restore this cache (from the restore-keys).
+          # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/caching-dependencies-to-speed-up-workflows#matching-a-cache-key
+          key: ${{ runner.os }}-benchmark-${{ github.sha }}
+          # `github.event.before` means the commit before the push (i.e. the previous commit).
+          # So we can fetch the exact benchmark data from the previous commit.
+          restore-keys: ${{ runner.os }}-benchmark-${{ github.event.before }}
       - name: Store benchmarks result
         uses: benchmark-action/[email protected]
         with:

CHANGELOG.md

@@ -35,6 +35,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Correct the `Tracer` names used in `go.opentelemetry.io/otel/example/zipkin`. (#5612)
 - Pass the underlying error rather than a generic retry-able failure in `go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp`, `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp` and `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp`. (#5541)
 - Correct comments for the priority of the `WithEndpoint` and `WithEndpointURL` options and their corresponding environment variables in `go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc` and `go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp`. (#5641)
+- Correct comments for the priority of the `WithEndpoint` and `WithEndpointURL` options and their corresponding environment variables in `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp`. (#5650)
 
 <!-- Released section -->
 <!-- Don't change this section unless doing release -->

CODEOWNERS

@@ -5,7 +5,7 @@
 #####################################################
 #
 # Learn about membership in OpenTelemetry community:
-#  https://github.com/open-telemetry/community/blob/main/community-membership.md
+#  https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md
 #
 #
 # Learn about CODEOWNERS file format:

CONTRIBUTING.md

@@ -650,7 +650,7 @@ should be canceled.
 ### Become an Approver or a Maintainer
 
 See the [community membership document in OpenTelemetry community
-repo](https://github.com/open-telemetry/community/blob/main/community-membership.md).
+repo](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md).
 
 [Approver]: #approvers
 [Maintainer]: #maintainers

exporters/otlp/otlplog/otlploghttp/config.go

@@ -143,8 +143,12 @@ func newConfig(options []Option) config {
 //
 // If the OTEL_EXPORTER_OTLP_ENDPOINT or OTEL_EXPORTER_OTLP_LOGS_ENDPOINT
 // environment variable is set, and this option is not passed, that variable
-// value will be used. If both are set, OTEL_EXPORTER_OTLP_LOGS_ENDPOINT
-// will take precedence.
+// value will be used. If both environment variables are set,
+// OTEL_EXPORTER_OTLP_LOGS_ENDPOINT will take precedence. If an environment
+// variable is set, and this option is passed, this option will take precedence.
+//
+// If both this option and WithEndpointURL are used, the last used option will
+// take precedence.
 //
 // By default, if an environment variable is not set, and this option is not
 // passed, "localhost:4318" will be used.
@@ -159,8 +163,9 @@ func WithEndpoint(endpoint string) Option {
 //
 // If the OTEL_EXPORTER_OTLP_ENDPOINT or OTEL_EXPORTER_OTLP_LOGS_ENDPOINT
 // environment variable is set, and this option is not passed, that variable
-// value will be used. If both are set, OTEL_EXPORTER_OTLP_LOGS_ENDPOINT
-// will take precedence.
+// value will be used. If both environment variables are set,
+// OTEL_EXPORTER_OTLP_LOGS_ENDPOINT will take precedence. If an environment
+// variable is set, and this option is passed, this option will take precedence.
 //
 // If both this option and WithEndpoint are used, the last used option will
 // take precedence.

exporters/otlp/otlplog/otlploghttp/config_test.go

@@ -288,6 +288,7 @@ func TestNewConfig(t *testing.T) {
 			},
 			options: []Option{
 				WithEndpoint("test"),
+				WithEndpointURL("https://test2/path2"),
 				WithURLPath("/path"),
 				WithInsecure(),
 				WithTLSClientConfig(tlsCfg),
@@ -297,7 +298,7 @@ func TestNewConfig(t *testing.T) {
 				WithRetry(RetryConfig(rc)),
 			},
 			want: config{
-				endpoint:    newSetting("test"),
+				endpoint:    newSetting("test2"),
 				path:        newSetting("/path"),
 				insecure:    newSetting(true),
 				tlsCfg:      newSetting(tlsCfg),