Merge pull request #14 from herp-inc/semantic-conventions

Semantic conventions

.github/workflows/haskell.yml

@@ -2,45 +2,12 @@ on:
   push:
   pull_request:
 jobs:
-  stack-ghc-8_10:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v22
-        with:
-          nix_path: nixpkgs=channel:nixos-22.11
-      - uses: haskell-actions/setup@v2
-        id: setup
-        with:
-          enable-stack: true
-      - if: ${{ runner.os == 'Linux' }}
-        # https://github.com/actions/runner-images/issues/7061
-        run: sudo chown -R $USER /usr/local/.ghcup
-      - uses: actions/cache/restore@v4
-        id: cache
-        env:
-          key: ${{ runner.os }}-ghc-8.10-stack-${{ steps.setup.outputs.stack-version }}
-        with:
-          path: |
-            ${{ steps.setup.outputs.stack-root }}
-            .stack-work
-          key: ${{ env.key }}-${{ hashFiles('stack-ghc-8.10.yaml.lock') }}
-          restore-keys: ${{ env.key }}-
-      - run: stack --stack-yaml stack-ghc-8.10.yaml build --test --no-run-tests --bench --no-run-benchmarks --only-dependencies
-      - uses: actions/cache/save@v4
-        if: steps.cache.outputs.cache-hit != 'true'
-        with:
-          path: |
-            ${{ steps.setup.outputs.stack-root }}
-            .stack-work
-          key: ${{ steps.cache.outputs.cache-primary-key }}
-      - run: stack --stack-yaml stack-ghc-8.10.yaml build
-      - run: stack --stack-yaml stack-ghc-8.10.yaml test
-      - run: stack --stack-yaml stack-ghc-8.10.yaml bench --no-run-benchmarks
   stack-ghc-9_0:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
       - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-22.11
@@ -76,6 +43,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
       - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-22.11
@@ -111,6 +80,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
       - uses: cachix/install-nix-action@v25
         with:
           nix_path: nixpkgs=channel:nixos-22.11

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "proto"]
 	path = proto
 	url = https://github.com/open-telemetry/opentelemetry-proto
+[submodule "semantic-conventions/model"]
+	path = semantic-conventions/model
+	url = https://github.com/open-telemetry/semantic-conventions/

Makefile

@@ -1,9 +1,5 @@
 .PHONY: all
-all: all.stack-8.10 all.stack-9.0 all.stack-9.2 all.cabal-9.0
-
-.PHONY: all.stack-8.10
-all.stack-8.10:
-	stack --stack-yaml stack-ghc-8.10.yaml build --test --bench
+all: all.stack-9.0 all.stack-9.2 all.cabal-9.0
 
 .PHONY: all.stack-9.0
 all.stack-9.0:
@@ -19,11 +15,7 @@ all.cabal-9.0:
 	cabal v2-test --jobs all
 
 .PHONY: build.all
-build.all: build.all.stack-8.10 build.all.stack-9.0 build.all.stack-9.2 build.all.cabal-9.0
-
-.PHONY: build.all.stack-8.10
-build.all.stack-8.10:
-	stack --stack-yaml stack-ghc-8.10.yaml build --test --no-run-tests --bench --no-run-benchmarks
+build.all: build.all.stack-9.0 build.all.stack-9.2 build.all.cabal-9.0
 
 .PHONY: build.all.stack-9.0
 build.all.stack-9.0: