aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2025-12-18 23:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

runtime: migrate from opentracing to opentelemetry

Browse Source 
This commit includes two changes:
- migrate from opentracing to opentelemetry
- add jaeger configuration items

Fixes: #1351

Signed-off-by: bin <bin@hyper.sh>
This commit is contained in:
bin
2021-02-02 21:51:04 +08:00
parent 6be910bdc1
commit 17df9b119d
476 changed files with 50441 additions and 25819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/runtime/virtcontainers/container.go
View File

@@ -23,10 +23,12 @@ import (
vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types"
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils"
"go.opentelemetry.io/otel"
otelLabel "go.opentelemetry.io/otel/label"
otelTrace "go.opentelemetry.io/otel/trace"
"github.com/containerd/cgroups"
specs "github.com/opencontainers/runtime-spec/specs-go"
opentracing "github.com/opentracing/opentracing-go"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
@@ -351,15 +353,15 @@ func (c *Container) Logger() *logrus.Entry {
})
}
func (c *Container) trace(name string) (opentracing.Span, context.Context) {
func (c *Container) trace(name string) (otelTrace.Span, context.Context) {
if c.ctx == nil {
c.Logger().WithField("type", "bug").Error("trace called before context set")
c.ctx = context.Background()
}
span, ctx := opentracing.StartSpanFromContext(c.ctx, name)
span.SetTag("subsystem", "container")
tracer := otel.Tracer("kata")
ctx, span := tracer.Start(c.ctx, name)
span.SetAttributes(otelLabel.Key("subsystem").String("container"))
return span, ctx
}
@@ -569,14 +571,14 @@ func (c *Container) mountSharedDirMounts(hostSharedDir, hostMountDir, guestShare
}
func (c *Container) unmountHostMounts() error {
var span opentracing.Span
var span otelTrace.Span
span, c.ctx = c.trace("unmountHostMounts")
defer span.Finish()
defer span.End()
for _, m := range c.mounts {
if m.HostPath != "" {
span, _ := c.trace("unmount")
span.SetTag("host-path", m.HostPath)
span.SetAttributes(otelLabel.Key("host-path").String(m.HostPath))
if err := syscall.Unmount(m.HostPath, syscall.MNT_DETACH|UmountNoFollow); err != nil {
c.Logger().WithFields(logrus.Fields{
@@ -600,7 +602,7 @@ func (c *Container) unmountHostMounts() error {
}
}
span.Finish()
span.End()
}
}
@@ -699,7 +701,7 @@ func (c *Container) createBlockDevices() error {
// newContainer creates a Container structure from a sandbox and a container configuration.
func newContainer(sandbox *Sandbox, contConfig *ContainerConfig) (*Container, error) {
span, _ := sandbox.trace("newContainer")
defer span.Finish()
defer span.End()
if !contConfig.valid() {
return &Container{}, fmt.Errorf("Invalid container configuration")
@@ -969,7 +971,7 @@ func (c *Container) start() error {
func (c *Container) stop(force bool) error {
span, _ := c.trace("stop")
defer span.Finish()
defer span.End()
// In case the container status has been updated implicitly because
// the container process has terminated, it might be possible that