Merge branch 'main' into dependabot/go_modules/github.com/prometheus/client_golang-1.20.5

Signed-off-by: Ian Meyer <[email protected]>

Author: imeyer

.bazelversion

@@ -1 +1 @@
-7.3.2
+latest

.github/workflows/golangci-lint.yml

@@ -20,15 +20,15 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23.2'
+          go-version: 1.24.2
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           # Require: The version of golangci-lint to use.
           # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
           # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
-          version: v1.60.3
+          version: v2.0
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
@@ -37,7 +37,7 @@ jobs:
           #
           # Note: By default, the `.golangci.yml` file should be at the root of the repository.
           # The location of the configuration file can be changed by using `--config=`
-          args: --timeout=5m --issues-exit-code=0 --new-from-rev=origin/${{ github.base_ref }} --out-format=sarif --config=.golangci.yml
+          args: --timeout=5m --issues-exit-code=0 --new-from-rev=origin/${{ github.base_ref }} --output.sarif.path  --config=.golangci.yml
 
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true

.gitignore

@@ -34,3 +34,5 @@ bazel-*
 
 # Code coverage reports
 genhtml/
+
+.idea/

.golangci.yaml

@@ -0,0 +1,39 @@
+version: "2"
+linters:
+  enable:
+    - bidichk
+    - bodyclose
+    - canonicalheader
+    - containedctx
+    - contextcheck
+    - decorder
+    - dupl
+    - dupword
+    - errname
+    - errorlint
+    - gosec
+    - nosprintfhostport
+    - promlinter
+    - sloglint
+    - unconvert
+    - unparam
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofumpt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

.golangci.yml

@@ -1,15 +1,72 @@
 load("@gazelle//:def.bzl", "gazelle")
