Merge branch 'main' into pull-364

SigNoz · Sep 8, 2024 · 46af93b · 46af93b
2 parents 22d9183 + d1401eb
commit 46af93b
Show file tree

Hide file tree

Showing 19 changed files with 772 additions and 128 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,24 @@
+name: ci
+
+on:
+ pull_request:
+ branches:
+ - "*"
+
+jobs:
+ test:
+ uses: signoz/primus.workflows/.github/workflows/go-test.yaml@main
+ secrets: inherit
+ with:
+ PRIMUS_REF: main
+ GO_TEST_CONTEXT: ./...
+ fmt:
+ uses: signoz/primus.workflows/.github/workflows/go-fmt.yaml@main
+ secrets: inherit
+ with:
+ PRIMUS_REF: main
+ lint:
+ uses: signoz/primus.workflows/.github/workflows/go-lint.yaml@main
+ secrets: inherit
+ with:
+ PRIMUS_REF: main
diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml
diff --git a/.github/workflows/lint-and-test.yaml b/.github/workflows/lint-and-test.yaml
diff --git a/exporter/clickhouselogsexporter/config.go b/exporter/clickhouselogsexporter/config.go
@@ -34,6 +34,7 @@ type Config struct {
  DSN string `mapstructure:"dsn"`
  // Docker Multi Node Cluster is a flag to enable the docker multi node cluster. Default is false.
  DockerMultiNodeCluster bool `mapstructure:"docker_multi_node_cluster" default:"false"`
+ UseNewSchema bool `mapstructure:"use_new_schema" default:"false"`
 }
 
 var (

diff --git a/exporter/clickhouselogsexporter/config_test.go b/exporter/clickhouselogsexporter/config_test.go
@@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) {
  require.NoError(t, err)
  require.NotNil(t, cfg)
 
- assert.Equal(t, len(cfg.Exporters), 2)
+ assert.Equal(t, len(cfg.Exporters), 3)
 
  defaultCfg := factory.CreateDefaultConfig()
  defaultCfg.(*Config).DSN = "tcp://127.0.0.1:9000/?dial_timeout=5s"
@@ -64,4 +64,8 @@ func TestLoadConfig(t *testing.T) {
  QueueSize: 100,
  },
  })
+
+ defaultCfg.(*Config).UseNewSchema = true
+ r2 := cfg.Exporters[component.NewIDWithName(component.MustNewType(typeStr), "new_schema")]
+ assert.Equal(t, r2, defaultCfg)
 }