From fa1041a796a8082cd7a5a9782294461e0a16396e Mon Sep 17 00:00:00 2001 From: Stephan Behnke Date: Mon, 26 Jan 2026 14:11:33 -0800 Subject: [PATCH] Standardize YAML formatting --- .github/.codecov.yml | 2 +- .github/.yamlfmt | 18 +++ .github/workflows/flaky-tests-report.yml | 8 +- .github/workflows/linters.yml | 29 +++- .github/workflows/run-tests.yml | 15 +- .github/workflows/stale.yml | 4 +- Makefile | 27 +++- common/dynamicconfig/config/testConfig.yaml | 150 +++++++++--------- config/development-cass-archival.yaml | 4 +- config/development-cass-es-custom.yaml | 8 +- config/development-cass-es-dual.yaml | 4 +- config/development-cass-es-fi.yaml | 4 +- config/development-cass-es.yaml | 4 +- config/development-mysql-es.yaml | 4 +- config/development-mysql8.yaml | 4 +- config/development-postgres-es.yaml | 4 +- config/development-postgres12.yaml | 4 +- config/development-sqlite.yaml | 4 +- .../provisioning/dashboards/dashboard.yml | 16 +- .../provisioning/datasources/prometheus.yml | 40 ++--- .../grafana/provisioning/tempo/tempo.yaml | 22 +-- .../prometheus-darwin/prometheus.yml | 2 +- .../prometheus-linux/prometheus.yml | 2 +- 23 files changed, 211 insertions(+), 168 deletions(-) create mode 100644 .github/.yamlfmt diff --git a/.github/.codecov.yml b/.github/.codecov.yml index 38502d4495..92e2186f22 100644 --- a/.github/.codecov.yml +++ b/.github/.codecov.yml @@ -20,4 +20,4 @@ github_checks: false coverage: status: project: off - patch: off \ No newline at end of file + patch: off diff --git a/.github/.yamlfmt b/.github/.yamlfmt new file mode 100644 index 0000000000..2fed3a427c --- /dev/null +++ b/.github/.yamlfmt @@ -0,0 +1,18 @@ +# Config for yamlfmt +# see https://github.com/google/yamlfmt/blob/main/docs/config-file.md + +# No need to format untracked files +gitignore_excludes: true + +exclude: + # Go template files + - common/config/config_template_embedded.yaml + - config/docker.yaml + - docker/config_template.yaml + +formatter: + # allow newlines + retain_line_breaks: true + # requires for GitHub Actions files + scan_folded_as_literal: true + force_quote_style: double diff --git a/.github/workflows/flaky-tests-report.yml b/.github/workflows/flaky-tests-report.yml index 6dea359e04..bab3d33113 100644 --- a/.github/workflows/flaky-tests-report.yml +++ b/.github/workflows/flaky-tests-report.yml @@ -23,7 +23,7 @@ permissions: jobs: flaky-tests-report: - runs-on: ubuntu-latest + runs-on: ubuntu-latest steps: - name: Generate token id: generate_token @@ -64,16 +64,16 @@ jobs: DAYS_PARAM: ${{ github.event.inputs.days || '7' }} run: | set -euo pipefail - + # Create output directory mkdir -p tools/flakes/out - + tringa --json --since-days "$DAYS_PARAM" repo sql \ 'select classname, name, artifact from test where passed = false and skipped = false order by classname, name, artifact desc' \ --branch main \ --workflow-id 80591745 \ https://github.com/temporalio/temporal > tools/flakes/out/out.json - + echo "✅ Tringa command completed" echo "📊 Output file size: $(wc -c < tools/flakes/out/out.json) bytes" echo "📄 Full output file:" diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 6e3e0e8abb..3d728ef161 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version-file: 'go.mod' + go-version-file: "go.mod" check-latest: true - name: lint actions @@ -32,7 +32,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version-file: 'go.mod' + go-version-file: "go.mod" check-latest: true - uses: arduino/setup-protoc@v3 @@ -52,7 +52,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version-file: 'go.mod' + go-version-file: "go.mod" check-latest: true - uses: arduino/setup-protoc@v3 @@ -62,7 +62,6 @@ jobs: - name: lint protobuf API definitions run: | make lint-api - lint-workflows: runs-on: ubuntu-latest @@ -73,7 +72,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version-file: 'go.mod' + go-version-file: "go.mod" check-latest: true - uses: arduino/setup-protoc@v3 @@ -92,7 +91,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version-file: 'go.mod' + go-version-file: "go.mod" check-latest: true - name: format golang import statements @@ -108,6 +107,21 @@ jobs: exit 1 fi + lint-yaml: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v6 + with: + fetch-depth: 0 + + - uses: actions/setup-go@v6 + with: + go-version-file: "go.mod" + check-latest: true + + - name: check yaml formatting + run: make lint-yaml + golangci: runs-on: ubuntu-latest steps: @@ -117,7 +131,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version-file: 'go.mod' + go-version-file: "go.mod" check-latest: true - name: lint code @@ -140,6 +154,7 @@ jobs: - lint-protos - lint-actions - fmt-imports + - lint-yaml - golangci runs-on: ubuntu-latest if: always() diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 0a9630df8d..b92d1d551f 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -261,8 +261,7 @@ jobs: - name: Generate crash report if: failure() - run: - | # if the tests failed, we would expect one JUnit XML report per attempt; otherwise it must have crashed + run: | # if the tests failed, we would expect one JUnit XML report per attempt; otherwise it must have crashed [ "$(find .testoutput -maxdepth 1 -name 'junit.*.xml' | wc -l)" -lt "$MAX_TEST_ATTEMPTS" ] && CRASH_REPORT_NAME="$GITHUB_JOB" make report-test-crash @@ -358,8 +357,7 @@ jobs: - name: Generate crash report if: failure() - run: - | # if the tests failed, we would expect one JUnit XML report per attempt; otherwise it must have crashed + run: | # if the tests failed, we would expect one JUnit XML report per attempt; otherwise it must have crashed [ "$(find .testoutput -maxdepth 1 -name 'junit.*.xml' | wc -l)" -lt "$MAX_TEST_ATTEMPTS" ] && CRASH_REPORT_NAME="$GITHUB_JOB" make report-test-crash @@ -541,8 +539,7 @@ jobs: - name: Generate crash report if: failure() - run: - | # if the tests failed, we would expect one JUnit XML report per attempt; otherwise it must have crashed + run: | # if the tests failed, we would expect one JUnit XML report per attempt; otherwise it must have crashed [ "$(find .testoutput -maxdepth 1 -name 'junit.*.xml' | wc -l)" -lt "$MAX_TEST_ATTEMPTS" ] && CRASH_REPORT_NAME="$GITHUB_JOB" make report-test-crash @@ -702,8 +699,7 @@ jobs: - name: Generate crash report if: failure() - run: - | # if the tests failed, we would expect one JUnit XML report per attempt; otherwise it must have crashed + run: | # if the tests failed, we would expect one JUnit XML report per attempt; otherwise it must have crashed [ "$(find .testoutput -maxdepth 1 -name 'junit.*.xml' | wc -l)" -lt "$MAX_TEST_ATTEMPTS" ] && CRASH_REPORT_NAME="$GITHUB_JOB" make report-test-crash @@ -860,8 +856,7 @@ jobs: - name: Generate crash report if: failure() - run: - | # if the tests failed, we would expect one JUnit XML report per attempt; otherwise it must have crashed + run: | # if the tests failed, we would expect one JUnit XML report per attempt; otherwise it must have crashed [ "$(find .testoutput -maxdepth 1 -name 'junit.*.xml' | wc -l)" -lt "$MAX_TEST_ATTEMPTS" ] && CRASH_REPORT_NAME="$GITHUB_JOB" make report-test-crash diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 17ba1649f5..88b2ae3cba 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -14,8 +14,8 @@ jobs: - name: label stale pull requests uses: actions/stale@v9 with: - days-before-close: -1 # ie disabled + days-before-close: -1 # ie disabled days-before-stale: 120 - days-before-issue-stale: -1 # ie disabled + days-before-issue-stale: -1 # ie disabled stale-pr-label: stale stale-pr-message: 'This PR was marked as stale. Please update or close it.' diff --git a/Makefile b/Makefile index 5bb698e847..31cc4f4e53 100644 --- a/Makefile +++ b/Makefile @@ -211,6 +211,11 @@ WORKFLOWCHECK := $(LOCALBIN)/workflowcheck-$(WORKFLOWCHECK_VER) $(WORKFLOWCHECK): | $(LOCALBIN) $(call go-install-tool,$(WORKFLOWCHECK),go.temporal.io/sdk/contrib/tools/workflowcheck,$(WORKFLOWCHECK_VER)) +YAMLFMT_VER := v0.16.0 +YAMLFMT := $(LOCALBIN)/yamlfmt-$(YAMLFMT_VER) +$(YAMLFMT): | $(LOCALBIN) + $(call go-install-tool,$(YAMLFMT),github.com/google/yamlfmt/cmd/yamlfmt,$(YAMLFMT_VER)) + GOIMPORTS_VER := v0.36.0 GOIMPORTS := $(LOCALBIN)/goimports-$(GOIMPORTS_VER) $(STAMPDIR)/goimports-$(GOIMPORTS_VER): | $(STAMPDIR) $(LOCALBIN) @@ -372,6 +377,9 @@ goimports: fmt-imports $(GOIMPORTS) @UNGENERATED_FILES=$$(find . -type f -name '*.go' -print0 | xargs -0 grep -L -e "Code generated by .* DO NOT EDIT." || true) && \ $(GOIMPORTS) -w $$UNGENERATED_FILES +lint: lint-code lint-actions lint-api lint-protos lint-yaml + @printf $(COLOR) "Run linters..." + lint-actions: $(ACTIONLINT) @printf $(COLOR) "Linting GitHub actions..." @$(ACTIONLINT) @@ -381,12 +389,9 @@ lint-code: $(GOLANGCI_LINT) $(ERRORTYPE) @$(GOLANGCI_LINT) run --verbose --build-tags $(ALL_TEST_TAGS) --timeout 10m --fix=$(GOLANGCI_LINT_FIX) --new-from-rev=$(GOLANGCI_LINT_BASE_REV) --config=.github/.golangci.yml @go vet -tags $(ALL_TEST_TAGS) -vettool="$(ERRORTYPE)" -style-check=false ./... -fmt-imports: $(GCI) # Don't get confused, there is a single linter called gci, which is a part of the mega linter we use is called golangci-lint. - @printf $(COLOR) "Formatting imports..." - @$(GCI) write --skip-generated -s standard -s default ./* - -lint: lint-code lint-actions lint-api lint-protos - @printf $(COLOR) "Run linters..." +lint-yaml: $(YAMLFMT) + @printf $(COLOR) "Checking YAML formatting..." + @$(YAMLFMT) -conf .github/.yamlfmt -lint . lint-api: $(API_LINTER) $(API_BINPB) @printf $(COLOR) "Linting proto API..." @@ -397,6 +402,16 @@ lint-protos: $(BUF) $(INTERNAL_BINPB) $(CHASM_BINPB) @$(BUF) lint $(INTERNAL_BINPB) @$(BUF) lint --config chasm/lib/buf.yaml $(CHASM_BINPB) +fmt: fmt-imports fmt-yaml + +fmt-imports: $(GCI) # Don't get confused, there is a single linter called gci, which is a part of the mega linter we use is called golangci-lint. + @printf $(COLOR) "Formatting imports..." + @$(GCI) write --skip-generated -s standard -s default ./* + +fmt-yaml: $(YAMLFMT) + @printf $(COLOR) "Formatting YAML files..." + @$(YAMLFMT) -conf .github/.yamlfmt . + # Edit proto/internal/buf.yaml to exclude specific files from this check. # TODO: buf breaking check for CHASM protos. buf-breaking: $(BUF) $(API_BINPB) $(INTERNAL_BINPB) diff --git a/common/dynamicconfig/config/testConfig.yaml b/common/dynamicconfig/config/testConfig.yaml index e3571398d2..f8eefdbc2a 100644 --- a/common/dynamicconfig/config/testConfig.yaml +++ b/common/dynamicconfig/config/testConfig.yaml @@ -1,89 +1,89 @@ frontend.namespaceCount: -- value: - NamespaceId: 1 - constraints: {} + - value: + NamespaceId: 1 + constraints: {} TestCaseInsensitivePropertykEy: - value: true constraints: {} testGetBoolPropertyKey: -- value: false - constraints: {} -- value: true - constraints: - namespace: global-samples-namespace -- value: true - constraints: - namespace: samples-namespace + - value: false + constraints: {} + - value: true + constraints: + namespace: global-samples-namespace + - value: true + constraints: + namespace: samples-namespace testGetDurationPropertyKey: -- value: 1m - constraints: {} -- value: wrong duration string - constraints: - namespace: samples-namespace - taskQueueName: longIdleTimeTaskqueue -- value: 2 - constraints: - namespace: samples-namespace -- value: true - constraints: - namespace: broken-namespace + - value: 1m + constraints: {} + - value: wrong duration string + constraints: + namespace: samples-namespace + taskQueueName: longIdleTimeTaskqueue + - value: 2 + constraints: + namespace: samples-namespace + - value: true + constraints: + namespace: broken-namespace testGetFloat64PropertyKey: -- value: 12 - constraints: {} -- value: wrong type - constraints: - namespace: samples-namespace + - value: 12 + constraints: {} + - value: wrong type + constraints: + namespace: samples-namespace testGetIntPropertyKey: -- value: 1000 - constraints: {} -- value: 1000.1 - constraints: - namespace: global-samples-namespace -- value: 1001 - constraints: - namespace: global-samples-namespace - taskQueueName: test-tq - taskType: Workflow -- value: 1002 - constraints: - namespace: global-samples-namespace - taskQueueName: test-tq - taskType: Activity -- value: 1003 - constraints: - namespace: global-samples-namespace - taskQueueName: test-tq -- value: 1004 - constraints: - namespace: another-namespace -- value: 1005 - constraints: - taskQueueName: other-test-tq + - value: 1000 + constraints: {} + - value: 1000.1 + constraints: + namespace: global-samples-namespace + - value: 1001 + constraints: + namespace: global-samples-namespace + taskQueueName: test-tq + taskType: Workflow + - value: 1002 + constraints: + namespace: global-samples-namespace + taskQueueName: test-tq + taskType: Activity + - value: 1003 + constraints: + namespace: global-samples-namespace + taskQueueName: test-tq + - value: 1004 + constraints: + namespace: another-namespace + - value: 1005 + constraints: + taskQueueName: other-test-tq testGetMapPropertyKey: -- value: - key1: "1" - key2: 1 - key3: - - false - - key4: true - key5: 2.1 - constraints: {} -- value: "1" - constraints: - namespace: random-namespace + - value: + key1: "1" + key2: 1 + key3: + - false + - key4: true + key5: 2.1 + constraints: {} + - value: "1" + constraints: + namespace: random-namespace testGetTypedPropertyKey: -- value: - number: 23.2 # note field is int - days: "6d" - inner: - key1: 12345 # note field is float - key2: true + - value: + number: 23.2 # note field is int + days: "6d" + inner: + key1: 12345 # note field is float + key2: true testGetStringPropertyKey: -- value: some random string - constraints: {} -- value: constrained-string - constraints: - namespace: random-namespace + - value: some random string + constraints: {} + - value: constrained-string + constraints: + namespace: random-namespace testGetDurationPropertyFilteredByTaskTypeKey: - value: 10s constraints: diff --git a/config/development-cass-archival.yaml b/config/development-cass-archival.yaml index 50766bf8b9..9618efa179 100644 --- a/config/development-cass-archival.yaml +++ b/config/development-cass-archival.yaml @@ -29,8 +29,8 @@ global: port: 7936 metrics: prometheus: -# # specify framework to use new approach for initializing metrics and/or use opentelemetry -# framework: "opentelemetry" + # # specify framework to use new approach for initializing metrics and/or use opentelemetry + # framework: "opentelemetry" framework: "tally" timerType: "histogram" listenAddress: "127.0.0.1:8000" diff --git a/config/development-cass-es-custom.yaml b/config/development-cass-es-custom.yaml index a87dfaadf0..53e012e983 100644 --- a/config/development-cass-es-custom.yaml +++ b/config/development-cass-es-custom.yaml @@ -26,14 +26,14 @@ persistence: customDatastore: name: "elasticsearch" options: - version: "v7" + version: "v7" logLevel: "error" urls: - scheme: "http" host: "127.0.0.1:9200" indices: visibility: temporal_visibility_v1_secondary - + global: membership: maxJoinDuration: 30s @@ -42,8 +42,8 @@ global: port: 7936 metrics: prometheus: -# # specify framework to use new approach for initializing metrics and/or use opentelemetry -# framework: "opentelemetry" + # # specify framework to use new approach for initializing metrics and/or use opentelemetry + # framework: "opentelemetry" framework: "tally" timerType: "histogram" listenAddress: "127.0.0.1:8000" diff --git a/config/development-cass-es-dual.yaml b/config/development-cass-es-dual.yaml index 14889d0451..b2a49d6c37 100644 --- a/config/development-cass-es-dual.yaml +++ b/config/development-cass-es-dual.yaml @@ -41,8 +41,8 @@ global: port: 7936 metrics: prometheus: -# # specify framework to use new approach for initializing metrics and/or use opentelemetry -# framework: "opentelemetry" + # # specify framework to use new approach for initializing metrics and/or use opentelemetry + # framework: "opentelemetry" framework: "tally" timerType: "histogram" listenAddress: "127.0.0.1:8000" diff --git a/config/development-cass-es-fi.yaml b/config/development-cass-es-fi.yaml index d09a3f66a2..4509fca9a5 100644 --- a/config/development-cass-es-fi.yaml +++ b/config/development-cass-es-fi.yaml @@ -62,8 +62,8 @@ global: port: 7936 metrics: prometheus: -# # specify framework to use new approach for initializing metrics and/or use opentelemetry -# framework: "opentelemetry" + # # specify framework to use new approach for initializing metrics and/or use opentelemetry + # framework: "opentelemetry" framework: "tally" timerType: "histogram" listenAddress: "127.0.0.1:8000" diff --git a/config/development-cass-es.yaml b/config/development-cass-es.yaml index e43f9b707c..d32431f010 100644 --- a/config/development-cass-es.yaml +++ b/config/development-cass-es.yaml @@ -31,8 +31,8 @@ global: port: 7936 metrics: prometheus: -# # specify framework to use new approach for initializing metrics and/or use opentelemetry -# framework: "opentelemetry" + # # specify framework to use new approach for initializing metrics and/or use opentelemetry + # framework: "opentelemetry" framework: "tally" timerType: "histogram" listenAddress: "127.0.0.1:8000" diff --git a/config/development-mysql-es.yaml b/config/development-mysql-es.yaml index 1b2a038774..e432ff13a9 100644 --- a/config/development-mysql-es.yaml +++ b/config/development-mysql-es.yaml @@ -36,8 +36,8 @@ global: port: 7936 metrics: prometheus: -# # specify framework to use new approach for initializing metrics and/or use opentelemetry -# framework: "opentelemetry" + # # specify framework to use new approach for initializing metrics and/or use opentelemetry + # framework: "opentelemetry" framework: "tally" timerType: "histogram" listenAddress: "127.0.0.1:8000" diff --git a/config/development-mysql8.yaml b/config/development-mysql8.yaml index d61cdf0d14..feef5d4e50 100644 --- a/config/development-mysql8.yaml +++ b/config/development-mysql8.yaml @@ -38,8 +38,8 @@ global: port: 7936 metrics: prometheus: -# # specify framework to use new approach for initializing metrics and/or use opentelemetry -# framework: "opentelemetry" + # # specify framework to use new approach for initializing metrics and/or use opentelemetry + # framework: "opentelemetry" framework: "tally" timerType: "histogram" listenAddress: "127.0.0.1:8000" diff --git a/config/development-postgres-es.yaml b/config/development-postgres-es.yaml index 3544fb6864..db4b6de383 100644 --- a/config/development-postgres-es.yaml +++ b/config/development-postgres-es.yaml @@ -38,8 +38,8 @@ global: port: 7936 metrics: prometheus: -# # specify framework to use new approach for initializing metrics and/or use opentelemetry -# framework: "opentelemetry" + # # specify framework to use new approach for initializing metrics and/or use opentelemetry + # framework: "opentelemetry" framework: "tally" timerType: "histogram" listenAddress: "127.0.0.1:8000" diff --git a/config/development-postgres12.yaml b/config/development-postgres12.yaml index 64093eb85d..1a79d32d45 100644 --- a/config/development-postgres12.yaml +++ b/config/development-postgres12.yaml @@ -38,8 +38,8 @@ global: port: 7936 metrics: prometheus: -# # specify framework to use new approach for initializing metrics and/or use opentelemetry -# framework: "opentelemetry" + # # specify framework to use new approach for initializing metrics and/or use opentelemetry + # framework: "opentelemetry" framework: "tally" timerType: "histogram" listenAddress: "127.0.0.1:8000" diff --git a/config/development-sqlite.yaml b/config/development-sqlite.yaml index 15d73bbfab..13a3163549 100644 --- a/config/development-sqlite.yaml +++ b/config/development-sqlite.yaml @@ -58,8 +58,8 @@ global: port: 7936 metrics: prometheus: -# # specify framework to use new approach for initializing metrics and/or use opentelemetry -# framework: "opentelemetry" + # # specify framework to use new approach for initializing metrics and/or use opentelemetry + # framework: "opentelemetry" framework: "tally" timerType: "histogram" listenAddress: "127.0.0.1:8000" diff --git a/develop/docker-compose/grafana/provisioning/dashboards/dashboard.yml b/develop/docker-compose/grafana/provisioning/dashboards/dashboard.yml index 4c60924aaa..f595f00ea1 100644 --- a/develop/docker-compose/grafana/provisioning/dashboards/dashboard.yml +++ b/develop/docker-compose/grafana/provisioning/dashboards/dashboard.yml @@ -1,11 +1,11 @@ apiVersion: 1 providers: -- name: "Temporal" - orgId: 1 - folder: '' - type: file - disableDeletion: false - editable: true - options: - path: /etc/grafana/provisioning/temporalio-dashboards + - name: "Temporal" + orgId: 1 + folder: '' + type: file + disableDeletion: false + editable: true + options: + path: /etc/grafana/provisioning/temporalio-dashboards diff --git a/develop/docker-compose/grafana/provisioning/datasources/prometheus.yml b/develop/docker-compose/grafana/provisioning/datasources/prometheus.yml index 71f7ad28ad..116b1cdaa6 100644 --- a/develop/docker-compose/grafana/provisioning/datasources/prometheus.yml +++ b/develop/docker-compose/grafana/provisioning/datasources/prometheus.yml @@ -1,22 +1,22 @@ apiVersion: 1 datasources: -- name: Prometheus-Linux - type: prometheus - url: http://localhost:9090 - access: proxy - isDefault: true -- name: Prometheus-Darwin - type: prometheus - url: http://prometheus:9090 - access: proxy - isDefault: false -- name: Tempo-Linux - type: tempo - access: proxy - url: http://localhost:3200 - isDefault: false -- name: Tempo-Darwin - type: tempo - access: proxy - url: http://tempo:3200 - isDefault: false \ No newline at end of file + - name: Prometheus-Linux + type: prometheus + url: http://localhost:9090 + access: proxy + isDefault: true + - name: Prometheus-Darwin + type: prometheus + url: http://prometheus:9090 + access: proxy + isDefault: false + - name: Tempo-Linux + type: tempo + access: proxy + url: http://localhost:3200 + isDefault: false + - name: Tempo-Darwin + type: tempo + access: proxy + url: http://tempo:3200 + isDefault: false diff --git a/develop/docker-compose/grafana/provisioning/tempo/tempo.yaml b/develop/docker-compose/grafana/provisioning/tempo/tempo.yaml index 72f0a78d82..e866bc9ca4 100644 --- a/develop/docker-compose/grafana/provisioning/tempo/tempo.yaml +++ b/develop/docker-compose/grafana/provisioning/tempo/tempo.yaml @@ -24,17 +24,17 @@ query_frontend: trace_by_id: duration_slo: 100ms metrics: - max_duration: 120h # maximum duration of a metrics query, increase for local setups + max_duration: 120h # maximum duration of a metrics query, increase for local setups query_backend_after: 5m duration_slo: 5s throughput_bytes_slo: 1.073741824e+09 distributor: - receivers: # this configuration will listen on all ports and protocols that tempo is capable of. - jaeger: # the receives all come from the OpenTelemetry collector. more configuration information can - protocols: # be found there: https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver - thrift_http: # - grpc: # for a production deployment you should only enable the receivers you need! + receivers: # this configuration will listen on all ports and protocols that tempo is capable of. + jaeger: # the receives all come from the OpenTelemetry collector. more configuration information can + protocols: # be found there: https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver + thrift_http: # + grpc: # for a production deployment you should only enable the receivers you need! thrift_binary: thrift_compact: zipkin: @@ -45,11 +45,11 @@ distributor: opencensus: ingester: - max_block_duration: 5m # cut the headblock when this much time passes. this is being set for demo purposes and should probably be left alone normally + max_block_duration: 5m # cut the headblock when this much time passes. this is being set for demo purposes and should probably be left alone normally compactor: compaction: - block_retention: 24h # overall Tempo trace retention. set for demo purposes + block_retention: 24h # overall Tempo trace retention. set for demo purposes metrics_generator: registry: @@ -70,9 +70,9 @@ metrics_generator: storage: trace: - backend: local # backend configuration to use + backend: local # backend configuration to use wal: - path: /var/tempo/wal # where to store the wal locally + path: /var/tempo/wal # where to store the wal locally local: path: /var/tempo/blocks @@ -80,4 +80,4 @@ overrides: defaults: metrics_generator: processors: [service-graphs, span-metrics, local-blocks] # enables metrics generator - generate_native_histograms: both \ No newline at end of file + generate_native_histograms: both diff --git a/develop/docker-compose/prometheus-darwin/prometheus.yml b/develop/docker-compose/prometheus-darwin/prometheus.yml index 6905f23755..1340758c14 100644 --- a/develop/docker-compose/prometheus-darwin/prometheus.yml +++ b/develop/docker-compose/prometheus-darwin/prometheus.yml @@ -13,4 +13,4 @@ scrape_configs: - job_name: tempo static_configs: - targets: - - host.docker.internal:3200 \ No newline at end of file + - host.docker.internal:3200 diff --git a/develop/docker-compose/prometheus-linux/prometheus.yml b/develop/docker-compose/prometheus-linux/prometheus.yml index 96425b7102..c477619c38 100644 --- a/develop/docker-compose/prometheus-linux/prometheus.yml +++ b/develop/docker-compose/prometheus-linux/prometheus.yml @@ -13,4 +13,4 @@ scrape_configs: - job_name: tempo static_configs: - targets: - - localhost:3200 \ No newline at end of file + - localhost:3200