-load("@rules_go//go:def.bzl", "go_library", "go_test")
-load("helper.bzl", "cross_compile_binary")
-load("platforms.def.bzl", "PLATFORMS")
+load("@rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
+load("crosscompile.bzl", "create_cross_platform_targets")
 
 gazelle(name = "gazelle")
 
-# Name of the binary
 NAME = "tdiscuss"
 
+go_test(
+    name = "tdiscuss_test",
+    size = "small",
+    srcs = [
+        "config_test.go",
+        "csrf_test.go",
+        "helpers_test.go",
+        "metrics_test.go",
+        "parser_test.go",
+        "server_test.go",
+    ],
+    embed = [":tdiscuss_lib"],
+    target_compatible_with = select({
+        "@platforms//os:linux": [],
+        "@platforms//os:macos": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    deps = [
+        "@com_github_jackc_pgx_v5//:pgx",
+        "@com_github_jackc_pgx_v5//pgtype",
+        "@com_github_jackc_pgx_v5//pgxpool",
+        "@com_github_stretchr_testify//assert",
+        "@com_github_stretchr_testify//require",
+        "@com_tailscale//client/tailscale/apitype",
+        "@com_tailscale//ipn/ipnstate",
+        "@com_tailscale//tailcfg",
+    ],
+)
+
+# To allow running all tests without external deps
+test_suite(
+    name = "all_tests",
+    tests = [":tdiscuss_test"],
+)
+
+# Default binary for the current platform
+go_binary(
+    name = "tdiscuss",
+    embed = [":tdiscuss_lib"],
+    visibility = ["//visibility:public"],
+)
+
+create_cross_platform_targets(
+    name = "tdiscuss",
+    embed = [":tdiscuss_lib"],
+)
+
+# Define the filegroup to collect all platform binaries
+filegroup(
+    name = "all_platforms",
+    srcs = [
+        ":tdiscuss-linux-amd64",
+        ":tdiscuss-linux-arm64",
+        ":tdiscuss-darwin-amd64",
+        ":tdiscuss-darwin-arm64",
+    ],
+    visibility = ["//visibility:public"],
+)
+
 go_library(
-    name = "{}_lib".format(NAME),
+    name = "tdiscuss_lib",
     srcs = [
         "config.go",
         "csrf.go",
@@ -18,16 +75,19 @@ go_library(
         "main.go",
         "metrics.go",
         "models.go",
+        "otel.go",
         "parser.go",
         "querier.go",
         "queries.sql.go",
         "server.go",
+        "traced_querier.go",
     ],
     embedsrcs = [
+        "static/style.css",
         "tmpl/admin.html",
         "tmpl/edit-profile.html",
-        "tmpl/edit-thread.html",
         "tmpl/edit-thread-post.html",
+        "tmpl/edit-thread.html",
         "tmpl/error.html",
         "tmpl/footer.html",
         "tmpl/header.html",
@@ -37,64 +97,41 @@ go_library(
         "tmpl/menu.html",
         "tmpl/newthread.html",
         "tmpl/thread.html",
-        "static/style.css",
     ],
-    importpath = "github.com/imeyer/{}".format(NAME),
+    importpath = "github.com/imeyer/tdiscuss",
     visibility = ["//visibility:private"],
-    x_defs = {
-        "version": "{STABLE_VERSION}",
-        "gitSha": "{STABLE_GIT_SHA}",
-    },
     deps = [
         "@com_github_google_uuid//:uuid",
         "@com_github_jackc_pgx_v5//:pgx",
         "@com_github_jackc_pgx_v5//pgconn",
         "@com_github_jackc_pgx_v5//pgtype",
         "@com_github_jackc_pgx_v5//pgxpool",
         "@com_github_microcosm_cc_bluemonday//:bluemonday",
-        "@com_github_prometheus_client_golang//prometheus",
         "@com_github_prometheus_client_golang//prometheus/promhttp",
-        "@com_github_prometheus_client_golang//prometheus/testutil",
         "@com_github_yuin_goldmark//:goldmark",
         "@com_github_yuin_goldmark//extension",
         "@com_github_yuin_goldmark//renderer/html",
         "@com_github_yuin_goldmark_emoji//:goldmark-emoji",
-        "@com_tailscale//client/tailscale",
         "@com_tailscale//client/tailscale/apitype",
         "@com_tailscale//hostinfo",
         "@com_tailscale//ipn/ipnstate",
-        "@com_tailscale//tailcfg",
         "@com_tailscale//tsnet",
         "@com_tailscale//types/logger",
-    ],
-)
-
-[cross_compile_binary(
-    name = NAME,
-    goarch = goarch,
-    goos = goos,
-) for (goos, goarch) in PLATFORMS]
-
-go_test(
-    name = "tdiscuss_test",
-    size = "small",
-    srcs = [
-        "config_test.go",
-        "csrf_test.go",
-        "helpers_test.go",
-        "metrics_test.go",
-        "parser_test.go",
-        "server_test.go",
-    ],
-    embed = [":tdiscuss_lib"],
-    deps = [
-        "@com_github_jackc_pgx_v5//:pgx",
-        "@com_github_jackc_pgx_v5//pgtype",
-        "@com_github_jackc_pgx_v5//pgxpool",
-        "@com_github_stretchr_testify//assert",
-        "@com_github_stretchr_testify//require",
-        "@com_tailscale//client/tailscale/apitype",
-        "@com_tailscale//ipn/ipnstate",
-        "@com_tailscale//tailcfg",
+        "@io_opentelemetry_go_contrib_bridges_otelslog//:otelslog",
+        "@io_opentelemetry_go_contrib_processors_minsev//:minsev",
+        "@io_opentelemetry_go_otel//:otel",
+        "@io_opentelemetry_go_otel//attribute",
+        "@io_opentelemetry_go_otel//semconv/v1.21.0:v1_21_0",
+        "@io_opentelemetry_go_otel_exporters_otlp_otlplog_otlploghttp//:otlploghttp",
+        "@io_opentelemetry_go_otel_exporters_otlp_otlpmetric_otlpmetrichttp//:otlpmetrichttp",
+        "@io_opentelemetry_go_otel_exporters_otlp_otlptrace_otlptracehttp//:otlptracehttp",
+        "@io_opentelemetry_go_otel_exporters_prometheus//:prometheus",
+        "@io_opentelemetry_go_otel//codes",
+        "@io_opentelemetry_go_otel_metric//:metric",
+        "@io_opentelemetry_go_otel_sdk//resource",
+        "@io_opentelemetry_go_otel_sdk//trace",
+        "@io_opentelemetry_go_otel_sdk_log//:log",
+        "@io_opentelemetry_go_otel_sdk_metric//:metric",
+        "@io_opentelemetry_go_otel_trace//:trace",
     ],
 )

BUILD.bazel

@@ -5,12 +5,13 @@ module(
     version = "0.0.1",
 )
 
-bazel_dep(name = "rules_go", version = "0.50.1", repo_name = "rules_go")
-bazel_dep(name = "gazelle", version = "0.38.0", repo_name = "gazelle")
+bazel_dep(name = "gazelle", version = "0.42.0", repo_name = "gazelle")
+bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "rules_go", version = "0.53.0", repo_name = "rules_go")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
 
 go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
-go_sdk.download(version = "1.23.2")
+go_sdk.download(version = "1.24.2")
 
 go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
 go_deps.from_file(go_mod = "//:go.mod")
@@ -24,4 +25,20 @@ use_repo(
     "com_github_yuin_goldmark",
     "com_github_yuin_goldmark_emoji",
     "com_tailscale",
+    "io_opentelemetry_go_contrib_bridges_otelslog",
+    "io_opentelemetry_go_contrib_processors_minsev",
+    "io_opentelemetry_go_otel",
+    "io_opentelemetry_go_otel_exporters_otlp_otlplog_otlploghttp",
+    "io_opentelemetry_go_otel_exporters_otlp_otlpmetric_otlpmetrichttp",
+    "io_opentelemetry_go_otel_exporters_otlp_otlptrace_otlptracehttp",
+    "io_opentelemetry_go_otel_exporters_prometheus",
+    "io_opentelemetry_go_otel_metric",
+    "io_opentelemetry_go_otel_sdk",
+    "io_opentelemetry_go_otel_sdk_log",
+    "io_opentelemetry_go_otel_sdk_metric",
+    "io_opentelemetry_go_otel_trace",
 )
+
+# rpm = use_extension("@rules_pkg//pkg:extensions/rpm.bzl", "rpm")
+# rpm.toolchain()
+# use_repo(rpm, "rpm_tool")