otlplog: Add instrumentation scope attributes (#5933)

Towards #5844
open-telemetry · Oct 31, 2024 · 2a50fab · 2a50fab
1 parent afd1311
commit 2a50fab
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - `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
 

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/internal/shared/otlp/otlplog/transform/log.go.tmpl b/internal/shared/otlp/otlplog/transform/log.go.tmpl
@@ -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/internal/shared/otlp/otlplog/transform/log_test.go.tmpl b/internal/shared/otlp/otlplog/transform/log_test.go.tmpl
@@ -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",