diff --git a/.gitignore b/.gitignore index abb2d968..19632d1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,15 @@ .idea .vscode + +**/go.sum +**/vendor + otel-go-auto-instrumentation otelbuild otelbuild-* *.log .otel-build -vendor + test/errors-test/errors-test test/helloworld/helloworld test/httpclient/httpclient diff --git a/pkg/rules/otsdk/baggage/context.go b/pkg/rules/otel-sdk/baggage/context.go similarity index 100% rename from pkg/rules/otsdk/baggage/context.go rename to pkg/rules/otel-sdk/baggage/context.go diff --git a/pkg/rules/otsdk/ot_baggage_linker.go b/pkg/rules/otel-sdk/otel_baggage_linker.go similarity index 61% rename from pkg/rules/otsdk/ot_baggage_linker.go rename to pkg/rules/otel-sdk/otel_baggage_linker.go index 6f0e6ac7..f625e8fb 100644 --- a/pkg/rules/otsdk/ot_baggage_linker.go +++ b/pkg/rules/otel-sdk/otel_baggage_linker.go @@ -24,15 +24,15 @@ var ( SetBaggageContainerToGLS = func(interface{}) {} ) -//go:linkname ot_get_baggage_container_from_gls ot_get_baggage_container_from_gls -var ot_get_baggage_container_from_gls func() interface{} +//go:linkname otel_get_baggage_container_from_gls otel_get_baggage_container_from_gls +var otel_get_baggage_container_from_gls func() interface{} -//go:linkname ot_set_baggage_container_to_gls ot_set_baggage_container_to_gls -var ot_set_baggage_container_to_gls func(interface{}) +//go:linkname otel_set_baggage_container_to_gls otel_set_baggage_container_to_gls +var otel_set_baggage_container_to_gls func(interface{}) func init() { - if ot_get_baggage_container_from_gls != nil && ot_set_baggage_container_to_gls != nil { - GetBaggageContainerFromGLS = ot_get_baggage_container_from_gls - SetBaggageContainerToGLS = ot_set_baggage_container_to_gls + if otel_get_baggage_container_from_gls != nil && otel_set_baggage_container_to_gls != nil { + GetBaggageContainerFromGLS = otel_get_baggage_container_from_gls + SetBaggageContainerToGLS = otel_set_baggage_container_to_gls } } diff --git a/pkg/rules/otsdk/ot_baggage_util.go b/pkg/rules/otel-sdk/otel_baggage_util.go similarity index 100% rename from pkg/rules/otsdk/ot_baggage_util.go rename to pkg/rules/otel-sdk/otel_baggage_util.go diff --git a/pkg/rules/otsdk/ot_trace_context_linker.go b/pkg/rules/otel-sdk/otel_trace_context_linker.go similarity index 54% rename from pkg/rules/otsdk/ot_trace_context_linker.go rename to pkg/rules/otel-sdk/otel_trace_context_linker.go index 01a9a490..f46b6998 100644 --- a/pkg/rules/otsdk/ot_trace_context_linker.go +++ b/pkg/rules/otel-sdk/otel_trace_context_linker.go @@ -25,21 +25,21 @@ var ( SetBaggageContainerToGLS = func(interface{}) {} ) -//go:linkname ot_get_trace_context_from_gls ot_get_trace_context_from_gls -var ot_get_trace_context_from_gls func() interface{} +//go:linkname otel_get_trace_context_from_gls otel_get_trace_context_from_gls +var otel_get_trace_context_from_gls func() interface{} -//go:linkname ot_set_trace_context_to_gls ot_set_trace_context_to_gls -var ot_set_trace_context_to_gls func(interface{}) +//go:linkname otel_set_trace_context_to_gls otel_set_trace_context_to_gls +var otel_set_trace_context_to_gls func(interface{}) -//go:linkname ot_set_baggage_container_to_gls ot_set_baggage_container_to_gls -var ot_set_baggage_container_to_gls func(interface{}) +//go:linkname otel_set_baggage_container_to_gls otel_set_baggage_container_to_gls +var otel_set_baggage_container_to_gls func(interface{}) func init() { - if ot_get_trace_context_from_gls != nil && ot_set_trace_context_to_gls != nil { - GetTraceContextFromGLS = ot_get_trace_context_from_gls - SetTraceContextToGLS = ot_set_trace_context_to_gls + if otel_get_trace_context_from_gls != nil && otel_set_trace_context_to_gls != nil { + GetTraceContextFromGLS = otel_get_trace_context_from_gls + SetTraceContextToGLS = otel_set_trace_context_to_gls } - if ot_set_baggage_container_to_gls != nil { - SetBaggageContainerToGLS = ot_set_baggage_container_to_gls + if otel_set_baggage_container_to_gls != nil { + SetBaggageContainerToGLS = otel_set_baggage_container_to_gls } } diff --git a/pkg/rules/otsdk/rule.go b/pkg/rules/otel-sdk/rule.go similarity index 78% rename from pkg/rules/otsdk/rule.go rename to pkg/rules/otel-sdk/rule.go index 12618cf2..f695acf2 100644 --- a/pkg/rules/otsdk/rule.go +++ b/pkg/rules/otel-sdk/rule.go @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otsdk +package otel_sdk import "github.com/alibaba/opentelemetry-go-auto-instrumentation/api" func init() { - api.NewFileRule("go.opentelemetry.io/otel/sdk/trace", "ot_trace_context_linker.go").Register() - api.NewFileRule("go.opentelemetry.io/otel/sdk/trace", "trace-context/ot_trace_context.go").Register() + api.NewFileRule("go.opentelemetry.io/otel/sdk/trace", "otel_trace_context_linker.go").Register() + api.NewFileRule("go.opentelemetry.io/otel/sdk/trace", "trace-context/otel_trace_context.go").Register() api.NewFileRule("go.opentelemetry.io/otel/sdk/trace", "trace-context/span.go").WithReplace(true).Register() api.NewFileRule("go.opentelemetry.io/otel/sdk/trace", "trace-context/tracer.go").WithReplace(true).Register() api.NewFileRule("go.opentelemetry.io/otel", "trace-context/trace.go").WithReplace(true).Register() // baggage - api.NewFileRule("go.opentelemetry.io/otel/baggage", "ot_baggage_linker.go").Register() - api.NewFileRule("go.opentelemetry.io/otel/baggage", "ot_baggage_util.go").Register() + api.NewFileRule("go.opentelemetry.io/otel/baggage", "otel_baggage_linker.go").Register() + api.NewFileRule("go.opentelemetry.io/otel/baggage", "otel_baggage_util.go").Register() api.NewFileRule("go.opentelemetry.io/otel/baggage", "baggage/context.go").WithReplace(true).Register() } diff --git a/pkg/rules/otsdk/trace-context/ot_trace_context.go b/pkg/rules/otel-sdk/trace-context/otel_trace_context.go similarity index 100% rename from pkg/rules/otsdk/trace-context/ot_trace_context.go rename to pkg/rules/otel-sdk/trace-context/otel_trace_context.go diff --git a/pkg/rules/otsdk/trace-context/span.go b/pkg/rules/otel-sdk/trace-context/span.go similarity index 100% rename from pkg/rules/otsdk/trace-context/span.go rename to pkg/rules/otel-sdk/trace-context/span.go diff --git a/pkg/rules/otsdk/trace-context/trace.go b/pkg/rules/otel-sdk/trace-context/trace.go similarity index 100% rename from pkg/rules/otsdk/trace-context/trace.go rename to pkg/rules/otel-sdk/trace-context/trace.go diff --git a/pkg/rules/otsdk/trace-context/tracer.go b/pkg/rules/otel-sdk/trace-context/tracer.go similarity index 100% rename from pkg/rules/otsdk/trace-context/tracer.go rename to pkg/rules/otel-sdk/trace-context/tracer.go diff --git a/pkg/rules/runtime/rule.go b/pkg/rules/runtime/rule.go index 0a38eafb..8f83113d 100644 --- a/pkg/rules/runtime/rule.go +++ b/pkg/rules/runtime/rule.go @@ -18,15 +18,15 @@ import "github.com/alibaba/opentelemetry-go-auto-instrumentation/api" func init() { // Add tls field to struct "g" in runtime2.go - api.NewStructRule("runtime", "g", "ot_trace_context", "interface{}"). + api.NewStructRule("runtime", "g", "otel_trace_context", "interface{}"). Register() - api.NewStructRule("runtime", "g", "ot_baggage_container", "interface{}"). + api.NewStructRule("runtime", "g", "otel_baggage_container", "interface{}"). Register() // This solely inspired by skywalking-go // https://github.com/apache/skywalking-go/blob/5d7bd5e8e435ec5ab1a61793cd08e6a403893a55/tools/go-agent/instrument/runtime/instrument.go#L75 api.NewRule("runtime", - "newproc1", "", "defer func(){ retVal0.ot_trace_context = contextPropagate(callergp.ot_trace_context); retVal0.ot_baggage_container = contextPropagate(callergp.ot_baggage_container); }()", ""). + "newproc1", "", "defer func(){ retVal0.otel_trace_context = contextPropagate(callergp.otel_trace_context); retVal0.otel_baggage_container = contextPropagate(callergp.otel_baggage_container); }()", ""). WithUseRaw(true). Register() diff --git a/pkg/rules/runtime/runtime_linker.go b/pkg/rules/runtime/runtime_linker.go index 4785c1ae..e5d151b3 100644 --- a/pkg/rules/runtime/runtime_linker.go +++ b/pkg/rules/runtime/runtime_linker.go @@ -19,36 +19,36 @@ import ( _ "unsafe" ) -//go:linkname ot_get_trace_context_from_gls ot_get_trace_context_from_gls -var ot_get_trace_context_from_gls = _ot_gls_get_trace_context_impl +//go:linkname otel_get_trace_context_from_gls otel_get_trace_context_from_gls +var otel_get_trace_context_from_gls = _otel_gls_get_trace_context_impl -//go:linkname ot_get_baggage_container_from_gls ot_get_baggage_container_from_gls -var ot_get_baggage_container_from_gls = _ot_gls_get_baggage_container_impl +//go:linkname otel_get_baggage_container_from_gls otel_get_baggage_container_from_gls +var otel_get_baggage_container_from_gls = _otel_gls_get_baggage_container_impl -//go:linkname ot_set_trace_context_to_gls ot_set_trace_context_to_gls -var ot_set_trace_context_to_gls = _ot_gls_set_trace_context_impl +//go:linkname otel_set_trace_context_to_gls otel_set_trace_context_to_gls +var otel_set_trace_context_to_gls = _otel_gls_set_trace_context_impl -//go:linkname ot_set_baggage_container_to_gls ot_set_baggage_container_to_gls -var ot_set_baggage_container_to_gls = _ot_gls_set_baggage_container_impl +//go:linkname otel_set_baggage_container_to_gls otel_set_baggage_container_to_gls +var otel_set_baggage_container_to_gls = _otel_gls_set_baggage_container_impl //go:nosplit -func _ot_gls_get_trace_context_impl() interface{} { - return getg().m.curg.ot_trace_context +func _otel_gls_get_trace_context_impl() interface{} { + return getg().m.curg.otel_trace_context } //go:nosplit -func _ot_gls_get_baggage_container_impl() interface{} { - return getg().m.curg.ot_baggage_container +func _otel_gls_get_baggage_container_impl() interface{} { + return getg().m.curg.otel_baggage_container } //go:nosplit -func _ot_gls_set_trace_context_impl(v interface{}) { - getg().m.curg.ot_trace_context = v +func _otel_gls_set_trace_context_impl(v interface{}) { + getg().m.curg.otel_trace_context = v } //go:nosplit -func _ot_gls_set_baggage_container_impl(v interface{}) { - getg().m.curg.ot_baggage_container = v +func _otel_gls_set_baggage_container_impl(v interface{}) { + getg().m.curg.otel_baggage_container = v } type ContextSnapshoter interface { diff --git a/rule_enabler.go b/rule_enabler.go index 4ba08f80..751a798e 100644 --- a/rule_enabler.go +++ b/rule_enabler.go @@ -30,7 +30,7 @@ import ( _ "github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/rules/logrus" _ "github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/rules/mongo" _ "github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/rules/mux" - _ "github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/rules/otsdk" + _ "github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/rules/otel-sdk" _ "github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/rules/runtime" _ "github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/rules/test" _ "github.com/alibaba/opentelemetry-go-auto-instrumentation/pkg/rules/zap"