merge with main

open-telemetry · Nov 1, 2024 · 8275538 · 8275538
2 parents 26387ea + 06ee6f2
commit 8275538
Show file tree

Hide file tree

Showing 60 changed files with 302 additions and 206 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,11 +12,3 @@ go.work
 go.work.sum
 
 gen/
-
-/example/dice/dice
-/example/namedtracer/namedtracer
-/example/otel-collector/otel-collector
-/example/opencensus/opencensus
-/example/passthrough/passthrough
-/example/prometheus/prometheus
-/example/zipkin/zipkin
diff --git a/.golangci.yml b/.golangci.yml
@@ -127,8 +127,6 @@ linters-settings:
           - "**/metric/**/*.go"
           - "**/bridge/*.go"
           - "**/bridge/**/*.go"
-          - "**/example/*.go"
-          - "**/example/**/*.go"
           - "**/trace/*.go"
           - "**/trace/**/*.go"
           - "**/log/*.go"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Add `ReservoirProvider`, `HistogramReservoirProvider` and `FixedSizeReservoirProvider` to `go.opentelemetry.io/otel/sdk/metric/exemplar` to make it convenient to use providers of Reservoirs. (#5861)
 - The `go.opentelemetry.io/otel/semconv/v1.27.0` package.
   The package contains semantic conventions from the `v1.27.0` version of the OpenTelemetry Semantic Conventions. (#5894)
+- Add `Attributes attribute.Set` field to `Scope` in `go.opentelemetry.io/otel/sdk/instrumentation`. (#5903)
+- Add `Attributes attribute.Set` field to `ScopeRecords` in `go.opentelemetry.io/otel/log/logtest`. (#5927)
+- `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc` adds instrumentation scope attributes. (#5934)
+- `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp` adds instrumentation scope attributes. (#5934)
+- `go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc` adds instrumentation scope attributes. (#5935)
+- `go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp` adds instrumentation scope attributes. (#5935)
+- `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc` adds instrumentation scope attributes. (#5933)
+- `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp` adds instrumentation scope attributes. (#5933)
 
 ### Fixed
 
@@ -28,8 +36,16 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - `go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc` now keeps the metadata already present in the context when `WithHeaders` is used. (#5892)
 - `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc` now keeps the metadata already present in the context when `WithHeaders` is used. (#5911)
 - `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc` now keeps the metadata already present in the context when `WithHeaders` is used. (#5915)
+- Support scope attributes and make them as identifying for `Tracer` in `go.opentelemetry.io/otel` and `go.opentelemetry.io/otel/sdk/trace`. (#5924)
+- Support scope attributes and make them as identifying for `Meter` in `go.opentelemetry.io/otel` and `go.opentelemetry.io/otel/sdk/metric`. (#5926)
+- Support scope attributes and make them as identifying for `Logger` in `go.opentelemetry.io/otel` and `go.opentelemetry.io/otel/sdk/log`. (#5925)
+- Make schema URL and scope attributes as identifying for `Tracer` in `go.opentelemetry.io/otel/bridge/opentracing`. (#5931)
 - Add int64Measures and float64Measures to `go.opentelemetry.io/otel/sdk/metric` pipeline to call the measure of specific pipeline while calling Collect method. (#5900)
 
+### Removed
+
+- Remove all examples under `go.opentelemetry.io/otel/example` as they are moved to [Contrib repository](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/examples). (#5930)
+
 <!-- Released section -->
 <!-- Don't change this section unless doing release -->
 

diff --git a/bridge/opentracing/provider.go b/bridge/opentracing/provider.go
@@ -6,6 +6,7 @@ package opentracing // import "go.opentelemetry.io/otel/bridge/opentracing"
 import (
 	"sync"
 
+	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 	"go.opentelemetry.io/otel/trace/embedded"
 )
@@ -38,6 +39,8 @@ func NewTracerProvider(bridge *BridgeTracer, provider trace.TracerProvider) *Tra
 type wrappedTracerKey struct {
 	name    string
 	version string
+	schema  string
+	attrs   attribute.Set
 }
 
 // Tracer creates a WrappedTracer that wraps the OpenTelemetry tracer for each call to
@@ -51,6 +54,8 @@ func (p *TracerProvider) Tracer(name string, opts ...trace.TracerOption) trace.T
 	key := wrappedTracerKey{
 		name:    name,
 		version: c.InstrumentationVersion(),
+		schema:  c.SchemaURL(),
+		attrs:   c.InstrumentationAttributes(),
 	}
 
 	if t, ok := p.tracers[key]; ok {

diff --git a/bridge/opentracing/provider_test.go b/bridge/opentracing/provider_test.go
@@ -6,6 +6,7 @@ package opentracing
 import (
 	"testing"
 
+	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/bridge/opentracing/internal"
 	"go.opentelemetry.io/otel/trace"
 	"go.opentelemetry.io/otel/trace/embedded"
@@ -58,18 +59,37 @@ func TestTracerProvider(t *testing.T) {
 	})
 
 	t.Run("Repeated requests to create a tracer should provide the existing tracer", func(t *testing.T) {
-		tracer1 := provider.Tracer(foobar)
-		assertMockTracerName(t, tracer1, foobar)
-		tracer2 := provider.Tracer(foobar)
-		assertMockTracerName(t, tracer2, foobar)
-		tracer3 := provider.Tracer(bazbar)
-		assertMockTracerName(t, tracer3, bazbar)
-
-		if tracer1 != tracer2 {
-			t.Errorf("expected the same tracer, got different tracers")
+		tracerFns := []func() trace.Tracer{
+			func() trace.Tracer {
+				return provider.Tracer(foobar)
+			},
+			func() trace.Tracer {
+				return provider.Tracer(bazbar)
+			},
+			func() trace.Tracer {
+				return provider.Tracer(foobar, trace.WithSchemaURL("https://opentelemetry.io/schemas/1.2.0"))
+			},
+			func() trace.Tracer {
+				return provider.Tracer(foobar, trace.WithInstrumentationAttributes(attribute.String("foo", "bar")))
+			},
+			func() trace.Tracer {
+				return provider.Tracer(foobar, trace.WithSchemaURL("https://opentelemetry.io/schemas/1.2.0"), trace.WithInstrumentationAttributes(attribute.String("foo", "bar")))
+			},
 		}
-		if tracer1 == tracer3 || tracer2 == tracer3 {
-			t.Errorf("expected different tracers, got the same tracer")
+
+		for i, fn1 := range tracerFns {
+			for j, fn2 := range tracerFns {
+				tracer1, tracer2 := fn1(), fn2()
+				if i == j {
+					if tracer1 != tracer2 {
+						t.Errorf("expected the same tracer, got different tracers; i=%d j=%d", i, j)
+					}
+				} else {
+					if tracer1 == tracer2 {
+						t.Errorf("expected different tracers, got the same tracer; i=%d j=%d", i, j)
+					}
+				}
+			}
 		}
 	})
 }
diff --git a/example/dice/go.mod b/example/dice/go.mod
diff --git a/example/dice/go.sum b/example/dice/go.sum
diff --git a/example/dice/main.go b/example/dice/main.go
diff --git a/example/namedtracer/go.mod b/example/namedtracer/go.mod
diff --git a/example/namedtracer/go.sum b/example/namedtracer/go.sum
diff --git a/example/namedtracer/main.go b/example/namedtracer/main.go
diff --git a/example/opencensus/go.mod b/example/opencensus/go.mod
diff --git a/example/opencensus/go.sum b/example/opencensus/go.sum
diff --git a/example/opencensus/main.go b/example/opencensus/main.go
diff --git a/example/otel-collector/go.mod b/example/otel-collector/go.mod
diff --git a/example/otel-collector/go.sum b/example/otel-collector/go.sum
diff --git a/example/otel-collector/main.go b/example/otel-collector/main.go
diff --git a/example/passthrough/go.mod b/example/passthrough/go.mod
diff --git a/example/passthrough/go.sum b/example/passthrough/go.sum
diff --git a/example/passthrough/main.go b/example/passthrough/main.go
diff --git a/example/prometheus/go.mod b/example/prometheus/go.mod
diff --git a/example/prometheus/go.sum b/example/prometheus/go.sum
diff --git a/example/prometheus/main.go b/example/prometheus/main.go
diff --git a/example/zipkin/go.mod b/example/zipkin/go.mod
diff --git a/example/zipkin/go.sum b/example/zipkin/go.sum
diff --git a/example/zipkin/main.go b/example/zipkin/main.go
diff --git a/exporters/otlp/otlplog/otlploggrpc/internal/transform/log.go b/exporters/otlp/otlplog/otlploggrpc/internal/transform/log.go
@@ -50,8 +50,9 @@ func ResourceLogs(records []log.Record) []*lpb.ResourceLogs {
 			var emptyScope instrumentation.Scope
 			if scope != emptyScope {
 				sl.Scope = &cpb.InstrumentationScope{
-					Name:    scope.Name,
-					Version: scope.Version,
+					Name:       scope.Name,
+					Version:    scope.Version,
+					Attributes: AttrIter(scope.Attributes.Iter()),
 				}
 				sl.SchemaUrl = scope.SchemaURL
 			}

diff --git a/exporters/otlp/otlplog/otlploggrpc/internal/transform/log_test.go b/exporters/otlp/otlplog/otlploggrpc/internal/transform/log_test.go
@@ -16,6 +16,7 @@ import (
 	lpb "go.opentelemetry.io/proto/otlp/logs/v1"
 	rpb "go.opentelemetry.io/proto/otlp/resource/v1"
 
+	"go.opentelemetry.io/otel/attribute"
 	api "go.opentelemetry.io/otel/log"
 	"go.opentelemetry.io/otel/sdk/instrumentation"
 	"go.opentelemetry.io/otel/sdk/log"
@@ -70,9 +71,10 @@ var (
 	flagsD   = byte(0)
 
 	scope = instrumentation.Scope{
-		Name:      "otel/test/code/path1",
-		Version:   "v0.1.1",
-		SchemaURL: semconv.SchemaURL,
+		Name:       "otel/test/code/path1",
+		Version:    "v0.1.1",
+		SchemaURL:  semconv.SchemaURL,
+		Attributes: attribute.NewSet(attribute.String("foo", "bar")),
 	}
 	scope2 = instrumentation.Scope{
 		Name:      "otel/test/code/path2",
@@ -84,6 +86,14 @@ var (
 	pbScope = &cpb.InstrumentationScope{
 		Name:    "otel/test/code/path1",
 		Version: "v0.1.1",
+		Attributes: []*cpb.KeyValue{
+			{
+				Key: "foo",
+				Value: &cpb.AnyValue{
+					Value: &cpb.AnyValue_StringValue{StringValue: "bar"},
+				},
+			},
+		},
 	}
 	pbScope2 = &cpb.InstrumentationScope{
 		Name:    "otel/test/code/path2",

diff --git a/exporters/otlp/otlplog/otlploghttp/internal/transform/log.go b/exporters/otlp/otlplog/otlploghttp/internal/transform/log.go
@@ -50,8 +50,9 @@ func ResourceLogs(records []log.Record) []*lpb.ResourceLogs {
 			var emptyScope instrumentation.Scope
 			if scope != emptyScope {
 				sl.Scope = &cpb.InstrumentationScope{
-					Name:    scope.Name,
-					Version: scope.Version,
+					Name:       scope.Name,
+					Version:    scope.Version,
+					Attributes: AttrIter(scope.Attributes.Iter()),
 				}
 				sl.SchemaUrl = scope.SchemaURL
 			}

diff --git a/exporters/otlp/otlplog/otlploghttp/internal/transform/log_test.go b/exporters/otlp/otlplog/otlploghttp/internal/transform/log_test.go
@@ -16,6 +16,7 @@ import (
 	lpb "go.opentelemetry.io/proto/otlp/logs/v1"
 	rpb "go.opentelemetry.io/proto/otlp/resource/v1"
 
+	"go.opentelemetry.io/otel/attribute"
 	api "go.opentelemetry.io/otel/log"
 	"go.opentelemetry.io/otel/sdk/instrumentation"
 	"go.opentelemetry.io/otel/sdk/log"
@@ -70,9 +71,10 @@ var (
 	flagsD   = byte(0)
 
 	scope = instrumentation.Scope{
-		Name:      "otel/test/code/path1",
-		Version:   "v0.1.1",
-		SchemaURL: semconv.SchemaURL,
+		Name:       "otel/test/code/path1",
+		Version:    "v0.1.1",
+		SchemaURL:  semconv.SchemaURL,
+		Attributes: attribute.NewSet(attribute.String("foo", "bar")),
 	}
 	scope2 = instrumentation.Scope{
 		Name:      "otel/test/code/path2",
@@ -84,6 +86,14 @@ var (
 	pbScope = &cpb.InstrumentationScope{
 		Name:    "otel/test/code/path1",
 		Version: "v0.1.1",
+		Attributes: []*cpb.KeyValue{
+			{
+				Key: "foo",
+				Value: &cpb.AnyValue{
+					Value: &cpb.AnyValue_StringValue{StringValue: "bar"},
+				},
+			},
+		},
 	}
 	pbScope2 = &cpb.InstrumentationScope{
 		Name:    "otel/test/code/path2",

diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/transform/metricdata.go b/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/transform/metricdata.go
@@ -46,8 +46,9 @@ func ScopeMetrics(sms []metricdata.ScopeMetrics) ([]*mpb.ScopeMetrics, error) {
 
 		out = append(out, &mpb.ScopeMetrics{
 			Scope: &cpb.InstrumentationScope{
-				Name:    sm.Scope.Name,
-				Version: sm.Scope.Version,
+				Name:       sm.Scope.Name,
+				Version:    sm.Scope.Version,
+				Attributes: AttrIter(sm.Scope.Attributes.Iter()),
 			},
 			Metrics:   ms,
 			SchemaUrl: sm.Scope.SchemaURL,

diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/transform/metricdata_test.go b/exporters/otlp/otlpmetric/otlpmetricgrpc/internal/transform/metricdata_test.go
@@ -805,9 +805,10 @@ var (
 	otelScopeMetrics = []metricdata.ScopeMetrics{
 		{
 			Scope: instrumentation.Scope{
-				Name:      "test/code/path",
-				Version:   "v0.1.0",
-				SchemaURL: semconv.SchemaURL,
+				Name:       "test/code/path",
+				Version:    "v0.1.0",
+				SchemaURL:  semconv.SchemaURL,
+				Attributes: attribute.NewSet(attribute.String("foo", "bar")),
 			},
 			Metrics: otelMetrics,
 		},
@@ -818,6 +819,14 @@ var (
 			Scope: &cpb.InstrumentationScope{
 				Name:    "test/code/path",
 				Version: "v0.1.0",
+				Attributes: []*cpb.KeyValue{
+					{
+						Key: "foo",
+						Value: &cpb.AnyValue{
+							Value: &cpb.AnyValue_StringValue{StringValue: "bar"},
+						},
+					},
+				},
 			},
 			Metrics:   pbMetrics,
 			SchemaUrl: semconv.SchemaURL,