Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] fix CI #37177

Merged
merged 4 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,9 @@ jobs:
- exporter-1
- exporter-2
- exporter-3
- extension
- extension-0
- extension-1
- extension-2
- connector
- internal
- pkg
Expand Down Expand Up @@ -380,7 +382,7 @@ jobs:

integration-tests:
if: ${{ github.actor != 'dependabot[bot]' && always() }}
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
needs: [setup-environment, integration-tests-matrix]
steps:
- name: Print result
Expand Down
18 changes: 16 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ EXPORTER_MODS_1 := $(shell find ./exporter/[d-i]* $(FIND_MOD_ARGS) -exec $(TO_MO
EXPORTER_MODS_2 := $(shell find ./exporter/[k-o]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
EXPORTER_MODS_3 := $(shell find ./exporter/[p-z]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
EXPORTER_MODS := $(EXPORTER_MODS_0) $(EXPORTER_MODS_1) $(EXPORTER_MODS_2) $(EXPORTER_MODS_3)
EXTENSION_MODS := $(shell find ./extension/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
EXTENSION_MODS_0 := $(shell find ./extension/[a-d]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
EXTENSION_MODS_1 := $(shell find ./extension/[e]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
EXTENSION_MODS_2 := $(shell find ./extension/[f-z]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
EXTENSION_MODS := $(EXTENSION_MODS_0) $(EXTENSION_MODS_1) $(EXTENSION_MODS_2)
CONNECTOR_MODS := $(shell find ./connector/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
INTERNAL_MODS := $(shell find ./internal/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
PKG_MODS := $(shell find ./pkg/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
Expand Down Expand Up @@ -78,7 +81,9 @@ all-groups:
@echo "\nexporter-1: $(EXPORTER_MODS_1)"
@echo "\nexporter-2: $(EXPORTER_MODS_2)"
@echo "\nexporter-3: $(EXPORTER_MODS_3)"
@echo "\nextension: $(EXTENSION_MODS)"
@echo "\nextension-0: $(EXTENSION_MODS_0)"
@echo "\nextension-1: $(EXTENSION_MODS_1)"
@echo "\nextension-2: $(EXTENSION_MODS_2)"
@echo "\nconnector: $(CONNECTOR_MODS)"
@echo "\ninternal: $(INTERNAL_MODS)"
@echo "\npkg: $(PKG_MODS)"
Expand Down Expand Up @@ -245,6 +250,15 @@ for-exporter-3-target: $(EXPORTER_MODS_3)
.PHONY: for-extension-target
for-extension-target: $(EXTENSION_MODS)

.PHONY: for-extension-0-target
for-extension-0-target: $(EXTENSION_MODS_0)

.PHONY: for-extension-1-target
for-extension-1-target: $(EXTENSION_MODS_1)

.PHONY: for-extension-2-target
for-extension-2-target: $(EXTENSION_MODS_2)

.PHONY: for-connector-target
for-connector-target: $(CONNECTOR_MODS)

Expand Down
2 changes: 1 addition & 1 deletion exporter/dorisexporter/exporter_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ type metric interface {
dMetricGauge | dMetricSum | dMetricHistogram | dMetricExponentialHistogram | dMetricSummary
}

func toJsonLines[T dLog | dTrace | metric](data []*T) ([]byte, error) {
func toJSONLines[T dLog | dTrace | metric](data []*T) ([]byte, error) {
buf := &bytes.Buffer{}
enc := json.NewEncoder(buf)
for _, d := range data {
Expand Down
2 changes: 1 addition & 1 deletion exporter/dorisexporter/exporter_common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func findRandomPort() (int, error) {
}

func TestToJsonLines(t *testing.T) {
logs, err := toJsonLines([]*dLog{
logs, err := toJSONLines([]*dLog{
{}, {},
})
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion exporter/dorisexporter/exporter_logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func (e *logsExporter) pushLogData(ctx context.Context, ld plog.Logs) error {
}

func (e *logsExporter) pushLogDataInternal(ctx context.Context, logs []*dLog) error {
marshal, err := toJsonLines(logs)
marshal, err := toJSONLines(logs)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion exporter/dorisexporter/exporter_traces.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func (e *tracesExporter) pushTraceData(ctx context.Context, td ptrace.Traces) er
}

func (e *tracesExporter) pushTraceDataInternal(ctx context.Context, traces []*dTrace) error {
marshal, err := toJsonLines(traces)
marshal, err := toJSONLines(traces)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion exporter/dorisexporter/metrics_exponential_histogram.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,5 @@ func (m *metricModelExponentialHistogram) size() int {
}

func (m *metricModelExponentialHistogram) bytes() ([]byte, error) {
return toJsonLines(m.data)
return toJSONLines(m.data)
}
2 changes: 1 addition & 1 deletion exporter/dorisexporter/metrics_gauge.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,5 @@ func (m *metricModelGauge) size() int {
}

func (m *metricModelGauge) bytes() ([]byte, error) {
return toJsonLines(m.data)
return toJSONLines(m.data)
}
2 changes: 1 addition & 1 deletion exporter/dorisexporter/metrics_histogram.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,5 @@ func (m *metricModelHistogram) size() int {
}

func (m *metricModelHistogram) bytes() ([]byte, error) {
return toJsonLines(m.data)
return toJSONLines(m.data)
}
2 changes: 1 addition & 1 deletion exporter/dorisexporter/metrics_sum.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,5 @@ func (m *metricModelSum) size() int {
}

func (m *metricModelSum) bytes() ([]byte, error) {
return toJsonLines(m.data)
return toJSONLines(m.data)
}
2 changes: 1 addition & 1 deletion exporter/dorisexporter/metrics_summary.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,5 @@ func (m *metricModelSummary) size() int {
}

func (m *metricModelSummary) bytes() ([]byte, error) {
return toJsonLines(m.data)
return toJSONLines(m.data)
}
Loading