mirror of
https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz
synced 2025-08-12 12:09:01 +08:00
chore: remove ee references in MIT licensed code (#5901)
* chore: remove ee references in MIT licensed code * chore: add target --------- Co-authored-by: Prashant Shahi <prashant@signoz.io>
This commit is contained in:
parent
b8d228a339
commit
6f0cf03371
7
.github/workflows/build.yaml
vendored
7
.github/workflows/build.yaml
vendored
@ -8,6 +8,13 @@ on:
|
|||||||
- release/v*
|
- release/v*
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
check-no-ee-references:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- name: Run check
|
||||||
|
run: make check-no-ee-references
|
||||||
|
|
||||||
build-frontend:
|
build-frontend:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
@ -1,7 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# It Comments out the Line Query-Service & Frontend Section of deploy/docker/clickhouse-setup/docker-compose.yaml
|
|
||||||
# Update the Line Numbers when deploy/docker/clickhouse-setup/docker-compose.yaml chnages.
|
|
||||||
# Docs Ref.: https://github.com/SigNoz/signoz/blob/main/CONTRIBUTING.md#contribute-to-frontend-with-docker-installation-of-signoz
|
|
||||||
|
|
||||||
sed -i 38,62's/.*/# &/' .././deploy/docker/clickhouse-setup/docker-compose.yaml
|
|
9
Makefile
9
Makefile
@ -178,6 +178,15 @@ clear-swarm-ch:
|
|||||||
@docker run --rm -v "$(PWD)/$(SWARM_DIRECTORY)/data:/pwd" busybox \
|
@docker run --rm -v "$(PWD)/$(SWARM_DIRECTORY)/data:/pwd" busybox \
|
||||||
sh -c "cd /pwd && rm -rf clickhouse*/* zookeeper-*/*"
|
sh -c "cd /pwd && rm -rf clickhouse*/* zookeeper-*/*"
|
||||||
|
|
||||||
|
check-no-ee-references:
|
||||||
|
@echo "Checking for 'ee' package references in 'pkg' directory..."
|
||||||
|
@if grep -R --include="*.go" '.*/ee/.*' pkg/; then \
|
||||||
|
echo "Error: Found references to 'ee' packages in 'pkg' directory"; \
|
||||||
|
exit 1; \
|
||||||
|
else \
|
||||||
|
echo "No references to 'ee' packages found in 'pkg' directory"; \
|
||||||
|
fi
|
||||||
|
|
||||||
test:
|
test:
|
||||||
go test ./pkg/query-service/app/metrics/...
|
go test ./pkg/query-service/app/metrics/...
|
||||||
go test ./pkg/query-service/cache/...
|
go test ./pkg/query-service/cache/...
|
||||||
|
@ -11,8 +11,6 @@ const (
|
|||||||
var LicenseSignozIo = "https://license.signoz.io/api/v1"
|
var LicenseSignozIo = "https://license.signoz.io/api/v1"
|
||||||
var LicenseAPIKey = GetOrDefaultEnv("SIGNOZ_LICENSE_API_KEY", "")
|
var LicenseAPIKey = GetOrDefaultEnv("SIGNOZ_LICENSE_API_KEY", "")
|
||||||
var SaasSegmentKey = GetOrDefaultEnv("SIGNOZ_SAAS_SEGMENT_KEY", "")
|
var SaasSegmentKey = GetOrDefaultEnv("SIGNOZ_SAAS_SEGMENT_KEY", "")
|
||||||
var SpanRenderLimitStr = GetOrDefaultEnv("SPAN_RENDER_LIMIT", "2500")
|
|
||||||
var MaxSpansInTraceStr = GetOrDefaultEnv("MAX_SPANS_IN_TRACE", "250000")
|
|
||||||
var FetchFeatures = GetOrDefaultEnv("FETCH_FEATURES", "false")
|
var FetchFeatures = GetOrDefaultEnv("FETCH_FEATURES", "false")
|
||||||
var ZeusFeaturesURL = GetOrDefaultEnv("ZEUS_FEATURES_URL", "ZeusFeaturesURL")
|
var ZeusFeaturesURL = GetOrDefaultEnv("ZEUS_FEATURES_URL", "ZeusFeaturesURL")
|
||||||
|
|
||||||
|
@ -18,7 +18,6 @@ import (
|
|||||||
promModel "github.com/prometheus/common/model"
|
promModel "github.com/prometheus/common/model"
|
||||||
"go.uber.org/multierr"
|
"go.uber.org/multierr"
|
||||||
|
|
||||||
"go.signoz.io/signoz/ee/query-service/constants"
|
|
||||||
"go.signoz.io/signoz/pkg/query-service/app/metrics"
|
"go.signoz.io/signoz/pkg/query-service/app/metrics"
|
||||||
"go.signoz.io/signoz/pkg/query-service/app/queryBuilder"
|
"go.signoz.io/signoz/pkg/query-service/app/queryBuilder"
|
||||||
"go.signoz.io/signoz/pkg/query-service/auth"
|
"go.signoz.io/signoz/pkg/query-service/auth"
|
||||||
@ -255,7 +254,7 @@ func ParseSearchTracesParams(r *http.Request) (*model.SearchTracesParams, error)
|
|||||||
levelDownStr = "0"
|
levelDownStr = "0"
|
||||||
}
|
}
|
||||||
if SpanRenderLimitStr == "" || SpanRenderLimitStr == "null" {
|
if SpanRenderLimitStr == "" || SpanRenderLimitStr == "null" {
|
||||||
SpanRenderLimitStr = constants.SpanRenderLimitStr
|
SpanRenderLimitStr = baseconstants.SpanRenderLimitStr
|
||||||
}
|
}
|
||||||
|
|
||||||
levelUpInt, err := strconv.Atoi(levelUpStr)
|
levelUpInt, err := strconv.Atoi(levelUpStr)
|
||||||
@ -270,7 +269,7 @@ func ParseSearchTracesParams(r *http.Request) (*model.SearchTracesParams, error)
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
MaxSpansInTraceInt, err := strconv.Atoi(constants.MaxSpansInTraceStr)
|
MaxSpansInTraceInt, err := strconv.Atoi(baseconstants.MaxSpansInTraceStr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/jmoiron/sqlx"
|
"github.com/jmoiron/sqlx"
|
||||||
"go.signoz.io/signoz/ee/query-service/model"
|
"go.signoz.io/signoz/pkg/query-service/model"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Range struct {
|
type Range struct {
|
||||||
|
@ -421,3 +421,6 @@ const DefaultFilterSuggestionsAttributesLimit = 50
|
|||||||
const MaxFilterSuggestionsAttributesLimit = 100
|
const MaxFilterSuggestionsAttributesLimit = 100
|
||||||
const DefaultFilterSuggestionsExamplesLimit = 2
|
const DefaultFilterSuggestionsExamplesLimit = 2
|
||||||
const MaxFilterSuggestionsExamplesLimit = 10
|
const MaxFilterSuggestionsExamplesLimit = 10
|
||||||
|
|
||||||
|
var SpanRenderLimitStr = GetOrDefaultEnv("SPAN_RENDER_LIMIT", "2500")
|
||||||
|
var MaxSpansInTraceStr = GetOrDefaultEnv("MAX_SPANS_IN_TRACE", "250000")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user