mirror of
https://github.com/fosrl/gerbil.git
synced 2026-05-19 06:39:54 +00:00
fix(otel): revert semconv version and correct deployment environment attribute
Signed-off-by: Marc Schäfer <git@marcschaeferger.de>
This commit is contained in:
@@ -3,7 +3,7 @@ package otel
|
|||||||
import (
|
import (
|
||||||
"go.opentelemetry.io/otel/attribute"
|
"go.opentelemetry.io/otel/attribute"
|
||||||
"go.opentelemetry.io/otel/sdk/resource"
|
"go.opentelemetry.io/otel/sdk/resource"
|
||||||
semconv "go.opentelemetry.io/otel/semconv/v1.40.0"
|
semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
|
||||||
)
|
)
|
||||||
|
|
||||||
// newResource builds an OTel resource for the Gerbil service.
|
// newResource builds an OTel resource for the Gerbil service.
|
||||||
@@ -15,11 +15,11 @@ func newResource(serviceName, serviceVersion, deploymentEnv string) (*resource.R
|
|||||||
attrs = append(attrs, semconv.ServiceVersion(serviceVersion))
|
attrs = append(attrs, semconv.ServiceVersion(serviceVersion))
|
||||||
}
|
}
|
||||||
if deploymentEnv != "" {
|
if deploymentEnv != "" {
|
||||||
attrs = append(attrs, semconv.DeploymentEnvironmentName(deploymentEnv))
|
attrs = append(attrs, semconv.DeploymentEnvironment(deploymentEnv))
|
||||||
}
|
}
|
||||||
|
|
||||||
return resource.Merge(
|
return resource.Merge(
|
||||||
resource.Default(),
|
resource.Default(),
|
||||||
resource.NewWithAttributes(semconv.SchemaURL, attrs...),
|
resource.NewSchemaless(attrs...),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user