Merge branch 'main' into trace_sdk_processor_metrics

Author: dashpole

.golangci.yml

@@ -94,7 +94,6 @@ linters:
         - dupArg
         - hugeParam
         - importShadow
-        - paramTypeCombine
         - ptrToRefParam
         - preferDecodeRune
         - rangeValCopy
@@ -182,6 +181,7 @@ linters:
             - fmt.Print
             - fmt.Printf
             - fmt.Println
+        - name: unused-parameter
         - name: unnecessary-stmt
         - name: use-any
         - name: useless-break
@@ -249,9 +249,11 @@ formatters:
     - goimports
     - golines
   settings:
+    gofumpt:
+      extra-rules: true
     goimports:
       local-prefixes:
-        - go.opentelemetry.io
+        - go.opentelemetry.io/otel
     golines:
       max-len: 120
   exclusions:

CHANGELOG.md

@@ -41,11 +41,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
   - `RPCGRPCResponseMetadata`
 - Add `ErrorType` attribute helper function to the `go.opentelmetry.io/otel/semconv/v1.34.0` package. (#6962)
 - Add `WithAllowKeyDuplication` in `go.opentelemetry.io/otel/sdk/log` which can be used to disable deduplication for log records. (#6968)
-- Add `WithCardinalityLimit` option to configure the cardinality limit in `go.opentelemetry.io/otel/sdk/metric`. (#6996, #7065)
+- Add `WithCardinalityLimit` option to configure the cardinality limit in `go.opentelemetry.io/otel/sdk/metric`. (#6996, #7065, #7081)
 - Add `Clone` method to `Record` in `go.opentelemetry.io/otel/log` that returns a copy of the record with no shared state. (#7001)
 - The `go.opentelemetry.io/otel/semconv/v1.36.0` package.
   The package contains semantic conventions from the `v1.36.0` version of the OpenTelemetry Semantic Conventions.
   See the [migration documentation](./semconv/v1.36.0/MIGRATION.md) for information on how to upgrade from `go.opentelemetry.io/otel/semconv/v1.34.0.`(#7032)
+- Add experimental self-observability span metrics in `go.opentelemetry.io/otel/sdk/trace`.
+  Check the `go.opentelemetry.io/otel/sdk/trace/internal/x` package documentation for more information. (#7027)
+- Add native histogram exemplar support in `go.opentelemetry.io/otel/exporters/prometheus`. (#6772)
 - Add experimental self-observability span and batch span processor metrics in `go.opentelemetry.io/otel/sdk/trace`.
   Check the `go.opentelemetry.io/otel/sdk/trace/internal/x` package documentation for more information. (#7027, #6393)
 
@@ -55,6 +58,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Change `SDKProcessorLogQueueCapacity`, `SDKProcessorLogQueueSize`, `SDKProcessorSpanQueueSize`, and `SDKProcessorSpanQueueCapacity` in `go.opentelemetry.io/otel/semconv/v1.36.0/otelconv` to use a `Int64ObservableUpDownCounter`. (#7041)
 - Change `DefaultExemplarReservoirProviderSelector` in `go.opentelemetry.io/otel/sdk/metric` to use `runtime.GOMAXPROCS(0)` instead of `runtime.NumCPU()` for the `FixedSizeReservoirProvider` default size. (#7094)
 
+### Fixed
+
+- Fix `go.opentelemetry.io/otel/exporters/prometheus` to deduplicate suffixes if already present in metric name when UTF8 is enabled. (#7088)
+
 <!-- Released section -->
 <!-- Don't change this section unless doing release -->
 

attribute/filter.go

@@ -16,7 +16,7 @@ type Filter func(KeyValue) bool
 // If keys is empty a deny-all filter is returned.
 func NewAllowKeysFilter(keys ...Key) Filter {
 	if len(keys) == 0 {
-		return func(kv KeyValue) bool { return false }
+		return func(KeyValue) bool { return false }
 	}
 
 	allowed := make(map[Key]struct{}, len(keys))
@@ -35,7 +35,7 @@ func NewAllowKeysFilter(keys ...Key) Filter {
 // If keys is empty an allow-all filter is returned.
 func NewDenyKeysFilter(keys ...Key) Filter {
 	if len(keys) == 0 {
-		return func(kv KeyValue) bool { return true }
+		return func(KeyValue) bool { return true }
 	}
 
 	forbid := make(map[Key]struct{}, len(keys))

attribute/set_test.go

@@ -214,21 +214,21 @@ func TestFiltering(t *testing.T) {
 		{
 			name:   "None",
 			in:     []attribute.KeyValue{a, b, c},
-			filter: func(kv attribute.KeyValue) bool { return false },
+			filter: func(attribute.KeyValue) bool { return false },
 			kept:   nil,
 			drop:   []attribute.KeyValue{a, b, c},
 		},
 		{
 			name:   "All",
 			in:     []attribute.KeyValue{a, b, c},
-			filter: func(kv attribute.KeyValue) bool { return true },
+			filter: func(attribute.KeyValue) bool { return true },
 			kept:   []attribute.KeyValue{a, b, c},
 			drop:   nil,
 		},
 		{
 			name:   "Empty",
 			in:     []attribute.KeyValue{},
-			filter: func(kv attribute.KeyValue) bool { return true },
+			filter: func(attribute.KeyValue) bool { return true },
 			kept:   nil,
 			drop:   nil,
 		},

bridge/opencensus/internal/oc2otel/span_context_test.go

@@ -8,12 +8,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"go.opencensus.io/plugin/ochttp/propagation/tracecontext"
-
-	"go.opentelemetry.io/otel/bridge/opencensus/internal/otel2oc"
-
 	octrace "go.opencensus.io/trace"
 	"go.opencensus.io/trace/tracestate"
 
+	"go.opentelemetry.io/otel/bridge/opencensus/internal/otel2oc"
 	"go.opentelemetry.io/otel/trace"
 )
 

bridge/opencensus/internal/otel2oc/span_context_test.go

@@ -6,16 +6,12 @@ package otel2oc
 import (
 	"testing"
 
-	"go.opencensus.io/plugin/ochttp/propagation/tracecontext"
-
-	"go.opentelemetry.io/otel/bridge/opencensus/internal/oc2otel"
-
 	"github.com/stretchr/testify/assert"
-
-	"go.opencensus.io/trace/tracestate"
-
+	"go.opencensus.io/plugin/ochttp/propagation/tracecontext"
 	octrace "go.opencensus.io/trace"
+	"go.opencensus.io/trace/tracestate"
 
+	"go.opentelemetry.io/otel/bridge/opencensus/internal/oc2otel"
 	"go.opentelemetry.io/otel/trace"
 )
 

bridge/opencensus/internal/span.go

@@ -80,7 +80,7 @@ func (s *Span) Annotatef(attributes []octrace.Attribute, format string, a ...any
 }
 
 // AddMessageSendEvent adds a message send event to this span.
-func (s *Span) AddMessageSendEvent(messageID, uncompressedByteSize, compressedByteSize int64) {
+func (s *Span) AddMessageSendEvent(_, uncompressedByteSize, compressedByteSize int64) {
 	s.otelSpan.AddEvent(MessageSendEvent,
 		trace.WithAttributes(
 			attribute.KeyValue{
@@ -95,7 +95,7 @@ func (s *Span) AddMessageSendEvent(messageID, uncompressedByteSize, compressedBy
 }
 
 // AddMessageReceiveEvent adds a message receive event to this span.
-func (s *Span) AddMessageReceiveEvent(messageID, uncompressedByteSize, compressedByteSize int64) {
+func (s *Span) AddMessageReceiveEvent(_, uncompressedByteSize, compressedByteSize int64) {
 	s.otelSpan.AddEvent(MessageReceiveEvent,
 		trace.WithAttributes(
 			attribute.KeyValue{

bridge/opencensus/metric.go

@@ -23,7 +23,7 @@ type MetricProducer struct {
 
 // NewMetricProducer returns a metric.Producer that fetches metrics from
 // OpenCensus.
-func NewMetricProducer(opts ...MetricOption) *MetricProducer {
+func NewMetricProducer(...MetricOption) *MetricProducer {
 	return &MetricProducer{
 		manager: metricproducer.GlobalManager(),
 	}

bridge/opencensus/trace_test.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
 	octrace "go.opencensus.io/trace"
 
 	"go.opentelemetry.io/otel/sdk/trace"

bridge/opentracing/bridge.go

@@ -321,10 +321,10 @@ var (
 func NewBridgeTracer() *BridgeTracer {
 	return &BridgeTracer{
 		setTracer: bridgeSetTracer{
-			warningHandler: func(msg string) {},
+			warningHandler: func(string) {},
 			otelTracer:     noopTracer,
 		},
-		warningHandler: func(msg string) {},
+		warningHandler: func(string) {},
 		propagator:     nil,
 	}
 }
@@ -647,7 +647,7 @@ func (s fakeSpan) SpanContext() trace.SpanContext {
 // interface.
 //
 // Currently only the HTTPHeaders and TextMap formats are supported.
-func (t *BridgeTracer) Inject(sm ot.SpanContext, format any, carrier any) error {
+func (t *BridgeTracer) Inject(sm ot.SpanContext, format, carrier any) error {
 	bridgeSC, ok := sm.(*bridgeSpanContext)
 	if !ok {
 		return ot.ErrInvalidSpanContext
@@ -696,7 +696,7 @@ func (t *BridgeTracer) Inject(sm ot.SpanContext, format any, carrier any) error
 // interface.
 //
 // Currently only the HTTPHeaders and TextMap formats are supported.
-func (t *BridgeTracer) Extract(format any, carrier any) (ot.SpanContext, error) {
+func (t *BridgeTracer) Extract(format, carrier any) (ot.SpanContext, error) {
 	builtinFormat, ok := format.(ot.BuiltinFormat)
 	if !ok {
 		return nil, ot.ErrUnsupportedFormat
@@ -763,7 +763,7 @@ func (t *textMapWrapper) Get(key string) string {
 	return t.readerMap[key]
 }
 
-func (t *textMapWrapper) Set(key string, value string) {
+func (t *textMapWrapper) Set(key, value string) {
 	t.TextMapWriter.Set(key, value)
 }
 
@@ -832,12 +832,12 @@ func newTextMapWrapperForInject(carrier any) (*textMapWrapper, error) {
 
 type textMapWriter struct{}
 
-func (t *textMapWriter) Set(key string, value string) {
+func (t *textMapWriter) Set(string, string) {
 	// maybe print a warning log.
 }
 
 type textMapReader struct{}
 
-func (t *textMapReader) ForeachKey(handler func(key, val string) error) error {
+func (t *textMapReader) ForeachKey(func(string, string) error) error {
 	return nil // maybe print a warning log.
 }