Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add scope version #442

Merged
merged 5 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ OpenTelemetry Go Automatic Instrumentation adheres to [Semantic Versioning](http
All options passed before this one will be overridden if there are conflicts, and those passed after will override the environment. ([#417](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/417))
- Add the `WithTraceExporter` `InstrumentationOption` to configure the trace `SpanExporter` used by an `Instrumentation`. ([#426](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/426))
- Add HTTP status code attribute to `net/http` server instrumentation. ([#428](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/428))
- The instrumentation scope now includes the version of the auto-instrumentation project. ([#442](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/442))

### Changed

Expand Down
2 changes: 1 addition & 1 deletion instrumentation.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func NewInstrumentation(ctx context.Context, opts ...InstrumentationOption) (*In
return nil, err
}

ctrl, err := opentelemetry.NewController(logger, c.tracerProvider())
ctrl, err := opentelemetry.NewController(logger, c.tracerProvider(), Version())
if err != nil {
return nil, err
}
Expand Down
9 changes: 7 additions & 2 deletions internal/pkg/opentelemetry/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
// Controller handles OpenTelemetry telemetry generation for events.
type Controller struct {
logger logr.Logger
version string
tracerProvider trace.TracerProvider
tracersMap map[string]trace.Tracer
bootTime int64
Expand All @@ -40,7 +41,10 @@ func (c *Controller) getTracer(libName string) trace.Tracer {
return t
}

newTracer := c.tracerProvider.Tracer(libName)
newTracer := c.tracerProvider.Tracer(
libName,
pellared marked this conversation as resolved.
Show resolved Hide resolved
trace.WithInstrumentationVersion(c.version),
)
c.tracersMap[libName] = newTracer
return newTracer
}
Expand Down Expand Up @@ -74,7 +78,7 @@ func (c *Controller) convertTime(t int64) time.Time {
}

// NewController returns a new initialized [Controller].
func NewController(logger logr.Logger, tracerProvider trace.TracerProvider) (*Controller, error) {
func NewController(logger logr.Logger, tracerProvider trace.TracerProvider, ver string) (*Controller, error) {
logger = logger.WithName("Controller")

bt, err := estimateBootTimeOffset()
Expand All @@ -84,6 +88,7 @@ func NewController(logger logr.Logger, tracerProvider trace.TracerProvider) (*Co

return &Controller{
logger: logger,
version: ver,
tracerProvider: tracerProvider,
tracersMap: make(map[string]trace.Tracer),
bootTime: bt,
Expand Down
9 changes: 6 additions & 3 deletions internal/test/e2e/databasesql/traces.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
"scopeSpans": [
{
"scope": {
"name": "database/sql"
"name": "database/sql",
"version": "v0.7.0-alpha"
},
"spans": [
{
Expand All @@ -68,7 +69,8 @@
},
{
"scope": {
"name": "net/http"
"name": "net/http",
"version": "v0.7.0-alpha"
},
"spans": [
{
Expand Down Expand Up @@ -103,7 +105,8 @@
},
{
"scope": {
"name": "net/http/client"
"name": "net/http/client",
"version": "v0.7.0-alpha"
},
"spans": [
{
Expand Down
6 changes: 4 additions & 2 deletions internal/test/e2e/gin/traces.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
"scopeSpans": [
{
"scope": {
"name": "github.com/gin-gonic/gin"
"name": "github.com/gin-gonic/gin",
"version": "v0.7.0-alpha"
},
"spans": [
{
Expand Down Expand Up @@ -74,7 +75,8 @@
},
{
"scope": {
"name": "net/http/client"
"name": "net/http/client",
"version": "v0.7.0-alpha"
},
"spans": [
{
Expand Down
6 changes: 4 additions & 2 deletions internal/test/e2e/nethttp/traces.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
"scopeSpans": [
{
"scope": {
"name": "net/http"
"name": "net/http",
"version": "v0.7.0-alpha"
},
"spans": [
{
Expand Down Expand Up @@ -80,7 +81,8 @@
},
{
"scope": {
"name": "net/http/client"
"name": "net/http/client",
"version": "v0.7.0-alpha"
},
"spans": [
{
Expand Down
Loading