Merge branch 'main' into chore/update-build

cmd/signozcollector/Dockerfile

@@ -5,8 +5,7 @@ FROM alpine:3.17
 RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
 
 # define arguments and default values
-ARG TARGETOS=linux
-ARG TARGETARCH=amd64
+ARG TARGETOS TARGETARCH
 ARG USER_UID=10001
 
 # create a non-root user for running the collector

components/components.go

@@ -89,6 +89,7 @@ import (
  "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator"
  "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver"
  "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver"
+ "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver"
  "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver"
  "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver"
  "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver"
@@ -180,6 +181,7 @@ func Components() (otelcol.Factories, error) {
  sqlqueryreceiver.NewFactory(),
  sqlserverreceiver.NewFactory(),
  simpleprometheusreceiver.NewFactory(),
+ skywalkingreceiver.NewFactory(),
  statsdreceiver.NewFactory(),
  syslogreceiver.NewFactory(),
  tcplogreceiver.NewFactory(),

exporter/clickhouselogsexporter/migrations/000007_default_indexes.down.sql

@@ -0,0 +1,5 @@
+ALTER TABLE signoz_logs.logs ON CLUSTER cluster drop index IF EXISTS severity_number_idx;
+
+ALTER TABLE signoz_logs.logs ON CLUSTER cluster drop index IF EXISTS severity_text_idx;
+
+ALTER TABLE signoz_logs.logs ON CLUSTER cluster drop index IF EXISTS trace_flags_idx;

exporter/clickhouselogsexporter/migrations/000007_default_indexes.up.sql

@@ -0,0 +1,12 @@
+-- This migration adds default indexes to top level keys of the log model
+
+-- https://opentelemetry.io/docs/specs/otel/logs/data-model/#field-severitynumber range 1-24 and 0 means it's not set
+ALTER TABLE signoz_logs.logs ON CLUSTER cluster add index IF NOT EXISTS severity_number_idx (severity_number) TYPE set(25) GRANULARITY 4;
+
+-- https://opentelemetry.io/docs/specs/otel/logs/data-model/#displaying-severity 24 different values and empty means not set.
+ALTER TABLE signoz_logs.logs ON CLUSTER cluster add index IF NOT EXISTS severity_text_idx (severity_text) TYPE set(25) GRANULARITY 4;
+
+
+-- No point in addding index for trace_id, span_id as they are not set and they are always unique
+-- trace_flags can be a set so adding a default bloom filter
+ALTER TABLE signoz_logs.logs ON CLUSTER cluster add index IF NOT EXISTS trace_flags_idx (trace_flags) TYPE bloom_filter() GRANULARITY 4;

go.mod

@@ -104,6 +104,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.79.0
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.79.0
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.79.0
+ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver v0.79.0
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver v0.79.0
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.79.0
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.79.0
@@ -155,9 +156,10 @@ require (
  github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
  github.com/99designs/keyring v1.2.2 // indirect
  github.com/AthenZ/athenz v1.10.39 // indirect
- github.com/Azure/azure-pipeline-go v0.2.3 // indirect
  github.com/Azure/azure-sdk-for-go v65.0.0+incompatible // indirect
- github.com/Azure/azure-storage-blob-go v0.15.0 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.4.0 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0 // indirect
  github.com/Azure/go-autorest v14.2.0+incompatible // indirect
  github.com/Azure/go-autorest/autorest v0.11.28 // indirect
  github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
@@ -175,8 +177,9 @@ require (
  github.com/Showmax/go-fqdn v1.0.0 // indirect
  github.com/alecthomas/participle/v2 v2.0.0 // indirect
  github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
+ github.com/andybalholm/brotli v1.0.4 // indirect
  github.com/antonmedv/expr v1.12.5 // indirect
- github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
+ github.com/apache/arrow/go/v10 v10.0.1 // indirect
  github.com/apache/pulsar-client-go v0.8.1 // indirect
  github.com/apache/pulsar-client-go/oauth2 v0.0.0-20220120090717-25e59572242e // indirect
  github.com/apache/thrift v0.18.1 // indirect
@@ -210,7 +213,7 @@ require (
  github.com/containerd/ttrpc v1.1.0 // indirect
  github.com/coreos/go-oidc v2.2.1+incompatible // indirect
  github.com/coreos/go-systemd/v22 v22.5.0 // indirect
- github.com/cyphar/filepath-securejoin v0.2.3 // indirect
+ github.com/cyphar/filepath-securejoin v0.2.4 // indirect
  github.com/danieljoos/wincred v1.1.2 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/denisenkom/go-mssqldb v0.12.2 // indirect
@@ -246,6 +249,7 @@ require (
  github.com/go-sql-driver/mysql v1.7.1 // indirect
  github.com/go-zookeeper/zk v1.0.3 // indirect
  github.com/gobwas/glob v0.2.3 // indirect
+ github.com/goccy/go-json v0.9.11 // indirect
  github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
  github.com/godbus/dbus/v5 v5.0.6 // indirect
  github.com/gogo/googleapis v1.4.1 // indirect
@@ -301,7 +305,9 @@ require (
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/karrick/godirwalk v1.17.0 // indirect
  github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+ github.com/klauspost/asmfmt v1.3.2 // indirect
  github.com/klauspost/compress v1.16.5 // indirect
+ github.com/klauspost/cpuid/v2 v2.0.9 // indirect
  github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect
  github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165 // indirect
  github.com/leoluk/perflib_exporter v0.2.0 // indirect
@@ -313,10 +319,11 @@ require (
  github.com/magiconair/properties v1.8.7 // indirect
  github.com/mailru/easyjson v0.7.7 // indirect
  github.com/mattn/go-colorable v0.1.13 // indirect
- github.com/mattn/go-ieproxy v0.0.9 // indirect
  github.com/mattn/go-isatty v0.0.17 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
  github.com/miekg/dns v1.1.51 // indirect
+ github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
+ github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
  github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
  github.com/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -395,7 +402,7 @@ require (
  github.com/shoenig/go-m1cpu v0.1.6 // indirect
  github.com/shopspring/decimal v1.3.1 // indirect
  github.com/sijms/go-ora/v2 v2.7.6 // indirect
- github.com/snowflakedb/gosnowflake v1.6.18 // indirect
+ github.com/snowflakedb/gosnowflake v1.6.19 // indirect
  github.com/soheilhy/cmux v0.1.5 // indirect
  github.com/spaolacci/murmur3 v1.1.0 // indirect
  github.com/spf13/afero v1.9.2 // indirect
@@ -426,6 +433,7 @@ require (
  github.com/xdg-go/stringprep v1.0.4 // indirect
  github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
  github.com/yusufpapurcu/wmi v1.2.3 // indirect
+ github.com/zeebo/xxh3 v1.0.2 // indirect
  go.etcd.io/bbolt v1.3.7 // indirect
  go.mongodb.org/atlas v0.28.0 // indirect
  go.mongodb.org/mongo-driver v1.11.4 // indirect
@@ -475,6 +483,7 @@ require (
  sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
  sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
  sigs.k8s.io/yaml v1.3.0 // indirect
+ skywalking.apache.org/repo/goapi v0.0.0-20220121092418-9c455d0dda3f // indirect
 )
 
 replace (