Group some packages (#814)

* Rearrange/group some packages

* rearrange some packages

* Fix compilation error

Author: mariomac

cmd/k8s-cache/main.go

@@ -17,10 +17,10 @@ import (
 	"time"
 
 	"go.opentelemetry.io/obi/pkg/buildinfo"
-	"go.opentelemetry.io/obi/pkg/kubecache"
-	"go.opentelemetry.io/obi/pkg/kubecache/instrument"
-	"go.opentelemetry.io/obi/pkg/kubecache/meta"
-	"go.opentelemetry.io/obi/pkg/kubecache/service"
+	"go.opentelemetry.io/obi/pkg/kube/kubecache"
+	"go.opentelemetry.io/obi/pkg/kube/kubecache/instrument"
+	"go.opentelemetry.io/obi/pkg/kube/kubecache/meta"
+	"go.opentelemetry.io/obi/pkg/kube/kubecache/service"
 )
 
 // main code of te Kubernetes K8s informer's metadata cache service, when it runs as a separate service and not

examples/vendoring/vendoring.go

@@ -11,11 +11,11 @@ import (
 	"os/signal"
 	"syscall"
 
-	"go.opentelemetry.io/obi/pkg/app/request"
+	"go.opentelemetry.io/obi/pkg/appolly/app/request"
+	"go.opentelemetry.io/obi/pkg/appolly/services"
 	"go.opentelemetry.io/obi/pkg/instrumenter"
 	"go.opentelemetry.io/obi/pkg/obi"
 	"go.opentelemetry.io/obi/pkg/pipe/msg"
-	"go.opentelemetry.io/obi/pkg/services"
 )
 
 // OpenTelemetry-eBPF-instumentation is also designed to be vendored inside other components

pkg/app/request/metric_attributes.go renamed to pkg/appolly/app/request/metric_attributes.go

@@ -17,9 +17,9 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
-	trace2 "go.opentelemetry.io/otel/trace"
+	"go.opentelemetry.io/otel/trace"
 
-	"go.opentelemetry.io/obi/pkg/app/svc"
+	"go.opentelemetry.io/obi/pkg/appolly/app/svc"
 	attr "go.opentelemetry.io/obi/pkg/export/attributes/names"
 )
 
@@ -214,9 +214,9 @@ type Span struct {
 	Start          int64          `json:"-"`
 	End            int64          `json:"-"`
 	Service        svc.Attrs      `json:"-"`
-	TraceID        trace2.TraceID `json:"traceID"`
-	SpanID         trace2.SpanID  `json:"spanID"`
-	ParentSpanID   trace2.SpanID  `json:"parentSpanID"`
+	TraceID        trace.TraceID  `json:"traceID"`
+	SpanID         trace.SpanID   `json:"spanID"`
+	ParentSpanID   trace.SpanID   `json:"parentSpanID"`
 	TraceFlags     uint8          `json:"traceFlags,string"`
 	Pid            PidInfo        `json:"-"`
 	PeerName       string         `json:"peerName"`

pkg/app/request/span.go renamed to pkg/appolly/app/request/span.go

@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"go.opentelemetry.io/obi/pkg/app/svc"
+	"go.opentelemetry.io/obi/pkg/appolly/app/svc"
 	"go.opentelemetry.io/obi/pkg/export/attributes"
 	attr "go.opentelemetry.io/obi/pkg/export/attributes/names"
 )

pkg/app/request/span_getters.go renamed to pkg/appolly/app/request/span_getters.go

@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	trace2 "go.opentelemetry.io/otel/trace"
+	"go.opentelemetry.io/otel/trace"
 
-	"go.opentelemetry.io/obi/pkg/app/svc"
+	"go.opentelemetry.io/obi/pkg/appolly/app/svc"
 )
 
 func TestSpanClientServer(t *testing.T) {
@@ -211,9 +211,9 @@ func TestSerializeJSONSpans(t *testing.T) {
 			RequestStart:   10000,
 			Start:          15000,
 			End:            35000,
-			TraceID:        trace2.TraceID{0x1, 0x2, 0x3},
-			SpanID:         trace2.SpanID{0x1, 0x2, 0x3},
-			ParentSpanID:   trace2.SpanID{0x1, 0x2, 0x3},
+			TraceID:        trace.TraceID{0x1, 0x2, 0x3},
+			SpanID:         trace.SpanID{0x1, 0x2, 0x3},
+			ParentSpanID:   trace.SpanID{0x1, 0x2, 0x3},
 			TraceFlags:     1,
 			PeerName:       "peername",
 			HostName:       "hostname",